@nocobase/database 1.4.0-alpha.20241025010959 → 1.4.0-alpha.20241031134640

package/lib/collection.d.ts

@@ -78,13 +78,13 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     repository: Repository<TModelAttributes, TCreationAttributes>;
     constructor(options: CollectionOptions, context: CollectionContext);
     get filterTargetKey(): string | string[];
-    isMultiFilterTargetKey(): boolean;
     get name(): string;
     get origin(): string;
     get titleField(): string;
     get db(): Database;
     get treeParentField(): BelongsToField | null;
     get treeChildrenField(): HasManyField | null;
+    isMultiFilterTargetKey(): boolean;
     tableName(): any;
     /**
      * @internal
@@ -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) {
@@ -123,9 +123,6 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     }
     return this.model.primaryKeyAttribute;
   }
-  isMultiFilterTargetKey() {
-    return Array.isArray(this.filterTargetKey) && this.filterTargetKey.length > 1;
-  }
   get name() {
     return this.options.name;
   }
@@ -152,6 +149,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
       }
     }
   }
+  isMultiFilterTargetKey() {
+    return Array.isArray(this.filterTargetKey) && this.filterTargetKey.length > 1;
+  }
   tableName() {
     const { name, tableName } = this.options;
     const tName = tableName || name;
@@ -220,6 +220,17 @@ const _Collection = class _Collection extends import_events.EventEmitter {
         this._primaryKeyAttributes = value;
       }
     });
+    Object.defineProperty(this.model, "primaryKeyField", {
+      get: function() {
+        if (this.primaryKeyAttribute) {
+          return this.rawAttributes[this.primaryKeyAttribute].field || this.primaryKeyAttribute;
+        }
+        return null;
+      }.bind(this.model),
+      set(val) {
+        this._primaryKeyField = val;
+      }
+    });
     this.model.init(null, this.sequelizeModelOptions());
     this.model.options.modelName = this.options.name;
     if (!autoGenId) {
@@ -471,6 +482,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
   updateOptions(options, mergeOptions) {
     let newOptions = import_lodash.default.cloneDeep(options);
     newOptions = (0, import_deepmerge.default)(this.options, newOptions, mergeOptions);
+    if (options.filterTargetKey) {
+      newOptions.filterTargetKey = options.filterTargetKey;
+    }
     this.context.database.emit("beforeUpdateCollection", this, newOptions);
     this.options = newOptions;
     this.setFields(options.fields, false);
@@ -636,6 +650,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")) {

package/package.json

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