@nocobase/database 1.4.0-alpha.20241024151311 → 1.4.0-alpha.20241027230531

package/lib/collection.d.ts

@@ -132,6 +132,8 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     tableNameAsString(options?: {
         ignorePublicSchema: boolean;
     }): any;
+    getRealTableName(quoted?: boolean): any;
+    getRealFieldName(name: string, quoted?: boolean): string;
     getTableNameWithSchemaAsString(): string;
     quotedTableName(): any;
     collectionSchema(): string;

package/lib/collection.js

@@ -51,11 +51,11 @@ module.exports = __toCommonJS(collection_exports);
 var import_deepmerge = __toESM(require("deepmerge"));
 var import_events = require("events");
 var import_lodash = __toESM(require("lodash"));
+var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
 var import_sequelize = require("sequelize");
 var import_model = require("./model");
 var import_repository = require("./repository");
 var import_utils = require("./utils");
-var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
 function EnsureAtomicity(target, propertyKey, descriptor) {
   const originalMethod = descriptor.value;
   descriptor.value = function(...args) {
@@ -101,6 +101,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     this.bindFieldEventListener();
     this.modelInit();
     this.db.modelCollection.set(this.model, this);
+    this.db.modelNameCollectionMap.set(this.model.name, this);
     this.db.tableNameCollectionMap.set(this.getTableNameWithSchemaAsString(), this);
     if (!options.inherits) {
       this.setFields(options.fields);
@@ -179,8 +180,46 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     } else if (model) {
       M = model;
     }
+    const collection = this;
     this.model = class extends M {
     };
+    Object.defineProperty(this.model, "primaryKeyAttribute", {
+      get: function() {
+        const singleFilterTargetKey = (() => {
+          if (!collection.options.filterTargetKey) {
+            return null;
+          }
+          if (Array.isArray(collection.options.filterTargetKey) && collection.options.filterTargetKey.length === 1) {
+            return collection.options.filterTargetKey[0];
+          }
+          return collection.options.filterTargetKey;
+        })();
+        if (!this._primaryKeyAttribute && singleFilterTargetKey && collection.getField(singleFilterTargetKey)) {
+          return singleFilterTargetKey;
+        }
+        return this._primaryKeyAttribute;
+      }.bind(this.model),
+      set(value) {
+        this._primaryKeyAttribute = value;
+      }
+    });
+    Object.defineProperty(this.model, "primaryKeyAttributes", {
+      get: function() {
+        if (Array.isArray(this._primaryKeyAttributes) && this._primaryKeyAttributes.length) {
+          return this._primaryKeyAttributes;
+        }
+        if (collection.options.filterTargetKey) {
+          const fields = import_lodash.default.castArray(collection.options.filterTargetKey);
+          if (fields.every((field) => collection.getField(field))) {
+            return fields;
+          }
+        }
+        return this._primaryKeyAttributes;
+      }.bind(this.model),
+      set(value) {
+        this._primaryKeyAttributes = value;
+      }
+    });
     this.model.init(null, this.sequelizeModelOptions());
     this.model.options.modelName = this.options.name;
     if (!autoGenId) {
@@ -597,6 +636,14 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     }
     return `${schema}.${tableName}`;
   }
+  getRealTableName(quoted = false) {
+    const realname = this.tableNameAsString();
+    return !quoted ? realname : this.db.sequelize.getQueryInterface().quoteIdentifiers(realname);
+  }
+  getRealFieldName(name, quoted = false) {
+    const realname = this.model.getAttributes()[name].field;
+    return !quoted ? name : this.db.sequelize.getQueryInterface().quoteIdentifier(realname);
+  }
   getTableNameWithSchemaAsString() {
     const tableName = this.model.tableName;
     if (this.collectionSchema() && this.db.inDialect("postgres")) {
@@ -630,12 +677,13 @@ const _Collection = class _Collection extends import_events.EventEmitter {
   }
   sequelizeModelOptions() {
     const { name } = this.options;
-    return {
+    const attr = {
       ...import_lodash.default.omit(this.options, ["name", "fields", "model", "targetKey"]),
       modelName: name,
       sequelize: this.context.database.sequelize,
       tableName: this.tableName()
     };
+    return attr;
   }
   bindFieldEventListener() {
     this.on("field.afterAdd", (field) => {

package/lib/database.d.ts

@@ -80,6 +80,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     collections: Map<string, Collection<any, any>>;
     pendingFields: Map<string, FieldTypes.RelationField[]>;
     modelCollection: Map<ModelStatic<any>, Collection<any, any>>;
+    modelNameCollectionMap: Map<string, Collection<any, any>>;
     tableNameCollectionMap: Map<string, Collection<any, any>>;
     context: any;
     queryInterface: QueryInterface;
@@ -132,6 +133,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     collection<Attributes = any, CreateAttributes = Attributes>(options: CollectionOptions): Collection<Attributes, CreateAttributes>;
     getTablePrefix(): string;
     getFieldByPath(path: string): any;
+    getCollectionByModelName(name: string): Collection<any, any>;
     /**
      * get exists collection by its name
      * @param name

package/lib/database.js

@@ -90,6 +90,7 @@ const _Database = class _Database extends import_events.EventEmitter {
   collections = /* @__PURE__ */ new Map();
   pendingFields = /* @__PURE__ */ new Map();
   modelCollection = /* @__PURE__ */ new Map();
+  modelNameCollectionMap = /* @__PURE__ */ new Map();
   tableNameCollectionMap = /* @__PURE__ */ new Map();
   context = {};
   queryInterface;
@@ -430,6 +431,9 @@ const _Database = class _Database extends import_events.EventEmitter {
     }
     return field;
   }
+  getCollectionByModelName(name) {
+    return this.modelNameCollectionMap.get(name);
+  }
   /**
    * get exists collection by its name
    * @param name

package/lib/features/referential-integrity-check.js

@@ -32,7 +32,7 @@ __export(referential_integrity_check_exports, {
 module.exports = __toCommonJS(referential_integrity_check_exports);
 async function referentialIntegrityCheck(options) {
   const { referencedInstance, db, transaction } = options;
-  const collection = db.modelCollection.get(referencedInstance.constructor);
+  const collection = db.getCollectionByModelName(referencedInstance.constructor.name);
   const collectionName = collection.name;
   const references = db.referenceMap.getReferences(collectionName);
   if (!references) {

package/lib/operators/string.js

@@ -38,6 +38,11 @@ function escapeLike(value) {
 __name(escapeLike, "escapeLike");
 var string_default = {
   $includes(value, ctx) {
+    if (value === null) {
+      return {
+        [import_sequelize.Op.is]: null
+      };
+    }
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
         [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(item)}%`
@@ -51,6 +56,11 @@ var string_default = {
     };
   },
   $notIncludes(value, ctx) {
+    if (value === null) {
+      return {
+        [import_sequelize.Op.not]: null
+      };
+    }
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
         [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(item)}%`

package/lib/update-associations.js

@@ -323,7 +323,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     } else if (item.sequelize) {
       setItems.push(item);
     } else if (typeof item === "object") {
-      const targetKey2 = association.targetKey || "id";
+      const targetKey2 = association.targetKey || association.options.targetKey || "id";
       if (item[targetKey2]) {
         const attributes = {
           [targetKey2]: item[targetKey2]
@@ -337,9 +337,9 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
   await model[setAccessor](setItems, { transaction, context, individualHooks: true });
   const newItems = [];
   const pk = association.target.primaryKeyAttribute;
-  const tmpKey = (_a = association["options"]) == null ? void 0 : _a["targetKey"];
   let targetKey = pk;
   const db = model.constructor["database"];
+  const tmpKey = (_a = association["options"]) == null ? void 0 : _a["targetKey"];
   if (tmpKey !== pk) {
     const targetKeyFieldOptions = (_b = db.getFieldByPath(`${association.target.name}.${tmpKey}`)) == null ? void 0 : _b.options;
     if (targetKeyFieldOptions == null ? void 0 : targetKeyFieldOptions.unique) {
@@ -405,7 +405,8 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     }
   }
   for (const newItem of newItems) {
-    const existIndexInSetItems = setItems.findIndex((setItem) => setItem[targetKey] === newItem[targetKey]);
+    const findTargetKey = association.targetKey || association.options.targetKey || targetKey;
+    const existIndexInSetItems = setItems.findIndex((setItem) => setItem[findTargetKey] === newItem[findTargetKey]);
     if (existIndexInSetItems !== -1) {
       setItems[existIndexInSetItems] = newItem;
     } else {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.4.0-alpha.20241024151311",
+  "version": "1.4.0-alpha.20241027230531",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.4.0-alpha.20241024151311",
-    "@nocobase/utils": "1.4.0-alpha.20241024151311",
+    "@nocobase/logger": "1.4.0-alpha.20241027230531",
+    "@nocobase/utils": "1.4.0-alpha.20241027230531",
     "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": "3a8d759b6d14b87dd6c2929a028bc19bccbdfe45"
+  "gitHead": "6f363bf299af23580d68c8b0659e4d31d70f4687"
 }