@nocobase/database 1.4.0-alpha.20241025010959 → 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) {
@@ -636,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")) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.4.0-alpha.20241025010959",
+  "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.20241025010959",
-    "@nocobase/utils": "1.4.0-alpha.20241025010959",
+    "@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": "3ea22c99c003de17c193b82ac3c545263f4d5eeb"
+  "gitHead": "6f363bf299af23580d68c8b0659e4d31d70f4687"
 }