From 4098ea15a2adecbfea624603ef8b4deaff15dbb3 Mon Sep 17 00:00:00 2001
From: zhuguojian <984737666@qq.com>
Date: Fri, 25 Feb 2022 13:17:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=201=E3=80=81sqlite=E5=9C=A8mac=20m1?=
=?UTF-8?q?=E6=9E=B6=E6=9E=84=E4=B8=8B=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=822=E3=80=81=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E8=BF=9E=E6=8E=A5Oracle=E6=95=B0=E6=8D=AE=E5=BA=93=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5sql=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
gen/pom.xml | 2 +-
.../java/com/gitee/gen/gen/oracle/OracleColumnSelector.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gen/pom.xml b/gen/pom.xml
index 4997474..51a2bb8 100644
--- a/gen/pom.xml
+++ b/gen/pom.xml
@@ -51,7 +51,7 @@
org.xerial
sqlite-jdbc
- 3.21.0.1
+ 3.34.0
mysql
diff --git a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
index d43a9cc..3092bac 100644
--- a/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
+++ b/gen/src/main/java/com/gitee/gen/gen/oracle/OracleColumnSelector.java
@@ -40,7 +40,7 @@ public class OracleColumnSelector extends ColumnSelector {
private static final String COLUMN_SQL = " SELECT " +
" atc.COLUMN_NAME FIELD, atc.DATA_TYPE TYPE, atc.DATA_SCALE SCALE, atc.DATA_LENGTH MAXLENGTH, " +
- " CASE atc.NULLABLE NULLABLE , " +
+ " atc.NULLABLE NULLABLE , " +
" atc.DATA_DEFAULT 默认值, acc.COMMENTS COMMENTS, atc.TABLE_NAME 表名, " +
" CASE atc.COLUMN_NAME " +
" WHEN " +
@@ -48,7 +48,7 @@ public class OracleColumnSelector extends ColumnSelector {
" LEFT JOIN all_cons_columns col ON con.table_name = col.table_name " +
" AND con.OWNER = col.OWNER AND con.CONSTRAINT_NAME = col.CONSTRAINT_NAME " +
" WHERE con.constraint_type = 'P' " +
- " AND col.table_name = '%s' AND con.OWNER = '%s' ) " +
+ " AND col.table_name = '%s' AND con.OWNER = '%s' AND col.column_name = atc.COLUMN_NAME ) " +
" THEN 'true' ELSE 'false' END AS KEY " +
" FROM ALL_TAB_COLUMNS atc " +
" LEFT JOIN ALL_COL_COMMENTS acc " +
--
Gitee