@nocobase/database 1.4.0-alpha.20240919174335 → 1.4.0-alpha.20240928155737

package/lib/database.js

@@ -64,6 +64,7 @@ var import_database_utils = __toESM(require("./database-utils"));
 var import_references_map = __toESM(require("./features/references-map"));
 var import_referential_integrity_check = require("./features/referential-integrity-check");
 var FieldTypes = __toESM(require("./fields"));
+var import_helpers = require("./helpers");
 var import_inherited_collection = require("./inherited-collection");
 var import_inherited_map = __toESM(require("./inherited-map"));
 var import_interface_manager = require("./interface-manager");
@@ -360,9 +361,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 +659,7 @@ const _Database = class _Database extends import_events.EventEmitter {
    * @internal
    */
   async checkVersion() {
-    return true;
+    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/lib/relation-repository/relation-repository.js

@@ -123,7 +123,7 @@ const _RelationRepository = class _RelationRepository {
   }
   convertTk(options) {
     let tk = options;
-    if (typeof options === "object" && options["tk"]) {
+    if (typeof options === "object" && "tk" in options) {
       tk = options["tk"];
     }
     return tk;
@@ -133,7 +133,10 @@ const _RelationRepository = class _RelationRepository {
     if (typeof tk === "string") {
       tk = tk.split(",");
     }
-    return import_lodash.default.castArray(tk);
+    if (tk) {
+      return import_lodash.default.castArray(tk);
+    }
+    return [];
   }
   targetKey() {
     return this.associationField.targetKey;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.4.0-alpha.20240919174335",
+  "version": "1.4.0-alpha.20240928155737",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.4.0-alpha.20240919174335",
-    "@nocobase/utils": "1.4.0-alpha.20240919174335",
+    "@nocobase/logger": "1.4.0-alpha.20240928155737",
+    "@nocobase/utils": "1.4.0-alpha.20240928155737",
     "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": "57b1697b219b5c8e6a0444ee19bd66cd598bd07f"
+  "gitHead": "f2765665126f5e9b5ae01f9ca6e8a151916554b4"
 }