@nocobase/database 2.0.0-alpha.53 → 2.0.0-alpha.54

package/lib/collection.js

@@ -295,6 +295,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     this.model.options.modelName = this.options.name;
     if (!autoGenId) {
       this.model.removeAttribute("id");
+      this.model.autoIncrementAttribute = null;
     }
     this.model.database = this.context.database;
     this.model.collection = this;

package/lib/database.js

@@ -438,7 +438,7 @@ const _Database = class _Database extends import_events.EventEmitter {
     this.emit("beforeDefineCollection", options);
     const collection = this.collectionFactory.createCollection(options);
     this.collections.set(collection.name, collection);
-    this.emit("afterDefineCollection", collection);
+    this.emit("afterDefineCollection", collection, { fieldModels: options.fieldModels });
     return collection;
   }
   getTablePrefix() {
@@ -487,6 +487,9 @@ const _Database = class _Database extends import_events.EventEmitter {
   }
   removeCollection(name) {
     const collection = this.collections.get(name);
+    if (!collection) {
+      return;
+    }
     this.emit("beforeRemoveCollection", collection);
     collection.resetFields();
     const result = this.collections.delete(name);

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

@@ -78,7 +78,7 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
   return `WITH RECURSIVE cte AS (
       SELECT ${q(targetKeyField)}, ${q(foreignKeyField)}
       FROM ${tableName}
-      WHERE ${q(targetKeyField)} IN (${nodeIds.join(",")})
+      WHERE ${q(targetKeyField)} IN ('${nodeIds.join("','")}')
       UNION ALL
       SELECT t.${q(targetKeyField)}, t.${q(foreignKeyField)}
       FROM ${tableName} AS t

package/lib/fields/field.js

@@ -131,12 +131,16 @@ const _Field = class _Field {
     Object.assign(this.options, obj);
   }
   bind() {
+    var _a;
     const { model } = this.context.collection;
     model.rawAttributes[this.name] = this.toSequelize();
     model.refreshAttributes();
     if (this.options.index) {
       this.context.collection.addIndex([this.name]);
     }
+    if (((_a = this.options) == null ? void 0 : _a.autoIncrement) === true && !model.autoIncrementAttribute) {
+      model._findAutoIncrementAttribute();
+    }
   }
   unbind() {
     const { model } = this.context.collection;

package/lib/fields/snowflake-id-field.js

@@ -49,9 +49,17 @@ const _SnowflakeIdField = class _SnowflakeIdField extends import_field.Field {
     }
   }
   init() {
-    const { name } = this.options;
-    this.listener = (instance) => this.setId(name, instance);
+    const { name, autoFill } = this.options;
+    this.listener = (instance) => {
+      if (autoFill === false) {
+        return;
+      }
+      this.setId(name, instance);
+    };
     this.bulkListener = async (instances) => {
+      if (autoFill === false) {
+        return;
+      }
       for (const instance of instances) {
         this.setId(name, instance);
       }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.53",
+  "version": "2.0.0-alpha.54",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.53",
-    "@nocobase/utils": "2.0.0-alpha.53",
+    "@nocobase/logger": "2.0.0-alpha.54",
+    "@nocobase/utils": "2.0.0-alpha.54",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "ff30cf8261f5a97b3f24c3752af5bbc564167b37"
+  "gitHead": "68c84deaabba0ebec7407bf7245376b8d843449c"
 }