From e0188597564e0a5f02aab6f59b93c493901f23de Mon Sep 17 00:00:00 2001 From: Carry <2239264903@qq.com> Date: Mon, 25 Nov 2024 03:23:08 +0000 Subject: [PATCH] =?UTF-8?q?fix(postgresql-table)=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20postgresql-table=E5=A4=9A=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E8=A1=A8=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=BD=93=E6=95=B0=E6=8D=AE=E5=BA=93A?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E5=88=86=E5=88=AB=E6=9C=89=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E6=A8=A1=E5=BC=8Fdev=E5=92=8Cprod=E6=97=B6=EF=BC=8C=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E5=AD=98=E7=9A=84=E8=A1=A8=E6=98=AF=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=8E=9F=E6=9C=AC=E7=9A=84sql=E4=BC=9A?= =?UTF-8?q?=E5=B0=86=E4=B8=A4=E4=B8=AA=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E9=83=BD=E6=9F=A5=E8=AF=A2=E5=87=BA=E6=9D=A5=E3=80=82?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E4=BF=AE=E6=94=B9=E5=90=8E=E5=AD=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=9A=E8=BF=87=E8=BF=9E=E6=8E=A5pg=5Fnamespace?= =?UTF-8?q?=E8=A1=A8=E6=9D=A5=E8=8E=B7=E5=8F=96=E6=AF=8F=E4=B8=AA=E8=A1=A8?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=9A=84=E6=A8=A1=E5=BC=8F=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=88schemaname=EF=BC=89=EF=BC=8C=E5=B9=B6=E5=9C=A8?= =?UTF-8?q?=E4=B8=8E=E4=B8=BB=E6=9F=A5=E8=AF=A2=E8=BF=9B=E8=A1=8C=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=97=B6=E5=8A=A0=E5=85=A5=E4=BA=86=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84=E5=8C=B9=E9=85=8D=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=B0=B1=E4=BF=9D=E8=AF=81=E4=BA=86=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carry <2239264903@qq.com> --- .../gen/gen/postgresql/PostgreSqlTableSelector.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlTableSelector.java b/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlTableSelector.java index 46b2782..ef06bda 100644 --- a/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlTableSelector.java +++ b/gen/src/main/java/com/gitee/gen/gen/postgresql/PostgreSqlTableSelector.java @@ -28,12 +28,12 @@ public class PostgreSqlTableSelector extends TableSelector { "FROM " + " pg_tables t LEFT JOIN " + " ( " + - " SELECT relname as tablename, obj_description(oid) AS cmt " + - " FROM pg_class C " + - " WHERE relkind='r' AND relname NOT LIKE 'pg_%%' AND relname NOT LIKE 'sql_%%' AND relchecks=0 " + + " SELECT C.relname as tablename, obj_description(C.oid) as cmt, n.nspname as schemaname " + + " FROM pg_class C join pg_namespace n on n.oid = C.relnamespace " + + " WHERE C.relkind='r' AND C.relname NOT LIKE 'pg_%%' AND C.relname NOT LIKE 'sql_%%' AND C.relchecks=0 " + " ORDER BY relname " + - ") t2 ON t.tablename = t2.tablename " + - "WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema' %s %s"; + ") t2 ON t.tablename = t2.tablename and t.schemaname = t2.schemaname " + + "WHERE t.schemaname != 'pg_catalog' AND t.schemaname != 'information_schema' %s %s"; @Override protected String getShowTablesSQL(GeneratorConfig generatorConfig) { @@ -42,7 +42,7 @@ public class PostgreSqlTableSelector extends TableSelector { schema = ""; } if (StringUtils.isNotBlank(schema)) { - schema = String.format("AND schemaname = '%s'", schema); + schema = String.format("AND t.schemaname = '%s'", schema); } List tableNames = wrapTableNames(); String and = ""; -- Gitee