@nocobase/database 1.9.0-beta.4 → 1.9.0-beta.5

package/lib/cursor-builder.js

@@ -87,7 +87,7 @@ const _SmartCursorBuilder = class _SmartCursorBuilder {
         AND a.attnum = ANY(ix.indkey)
         AND t.relkind = 'r'
         AND n.nspname = current_schema()
-        AND t.relname = $1
+        AND t.relname = ?
       ORDER BY 
         i.relname, 
         array_position(ix.indkey, a.attnum)
@@ -145,8 +145,9 @@ const _SmartCursorBuilder = class _SmartCursorBuilder {
           isUnique: indexType < 3
         });
       }
-      const index = indexes.get(row.INDEX_NAME);
-      index.columns[row.SEQ_IN_INDEX - 1] = row.COLUMN_NAME;
+      const seqInIndex = dialect === "postgres" ? row.seq_in_index : row.SEQ_IN_INDEX;
+      const index = indexes.get(indexName);
+      index.columns[seqInIndex - 1] = columnName;
     }
     for (const index of indexes.values()) {
       if (index.isPrimary) {

package/lib/index.d.ts

@@ -41,3 +41,4 @@ export * from './view-collection';
 export { default as fieldTypeMap } from './view/field-type-map';
 export * from './view/view-inference';
 export * from './update-guard';
+export { default as operators } from './operators';

package/lib/index.js

@@ -56,6 +56,7 @@ __export(src_exports, {
   fieldTypeMap: () => import_field_type_map.default,
   fn: () => import_sequelize.fn,
   literal: () => import_sequelize.literal,
+  operators: () => import_operators.default,
   snakeCase: () => import_utils.snakeCase,
   sqlParser: () => import_sql_parser.default,
   where: () => import_sequelize.where
@@ -96,6 +97,7 @@ __reExport(src_exports, require("./view-collection"), module.exports);
 var import_field_type_map = __toESM(require("./view/field-type-map"));
 __reExport(src_exports, require("./view/view-inference"), module.exports);
 __reExport(src_exports, require("./update-guard"), module.exports);
+var import_operators = __toESM(require("./operators"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseError,
@@ -116,6 +118,7 @@ __reExport(src_exports, require("./update-guard"), module.exports);
   fieldTypeMap,
   fn,
   literal,
+  operators,
   snakeCase,
   sqlParser,
   where,

package/lib/magic-attribute-model.js

@@ -126,6 +126,9 @@ const _MagicAttributeModel = class _MagicAttributeModel extends import_model.Mod
       return this;
     }
     if (!options) options = {};
+    if (this.dataValues[this.magicAttribute] === null) {
+      this.dataValues[this.magicAttribute] = {};
+    }
     if (!options.raw) {
       originalValue = this.dataValues[key];
     }

package/lib/operators/empty.d.ts

@@ -6,8 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-declare const _default: {
-    $empty(_: any, ctx: any): any;
-    $notEmpty(_: any, ctx: any): any;
-};
+declare const _default: Record<string, any>;
 export default _default;

package/lib/operators/index.d.ts

@@ -7,7 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 declare const _default: {
-    $empty(_: any, ctx: any): any;
-    $notEmpty(_: any, ctx: any): any;
+    [x: string]: any;
 };
 export default _default;

package/lib/options-parser.js

@@ -150,7 +150,7 @@ const _OptionsParser = class _OptionsParser {
     if (defaultSortField && !((_b = this.options) == null ? void 0 : _b.group)) {
       defaultSortField = import_lodash.default.castArray(defaultSortField);
       for (const key of defaultSortField) {
-        if (!sort.includes(key)) {
+        if (!sort.includes(key) && !sort.includes(`-${key}`)) {
           sort.push(key);
         }
       }

package/lib/repository.d.ts

@@ -154,6 +154,8 @@ export declare class Repository<TModelAttributes extends {} = any, TCreationAttr
      * return count by filter
      */
     count(countOptions?: CountOptions): Promise<number>;
+    getEstimatedRowCount(): Promise<number>;
+    private getOracleSchema;
     aggregate(options: AggregateOptions & {
         optionsTransformer?: (options: any) => any;
     }): Promise<any>;

package/lib/repository.js

@@ -163,6 +163,83 @@ const _Repository = class _Repository {
       transaction: transaction2
     });
   }
+  async getEstimatedRowCount() {
+    var _a, _b, _c, _d;
+    if (import_lodash2.default.isFunction(this.collection["isSql"]) && this.collection["isSql"]()) {
+      return 0;
+    }
+    if (import_lodash2.default.isFunction(this.collection["isView"]) && this.collection["isView"]()) {
+      return 0;
+    }
+    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
+        WHERE table_schema = DATABASE()
+          AND table_name = ?
+      `,
+          { replacements: [tableName], type: import_sequelize.QueryTypes.SELECT }
+        );
+        return Number(((_a = results == null ? void 0 : results[0]) == null ? void 0 : _a.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();
+      `,
+          { replacements: [tableName], type: import_sequelize.QueryTypes.SELECT }
+        );
+        return Number(((_b = results == null ? void 0 : results[0]) == null ? void 0 : _b.estimate) ?? 0);
+      }
+      if (this.database.sequelize.getDialect() === "mssql") {
+        const results = await this.database.sequelize.query(
+          `
+        SELECT SUM(row_count) AS estimate
+        FROM sys.dm_db_partition_stats
+        WHERE object_id = OBJECT_ID(?) AND (index_id = 0 OR index_id = 1)
+      `,
+          { replacements: [tableName], type: import_sequelize.QueryTypes.SELECT }
+        );
+        return Number(((_c = results == null ? void 0 : results[0]) == null ? void 0 : _c.estimate) ?? 0);
+      }
+      if (this.database.sequelize.getDialect() === "oracle") {
+        const tableName2 = this.collection.name.toUpperCase();
+        const schemaName = (await this.getOracleSchema()).toUpperCase();
+        await this.database.sequelize.query(`BEGIN DBMS_STATS.GATHER_TABLE_STATS(:schema, :table); END;`, {
+          replacements: { schema: schemaName, table: tableName2 },
+          type: import_sequelize.QueryTypes.RAW
+        });
+        const results = await this.database.sequelize.query(
+          `
+      SELECT NUM_ROWS AS "estimate"
+      FROM ALL_TABLES
+      WHERE TABLE_NAME = :table AND OWNER = :schema
+      `,
+          {
+            replacements: { table: tableName2, schema: schemaName },
+            type: import_sequelize.QueryTypes.SELECT
+          }
+        );
+        return Number(((_d = results == null ? void 0 : results[0]) == null ? void 0 : _d.estimate) ?? 0);
+      }
+    } catch (error) {
+      this.database.logger.error(`Failed to get estimated row count for ${this.collection.name}:`, error);
+      return 0;
+    }
+    return 0;
+  }
+  async getOracleSchema() {
+    const [result] = await this.database.sequelize.query(`SELECT USER FROM DUAL`, {
+      type: import_sequelize.QueryTypes.SELECT
+    });
+    return (result == null ? void 0 : result["USER"]) ?? "";
+  }
   async aggregate(options) {
     var _a;
     const { method, field } = options;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.0-beta.4",
+  "version": "1.9.0-beta.5",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.0-beta.4",
-    "@nocobase/utils": "1.9.0-beta.4",
+    "@nocobase/logger": "1.9.0-beta.5",
+    "@nocobase/utils": "1.9.0-beta.5",
     "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": "0276aa12d87f82c73d62a9712134fe363e2c772a"
+  "gitHead": "9a61c60dd3db5af64244e82447309b0cb17aabb6"
 }