@nocobase/database 1.8.22 → 1.8.24

package/lib/eager-loading/eager-loading-tree.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_append_child_collection_name_after_repository_find = require("../listeners/append-child-collection-name-after-repository-find");
 var import_options_parser = require("../options-parser");
+var import_utils = require("../utils");
 const pushAttribute = /* @__PURE__ */ __name((node, attribute) => {
   if (import_lodash.default.isArray(node.attributes) && !node.attributes.includes(attribute)) {
     node.attributes.push(attribute);
@@ -85,25 +86,6 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
       )
       SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
 }, "queryParentSQL");
-const processIncludes = /* @__PURE__ */ __name((includes, model, parentAs = "") => {
-  includes.forEach((include, index) => {
-    const association = model.associations[include.association];
-    if (association == null ? void 0 : association.generateInclude) {
-      includes[index] = {
-        ...include,
-        ...association.generateInclude(parentAs)
-      };
-    }
-    if (include.include && Array.isArray(include.include) && include.include.length > 0) {
-      const nextModel = association == null ? void 0 : association.target;
-      if (!nextModel) {
-        return;
-      }
-      processIncludes(include.include, nextModel, parentAs ? `${parentAs}->${association.as}` : association.as);
-    }
-  });
-  return includes;
-}, "processIncludes");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
   db;
@@ -233,7 +215,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             attributes: [primaryKeyField],
             group: `${node.model.name}.${primaryKeyField}`,
             transaction,
-            include: processIncludes(includeForFilter, node.model)
+            include: (0, import_utils.processIncludes)(includeForFilter, node.model)
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });

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

@@ -27,7 +27,9 @@ export default class PostgresQueryInterface extends QueryInterface {
         currentVal: number;
     }>;
     collectionTableExists(collection: Collection, options?: any): Promise<any>;
-    listViews(): Promise<[unknown[], unknown]>;
+    listViews(options?: {
+        schema?: string;
+    }): Promise<[unknown[], unknown]>;
     viewDef(viewName: string): Promise<string>;
     parseSQL(sql: string): any;
     viewColumnUsage(options: any): Promise<{

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

@@ -110,9 +110,9 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
     const results = await this.db.sequelize.query(sql, { type: "SELECT", transaction });
     return results[0]["exists"];
   }
