@nocobase/database 1.3.24-beta → 1.3.26-beta

package/lib/database.js

@@ -360,9 +360,6 @@ const _Database = class _Database extends import_events.EventEmitter {
         options.underscored = true;
       }
       if (options.underscored) {
-        if (import_lodash.default.get(options, "sortable.scopeKey")) {
-          options.sortable.scopeKey = (0, import_utils3.snakeCase)(options.sortable.scopeKey);
-        }
         if (import_lodash.default.get(options, "indexes")) {
           options.indexes = options.indexes.map((index) => {
             if (index.fields) {
@@ -661,7 +658,7 @@ const _Database = class _Database extends import_events.EventEmitter {
    * @internal
    */
   async checkVersion() {
-    return await (0, import_helpers.checkDatabaseVersion)(this);
+    return process.env.DB_SKIP_VERSION_CHECK === "on" || await (0, import_helpers.checkDatabaseVersion)(this);
   }
   /**
    * @internal

package/lib/fields/number-field.d.ts

@@ -41,8 +41,14 @@ export interface RealFieldOptions extends BaseColumnFieldOptions {
     type: 'real';
 }
 export declare class DecimalField extends NumberField {
-    get dataType(): DataTypes.DecimalDataTypeConstructor;
+    get dataType(): DataTypes.DecimalDataType;
+    static optionsFromRawType(rawType: string): {
+        precision: number;
+        scale: number;
+    };
 }
 export interface DecimalFieldOptions extends BaseColumnFieldOptions {
     type: 'decimal';
+    precision: number;
+    scale: number;
 }

package/lib/fields/number-field.js

@@ -79,7 +79,16 @@ __name(_RealField, "RealField");
 let RealField = _RealField;
 const _DecimalField = class _DecimalField extends NumberField {
   get dataType() {
-    return import_sequelize.DataTypes.DECIMAL;
+    return import_sequelize.DataTypes.DECIMAL(this.options.precision, this.options.scale);
+  }
+  static optionsFromRawType(rawType) {
+    const matches = rawType.match(/DECIMAL\((\d+),\s*(\d+)\)/);
+    if (matches) {
+      return {
+        precision: parseInt(matches[1]),
+        scale: parseInt(matches[2])
+      };
+    }
   }
 };
 __name(_DecimalField, "DecimalField");

package/lib/fields/sort-field.js

@@ -157,9 +157,9 @@ const _SortField = class _SortField extends import_field.Field {
     }, "doInit");
     const scopeKey = this.options.scopeKey;
     if (scopeKey) {
-      const groups = await this.collection.repository.find({
-        attributes: [scopeKey],
-        group: [scopeKey],
+      const scopeKeyColumn = this.collection.model.rawAttributes[scopeKey].field;
+      const groups = await this.collection.model.findAll({
+        attributes: [[import_sequelize.Sequelize.fn("DISTINCT", import_sequelize.Sequelize.col(scopeKeyColumn)), scopeKey]],
         raw: true,
         transaction
       });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.3.24-beta",
+  "version": "1.3.26-beta",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.3.24-beta",
-    "@nocobase/utils": "1.3.24-beta",
+    "@nocobase/logger": "1.3.26-beta",
+    "@nocobase/utils": "1.3.26-beta",
     "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": "d575eb932c5651c2fa8dbef70e5c356efc6bf271"
+  "gitHead": "492868e32388615f75ba5af28f33420899d3b211"
 }