From 83bbc1fce2f5a4fd4d8c8d12573e627b72ab2df6 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 24 Aug 2022 14:06:20 +0800 Subject: [PATCH 1/3] 1.6.0 --- .dockerignore | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..e7b1f96 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ + +.gitee +db +log +script +templates +front/node_modules \ No newline at end of file -- Gitee From a528505631dad1906dcb21ad2e0610e5c0063a49 Mon Sep 17 00:00:00 2001 From: yanghaiibo <281030340@qq.com> Date: Thu, 3 Nov 2022 07:33:05 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3PostgreSql=E8=A1=A8?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=AD=98=E5=9C=A8=E4=B8=BB=E9=94=AE=E4=B8=8E?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95=E9=80=A0=E6=88=90=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E5=88=97=E9=87=8D=E5=A4=8D=E5=87=BA=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yanghaiibo <281030340@qq.com> --- .../com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java index e08903b..ff7c7dd 100644 --- a/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java +++ b/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlColumnSelector.java @@ -32,7 +32,7 @@ public class PostgreSqlColumnSelector extends ColumnSelector { "CASE WHEN POSITION ( 'nextval' IN column_default ) > 0 THEN 1 ELSE 0 END AS is_identity " + "FROM " + " pg_constraint " + - " RIGHT JOIN pg_class ON pg_constraint.conrelid = pg_class.oid " + + " RIGHT JOIN pg_class ON pg_constraint.conrelid = pg_class.oid and pg_constraint.contype = 'p' " + " RIGHT JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid " + " RIGHT JOIN pg_type ON pg_type.oid = pg_attribute.atttypid " + " RIGHT JOIN information_schema.COLUMNS C ON C.TABLE_NAME = pg_class.relname " + -- Gitee From a6532079266d2ef26364d17cd9f74639d07cc8b7 Mon Sep 17 00:00:00 2001 From: JiaZH <1412148237@qq.com> Date: Fri, 25 Nov 2022 11:20:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?mysql=E5=A2=9E=E5=8A=A0column=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java b/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java index 4748e14..540bcfe 100644 --- a/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java +++ b/gen/src/main/java/com/gitee/gen/gen/mysql/MySqlColumnSelector.java @@ -34,7 +34,8 @@ public class MySqlColumnSelector extends ColumnSelector { " EXTRA AS 'Extra', " + " COLUMN_COMMENT AS 'Comment' " + " FROM information_schema.`COLUMNS` " + - " WHERE 1=1 AND TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s' "; + " WHERE 1=1 AND TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s' " + + " ORDER BY ORDINAL_POSITION"; public MySqlColumnSelector(GeneratorConfig generatorConfig) { super(generatorConfig); -- Gitee