@nocobase/database 0.21.0-alpha.11 → 0.21.0-alpha.13

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

@@ -213,6 +213,15 @@ const _EagerLoadingTree = class _EagerLoadingTree {
       } else if (ids.length > 0) {
         const association = node.association;
         const associationType = association.associationType;
+        let params = {};
+        const otherFindOptions = import_lodash.default.pick(node.includeOption, ["sort"]) || {};
+        const collection = this.db.modelCollection.get(node.model);
+        if (collection && !import_lodash.default.isEmpty(otherFindOptions)) {
+          const parser = new import_options_parser.OptionsParser(otherFindOptions, {
+            collection
+          });
+          params = parser.toSequelizeParams();
+        }
         if (associationType == "HasOne" || associationType == "HasMany") {
           const foreignKey = association.foreignKey;
           const foreignKeyValues = node.parent.instances.map((instance) => instance.get(association.sourceKey));
@@ -225,7 +234,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           const findOptions = {
             where,
             attributes: node.attributes,
-            order: orderOption(association),
+            order: params.order || orderOption(association),
             transaction
           };
           instances = await node.model.findAll(findOptions);
@@ -233,7 +242,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
         if (associationType == "BelongsTo") {
           const foreignKey = association.foreignKey;
           const parentInstancesForeignKeyValues = node.parent.instances.map((instance) => instance.get(foreignKey));
-          const collection = this.db.modelCollection.get(node.model);
+          const collection2 = this.db.modelCollection.get(node.model);
           instances = await node.model.findAll({
             transaction,
             where: {
@@ -245,7 +254,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             const targetKey = association.targetKey;
             const sql = import_adjacency_list_repository.AdjacencyListRepository.queryParentSQL({
               db: this.db,
-              collection,
+              collection: collection2,
               foreignKey,
               targetKey,
               nodeIds: instances.map((instance) => instance.get(targetKey))
@@ -298,7 +307,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
                 }
               }
             ],
-            order: orderOption(association)
+            order: params.order || orderOption(association)
           });
         }
       }

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

@@ -1,8 +1,10 @@
 import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class TextField extends Field {
-    get dataType(): DataTypes.TextDataTypeConstructor;
+    get dataType(): DataTypes.TextDataTypeConstructor | DataTypes.TextDataType;
+    init(): void;
 }
 export interface TextFieldOptions extends BaseColumnFieldOptions {
     type: 'text';
+    length?: 'tiny' | 'medium' | 'long';
 }

package/lib/fields/text-field.js

@@ -25,8 +25,16 @@ var import_sequelize = require("sequelize");
 var import_field = require("./field");
 const _TextField = class _TextField extends import_field.Field {
   get dataType() {
+    if (this.database.inDialect("mysql", "mariadb") && this.options.length) {
+      return import_sequelize.DataTypes.TEXT(this.options.length);
+    }
     return import_sequelize.DataTypes.TEXT;
   }
+  init() {
+    if (this.database.inDialect("mysql", "mariadb")) {
+      this.options.defaultValue = null;
+    }
+  }
 };
 __name(_TextField, "TextField");
 let TextField = _TextField;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.21.0-alpha.11",
+  "version": "0.21.0-alpha.13",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.21.0-alpha.11",
-    "@nocobase/utils": "0.21.0-alpha.11",
+    "@nocobase/logger": "0.21.0-alpha.13",
+    "@nocobase/utils": "0.21.0-alpha.13",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -36,5 +36,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "69fe8a6d75864a3ba98c5a6d3ebfe43a585d4cd3"
+  "gitHead": "27fced984ff80c7673ad49b6a7365578ca309fe7"
 }