pg和dm生成语句增加模式名

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/DMQuery.java

@@ -26,7 +26,7 @@ public class DMQuery extends AbstractDbQuery {
     @Override
     public String tablesSql() {
         return "SELECT * FROM (SELECT DISTINCT T1.TABLE_NAME AS TABLE_NAME,T2.COMMENTS AS TABLE_COMMENT FROM USER_TAB_COLUMNS T1 " +
-            "INNER JOIN USER_TAB_COMMENTS T2 ON T1.TABLE_NAME = T2.TABLE_NAME) WHERE 1=1 ";
+            "INNER JOIN USER_TAB_COMMENTS T2 ON T1.TABLE_NAME = T2.TABLE_NAME and owner='%s') WHERE 1=1 ";
     }
 
     @Override
@@ -44,7 +44,7 @@ public class DMQuery extends AbstractDbQuery {
                         "T1.COLUMN_NAME=T2.COLUMN_NAME AND " +
                         "T1.TABLE_NAME = T3.TABLE_NAME(+) AND " +
                         "T1.COLUMN_NAME=T3.COLUMN_NAME(+)   AND " +
-                        "T1.TABLE_NAME = '%s' " +
+                        "T1.TABLE_NAME = '%s' and owner='%s' " +
                         "ORDER BY T2.TABLE_NAME,T2.COLUMN_ID";
     }
 

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/DbQueryDecorator.java

@@ -108,9 +108,9 @@ public class DbQueryDecorator extends AbstractDbQuery {
             tableFieldsSql = String.format(tableFieldsSql.replace("#schema", this.schema), tableName, tableName.toUpperCase());
         } else if (DbType.DM == dbType) {
             tableName = tableName.toUpperCase();
-            tableFieldsSql = String.format(tableFieldsSql, tableName);
+            tableFieldsSql = String.format(tableFieldsSql, tableName,this.schema);
         } else if (DbType.POSTGRE_SQL == dbType) {
-            tableFieldsSql = String.format(tableFieldsSql, tableName, tableName, tableName);
+            tableFieldsSql = String.format(tableFieldsSql, tableName, tableName, tableName,this.schema);
         } else {
             tableFieldsSql = String.format(tableFieldsSql, tableName);
         }

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/PostgreSqlQuery.java

@@ -49,14 +49,15 @@ public class PostgreSqlQuery extends AbstractDbQuery {
             "        pg_class,\n" +
             "        pg_attribute\n" +
             "    WHERE\n" +
-            "        pg_class.oid ='\"%s\"' :: regclass\n" +
+            "        pg_class.oid ='%s' :: regclass\n" +
             "    AND pg_index.indrelid = pg_class.oid\n" +
             "    AND pg_attribute.attrelid = pg_class.oid\n" +
             "    AND pg_attribute.attnum = ANY (pg_index.indkey)\n" +
             ") B ON A.attname = b.attname\n" +
             "INNER JOIN pg_class C on A.attrelid = C.oid\n" +
             "INNER JOIN information_schema.columns D on A.attname = D.column_name\n" +
-            "WHERE A.attrelid ='\"%s\"' :: regclass AND A.attnum> 0 AND NOT A.attisdropped AND D.table_name = '%s'\n" +
+            "WHERE A.attrelid ='%s' :: regclass AND A.attnum> 0 AND NOT A.attisdropped AND D.table_name = '%s'\n" +
+            " and table_schema='%s'\n" +
             "ORDER BY A.attnum;";
     }