-  async listViews() {
+  async listViews(options) {
     var _a;
-    const targetSchema = ((_a = this.db.options) == null ? void 0 : _a.schema) || "public";
+    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

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

@@ -18,7 +18,9 @@ export default abstract class QueryInterface {
     sequelizeQueryInterface: SequelizeQueryInterface;
     protected constructor(db: Database);
     abstract collectionTableExists(collection: Collection, options?: Transactionable): Promise<boolean>;
-    abstract listViews(): any;
+    abstract listViews(options?: {
+        schema?: string;
+    }): any;
     abstract viewDef(viewName: string): Promise<string>;
     abstract viewColumnUsage(options: {
         viewName: string;

package/lib/repository.js

@@ -72,6 +72,7 @@ var import_hasone_repository = require("./relation-repository/hasone-repository"
 var import_update_associations = require("./update-associations");
 var import_update_guard = require("./update-guard");
 var import_filter_utils = require("./utils/filter-utils");
+var import_utils2 = require("./utils");
 var import_sequelize2 = require("sequelize");
 const debug = require("debug")("noco-database");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {
@@ -134,7 +135,6 @@ const _Repository = class _Repository {
    * return count by filter
    */
   async count(countOptions) {
-    var _a;
     let options = countOptions ? import_lodash.default.clone(countOptions) : {};
     const transaction2 = await this.getTransaction(options);
     if (countOptions == null ? void 0 : countOptions.filter) {
@@ -155,7 +155,9 @@ const _Repository = class _Repository {
       ...options,
       distinct: Boolean(this.collection.model.primaryKeyAttribute) && !this.collection.isMultiFilterTargetKey()
     };
-    if (((_a = queryOptions.include) == null ? void 0 : _a.length) === 0) {
+    if (Array.isArray(queryOptions.include) && queryOptions.include.length > 0) {
+      queryOptions.include = (0, import_utils2.processIncludes)(queryOptions.include, this.collection.model);
+    } else {
       delete queryOptions.include;
     }
     return await this.collection.model.count({
@@ -174,7 +176,6 @@ const _Repository = class _Repository {
     const tableName = this.collection.tableName();
     try {
       if (this.database.isMySQLCompatibleDialect()) {
-        await this.database.sequelize.query(`ANALYZE TABLE ${this.collection.getTableNameWithSchema()}`);
         const results = await this.database.sequelize.query(
           `
         SELECT table_rows FROM information_schema.tables
@@ -183,17 +184,16 @@ const _Repository = class _Repository {
       `,
           { replacements: [tableName], type: import_sequelize.QueryTypes.SELECT }
         );
-        return Number(((_a = results == null ? void 0 : results[0]) == null ? void 0 : _a.table_rows) ?? 0);
+        return Number(((_a = results == null ? void 0 : results[0]) == null ? void 0 : _a[this.database.inDialect("mysql") ? "TABLE_ROWS" : "table_rows"]) ?? 0);
       }
       if (this.database.isPostgresCompatibleDialect()) {
-        await this.database.sequelize.query(`ANALYZE ${this.collection.getTableNameWithSchema()}`);
         const results = await this.database.sequelize.query(
           `
         SELECT reltuples::BIGINT AS estimate
         FROM pg_class c JOIN pg_namespace n ON c.relnamespace = n.oid
-        WHERE c.relname = ? AND n.nspname = current_schema();
+        WHERE c.relname = ? AND n.nspname = ?;
       `,
-          { replacements: [tableName], type: import_sequelize.QueryTypes.SELECT }
+          { replacements: [tableName, this.collection.collectionSchema()], type: import_sequelize.QueryTypes.SELECT, logging: true }
         );
         return Number(((_b = results == null ? void 0 : results[0]) == null ? void 0 : _b.estimate) ?? 0);
       }

package/lib/utils.d.ts

@@ -16,3 +16,4 @@ export declare function percent2float(value: string): number;
 export declare function isUndefinedOrNull(value: any): boolean;
 export declare function isStringOrNumber(value: any): boolean;
 export declare function getKeysByPrefix(keys: string[], prefix: string): string[];
+export declare function processIncludes(includes: any[], model: any, parentAs?: string): any[];

package/lib/utils.js

@@ -45,6 +45,7 @@ __export(utils_exports, {
   md5: () => md5,
   patchSequelizeQueryInterface: () => patchSequelizeQueryInterface,
   percent2float: () => percent2float,
+  processIncludes: () => processIncludes,
   snakeCase: () => snakeCase
 });
 module.exports = __toCommonJS(utils_exports);
@@ -140,6 +141,26 @@ function getKeysByPrefix(keys, prefix) {
   return keys.filter((key) => key.startsWith(`${prefix}.`)).map((key) => key.substring(prefix.length + 1));
 }
 __name(getKeysByPrefix, "getKeysByPrefix");
+function processIncludes(includes, model, parentAs = "") {
+  includes.forEach((include, index) => {
+    const association = model.associations[include.association];
+    if (association == null ? void 0 : association.generateInclude) {
+      includes[index] = {
+        ...include,
+        ...association.generateInclude(parentAs)
+      };
+    }
+    if (include.include && Array.isArray(include.include) && include.include.length > 0) {
+      const nextModel = association == null ? void 0 : association.target;
+      if (!nextModel) {
+        return;
+      }
+      processIncludes(include.include, nextModel, parentAs ? `${parentAs}->${association.as}` : association.as);
+    }
+  });
+  return includes;
+}
+__name(processIncludes, "processIncludes");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkIdentifier,
@@ -150,5 +171,6 @@ __name(getKeysByPrefix, "getKeysByPrefix");
   md5,
   patchSequelizeQueryInterface,
   percent2float,
+  processIncludes,
   snakeCase
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.8.22",
+  "version": "1.8.24",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.8.22",
-    "@nocobase/utils": "1.8.22",
+    "@nocobase/logger": "1.8.24",
+    "@nocobase/utils": "1.8.24",
     "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": "212753cf12f15577c4cf6a5e1761c44a2f168963"
+  "gitHead": "e3907742d0f42d21943f7807bb254838fafd5fff"
 }