@nocobase/database 2.1.24 → 2.1.26

package/lib/database.js

@@ -772,7 +772,10 @@ const _Database = class _Database extends import_events.EventEmitter {
       },
       async onDump(dumper, collection) {
         try {
-          const viewDef = await collection.db.queryInterface.viewDef(collection.getTableNameWithSchemaAsString());
+          const viewDef = await collection.db.queryInterface.viewDef({
+            viewName: collection.model.tableName,
+            schema: collection.db.inDialect("postgres") ? collection.collectionSchema() : void 0
+          });
           dumper.writeSQLContent(`view-${collection.name}`, {
             sql: [
               `DROP VIEW IF EXISTS ${collection.getTableNameWithSchemaAsString()}`,

package/lib/query-interface/mysql-query-interface.d.ts

@@ -24,7 +24,10 @@ export default class MysqlQueryInterface extends QueryInterface {
         };
     }>;
     parseSQL(sql: string): any;
-    viewDef(viewName: string): Promise<string>;
+    viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     showTableDefinition(tableInfo: TableInfo): Promise<any>;
     getAutoIncrementInfo(options: {
         tableInfo: TableInfo;

package/lib/query-interface/mysql-query-interface.js

@@ -67,7 +67,7 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
   }
   async viewColumnUsage(options) {
     try {
-      const { ast } = this.parseSQL(await this.viewDef(options.viewName));
+      const { ast } = this.parseSQL(await this.viewDef(options));
       const columns = ast.columns;
       const results = [];
       for (const column of columns) {
@@ -90,8 +90,13 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
   parseSQL(sql) {
     return import_sql_parser.default.parse(sql);
   }
-  async viewDef(viewName) {
-    const viewDefinition = await this.db.sequelize.query(`SHOW CREATE VIEW ${viewName}`, { type: "SELECT" });
+  async viewDef(options) {
+    const tableName = options.schema ? {
+      schema: options.schema,
+      tableName: options.viewName
+    } : options.viewName;
+    const quotedViewName = this.db.utils.quoteTable(tableName);
+    const viewDefinition = await this.db.sequelize.query(`SHOW CREATE VIEW ${quotedViewName}`, { type: "SELECT" });
     const createView = viewDefinition[0]["Create View"];
     const regex = /(?<=AS\s)([\s\S]*)/i;
     const match = createView.match(regex);

package/lib/query-interface/postgres-query-interface.d.ts

@@ -30,9 +30,15 @@ export default class PostgresQueryInterface extends QueryInterface {
     listViews(options?: {
         schema?: string;
     }): Promise<[unknown[], unknown]>;
-    viewDef(viewName: string): Promise<string>;
+    viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     parseSQL(sql: string): any;
-    viewColumnUsage(options: any): Promise<{
+    viewColumnUsage(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<{
         [view_column_name: string]: {
             column_name: string;
             table_name: string;

package/lib/query-interface/postgres-query-interface.js

@@ -113,26 +113,33 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
   async listViews(options) {
     var _a;
     const targetSchema = (options == null ? void 0 : options.schema) || ((_a = this.db.options) == null ? void 0 : _a.schema) || "public";
-    const sql = targetSchema ? `
-      SELECT viewname as name, definition, schemaname as schema
-      FROM pg_views
-      WHERE schemaname = '${targetSchema}'
-      ORDER BY viewname;
-    ` : `
+    const sql = `
       SELECT viewname as name, definition, schemaname as schema
       FROM pg_views
-      WHERE schemaname NOT IN ('pg_catalog', 'information_schema')
+      WHERE schemaname = :targetSchema
       ORDER BY viewname;
     `;
-    return await this.db.sequelize.query(sql, { type: "SELECT" });
+    return await this.db.sequelize.query(sql, {
+      replacements: {
+        targetSchema
+      },
+      type: "SELECT"
+    });
   }
-  async viewDef(viewName) {
-    const [schema, name] = viewName.split(".");
+  async viewDef(options) {
+    const { viewName } = options;
+    const schema = options.schema || this.db.options.schema || "public";
     const viewDefQuery = await this.db.sequelize.query(
       `
-    select pg_get_viewdef(format('%I.%I', '${schema}', '${name}')::regclass, true) as definition
+    select pg_get_viewdef(format('%I.%I', :schema, :viewName)::regclass, true) as definition
     `,
-      { type: "SELECT" }
+      {
+        replacements: {
+          schema,
+          viewName
+        },
+        type: "SELECT"
+      }
     );
     return import_lodash.default.trim(viewDefQuery[0]["definition"]);
   }
@@ -142,15 +149,22 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
     });
   }
   async viewColumnUsage(options) {
-    const { viewName, schema = "public" } = options;
+    const { viewName } = options;
+    const schema = options.schema || this.db.options.schema || "public";
     const sql = `
       SELECT *
       FROM information_schema.view_column_usage
-      WHERE view_schema = '${schema}'
-        AND view_name = '${viewName}';
+      WHERE view_schema = :schema
+        AND view_name = :viewName;
     `;
-    const columnUsages = await this.db.sequelize.query(sql, { type: "SELECT" });
-    const def = await this.viewDef(`${schema}.${viewName}`);
+    const columnUsages = await this.db.sequelize.query(sql, {
+      replacements: {
+        schema,
+        viewName
+      },
+      type: "SELECT"
+    });
+    const def = await this.viewDef({ schema, viewName });
     try {
       const { ast } = this.parseSQL(def);
       const columns = ast[0].columns;

package/lib/query-interface/query-interface.d.ts

@@ -21,7 +21,10 @@ export default abstract class QueryInterface {
     abstract listViews(options?: {
         schema?: string;
     }): any;
-    abstract viewDef(viewName: string): Promise<string>;
+    abstract viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     abstract viewColumnUsage(options: {
         viewName: string;
         schema?: string;

package/lib/query-interface/sqlite-query-interface.d.ts

@@ -24,7 +24,10 @@ export default class SqliteQueryInterface extends QueryInterface {
         };
     }>;
     parseSQL(sql: string): any;
-    viewDef(viewName: string): Promise<string>;
+    viewDef(options: {
+        viewName: string;
+        schema?: string;
+    }): Promise<string>;
     showTableDefinition(tableInfo: TableInfo): Promise<any>;
     getAutoIncrementInfo(options: {
         tableInfo: TableInfo;

package/lib/query-interface/sqlite-query-interface.js

@@ -70,7 +70,7 @@ const _SqliteQueryInterface = class _SqliteQueryInterface extends import_query_i
   }
   async viewColumnUsage(options) {
     try {
-      const { ast } = this.parseSQL(await this.viewDef(options.viewName));
+      const { ast } = this.parseSQL(await this.viewDef(options));
       const columns = ast.columns;
       const results = [];
       for (const column of columns) {
@@ -93,12 +93,15 @@ const _SqliteQueryInterface = class _SqliteQueryInterface extends import_query_i
   parseSQL(sql) {
     return import_sql_parser.default.parse(sql);
   }
-  async viewDef(viewName) {
+  async viewDef(options) {
     const viewDefinition = await this.db.sequelize.query(
       `SELECT sql
        FROM sqlite_master
-       WHERE name = '${viewName}' AND type = 'view'`,
+       WHERE name = :viewName AND type = 'view'`,
       {
+        replacements: {
+          viewName: options.viewName
+        },
         type: "SELECT"
       }
     );

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.24",
-    "@nocobase/utils": "2.1.24",
+    "@nocobase/logger": "2.1.26",
+    "@nocobase/utils": "2.1.26",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "5b5e5c5987d6e93dadf940e0605e830b09f84f79"
+  "gitHead": "b25700115794487b342ac33a63a1a988c75c112c"
 }