@nocobase/database 1.9.0-beta.9 → 2.0.0-alpha.3

package/lib/collection.d.ts

@@ -81,10 +81,12 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     model: ModelStatic<Model>;
     repository: Repository<TModelAttributes, TCreationAttributes>;
     constructor(options: CollectionOptions, context: CollectionContext);
+    get underscored(): boolean;
     get filterTargetKey(): string | string[];
     get name(): string;
     get origin(): string;
     get titleField(): string;
+    get titleFieldInstance(): Field;
     get db(): Database;
     get treeParentField(): BelongsToField | null;
     get treeChildrenField(): HasManyField | null;
@@ -155,6 +157,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
         modelName: string;
         sequelize: import("sequelize").Sequelize;
         tableName: any;
+        underscored: boolean;
     };
     protected bindFieldEventListener(): void;
     private checkOptions;

package/lib/collection.js

@@ -111,6 +111,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     this.setRepository(options.repository);
     this.setSortable(options.sortable);
   }
+  get underscored() {
+    return this.options.underscored;
+  }
   get filterTargetKey() {
     var _a;
     const targetKey = (_a = this.options) == null ? void 0 : _a.filterTargetKey;
@@ -137,6 +140,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
   get titleField() {
     return this.options.titleField || this.model.primaryKeyAttribute;
   }
+  get titleFieldInstance() {
+    return this.getField(this.titleField);
+  }
   get db() {
     return this.context.database;
   }
@@ -225,7 +231,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
   tableName() {
     const { name, tableName } = this.options;
     const tName = tableName || name;
-    return this.options.underscored ? (0, import_utils.snakeCase)(tName) : tName;
+    return this.underscored ? (0, import_utils.snakeCase)(tName) : tName;
   }
   /**
    * @internal
@@ -338,7 +344,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     return this.setField(name, options);
   }
   checkFieldType(name, options) {
-    if (!this.options.underscored) {
+    if (!this.underscored) {
       return;
     }
     const fieldName = options.field || (0, import_utils.snakeCase)(name);
@@ -483,7 +489,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     }
     if (this.model.options.timestamps !== false) {
       let timestampsFields = ["createdAt", "updatedAt", "deletedAt"];
-      if (this.db.options.underscored) {
+      if (this.underscored) {
         timestampsFields = timestampsFields.map((fieldName) => (0, import_utils.snakeCase)(fieldName));
       }
       if (timestampsFields.includes(field.columnName())) {
@@ -776,7 +782,8 @@ const _Collection = class _Collection extends import_events.EventEmitter {
       ...import_lodash.default.omit(this.options, ["name", "fields", "model", "targetKey"]),
       modelName: name,
       sequelize: this.context.database.sequelize,
-      tableName: this.tableName()
+      tableName: this.tableName(),
+      underscored: this.underscored
     };
     return attr;
   }

package/lib/database.d.ts

@@ -17,6 +17,7 @@ import { Collection, CollectionOptions, RepositoryType } from './collection';
 import { CollectionFactory } from './collection-factory';
 import { ImportFileExtension } from './collection-importer';
 import DatabaseUtils from './database-utils';
+import { BaseDialect } from './dialects/base-dialect';
 import ReferencesMap from './features/references-map';
 import { ArrayFieldRepository } from './field-repository/array-field-repository';
 import * as FieldTypes from './fields';
@@ -31,7 +32,6 @@ import { RelationRepository } from './relation-repository/relation-repository';
 import { Repository, TargetKey } from './repository';
 import { AfterDefineCollectionListener, BeforeDefineCollectionListener, CreateListener, CreateWithAssociationsListener, DatabaseAfterDefineCollectionEventType, DatabaseAfterRemoveCollectionEventType, DatabaseBeforeDefineCollectionEventType, DatabaseBeforeRemoveCollectionEventType, DestroyListener, EventType, ModelCreateEventTypes, ModelCreateWithAssociationsEventTypes, ModelDestroyEventTypes, ModelSaveEventTypes, ModelSaveWithAssociationsEventTypes, ModelUpdateEventTypes, ModelUpdateWithAssociationsEventTypes, ModelValidateEventTypes, RemoveCollectionListener, SaveListener, SaveWithAssociationsListener, SyncListener, UpdateListener, UpdateWithAssociationsListener, ValidateListener } from './types';
 import { BaseValueParser } from './value-parsers';
-import { BaseDialect } from './dialects/base-dialect';
 export type MergeOptions = merge.Options;
 export interface PendingOptions {
     field: RelationField;
@@ -67,6 +67,11 @@ export type AddMigrationsOptions = {
     directory: string;
 };
 type OperatorFunc = (value: any, ctx?: RegisterOperatorsContext) => any;
+type RunSQLOptions = {
+    filter?: Record<string, any>;
+    bind?: Record<string, any> | Array<any>;
+    type?: 'selectVar' | 'selectRow' | 'selectRows';
+} & Transactionable;
 export declare class Database extends EventEmitter implements AsyncEmitter {
     static dialects: Map<string, typeof BaseDialect>;
     sequelize: Sequelize;
@@ -208,6 +213,9 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
         extensions?: ImportFileExtension[];
     }): Promise<Map<string, Collection>>;
     private registerCollectionType;
+    quoteIdentifier(identifier: string): string;
+    quoteTable(tableName: string): string;
+    runSQL(sql: string, options?: RunSQLOptions): Promise<any>;
 }
 export declare function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {
     collectionOptions: CollectionOptions;

package/lib/database.js

@@ -58,6 +58,7 @@ var import_path = require("path");
 var import_safe_json_stringify = __toESM(require("safe-json-stringify"));
 var import_sequelize = require("sequelize");
 var import_umzug = require("umzug");
+var import_collection = require("./collection");
 var import_collection_factory = require("./collection-factory");
 var import_collection_importer = require("./collection-importer");
 var import_database_utils = __toESM(require("./database-utils"));
@@ -430,8 +431,10 @@ const _Database = class _Database extends import_events.EventEmitter {
    */
   collection(options) {
     options = import_lodash.default.cloneDeep(options);
-    if (this.options.underscored) {
-      options.underscored = true;
+    if (typeof options.underscored !== "boolean") {
+      if (this.options.underscored) {
+        options.underscored = true;
+      }
     }
     this.logger.trace(`beforeDefineCollection: ${(0, import_safe_json_stringify.default)(options)}`, {
       databaseInstanceId: this.instanceId
@@ -781,6 +784,57 @@ const _Database = class _Database extends import_events.EventEmitter {
       }
     });
   }
+  // 如果需要手动引用标识符，可以添加辅助方法
+  quoteIdentifier(identifier) {
+    return this.sequelize.getQueryInterface().queryGenerator["quoteIdentifier"](identifier);
+  }
+  quoteTable(tableName) {
+    return this.sequelize.getQueryInterface().quoteIdentifiers(tableName);
+  }
+  async runSQL(sql, options = {}) {
+    const { filter, bind, type, transaction } = options;
+    let finalSQL = sql;
+    if (!finalSQL.replace(/\s+/g, " ").trim()) {
+      throw new Error("SQL cannot be empty");
+    }
+    if (filter) {
+      let where = {};
+      const tmpCollection = new import_collection.Collection({ name: "tmp", underscored: false }, { database: this });
+      const r = tmpCollection.repository;
+      where = r.buildQueryOptions({ filter }).where;
+      const queryGenerator = this.sequelize.getQueryInterface().queryGenerator;
+      const wSQL = queryGenerator.getWhereConditions(where, null, null, { bindParam: true });
+      if (wSQL) {
+        let normalizedSQL = sql.replace(/\s+/g, " ").trim();
+        if (normalizedSQL.endsWith(";")) {
+          normalizedSQL = normalizedSQL.slice(0, -1).trim();
+        }
+        finalSQL = `SELECT * FROM (${normalizedSQL}) AS tmp WHERE ${wSQL}`;
+      }
+    }
+    this.logger.debug("runSQL", { finalSQL });
+    const result = await this.sequelize.query(finalSQL, { bind, transaction });
+    let data = result[0];
+    if (type === "selectVar") {
+      if (Array.isArray(data)) {
+        data = data[0];
+      }
+      return Object.values(data || {}).shift();
+    }
+    if (type === "selectRow") {
+      if (Array.isArray(data)) {
+        data = data[0];
+      }
+      return data || null;
+    }
+    if (type === "selectRows") {
+      if (!Array.isArray(data)) {
+        return [data].filter(Boolean);
+      }
+      return data;
+    }
+    return data;
+  }
 };
 __name(_Database, "Database");
 __publicField(_Database, "dialects", /* @__PURE__ */ new Map());

package/lib/inherited-sync-runner.js

@@ -43,7 +43,6 @@ module.exports = __toCommonJS(inherited_sync_runner_exports);
 var import_lodash = __toESM(require("lodash"));
 const _InheritedSyncRunner = class _InheritedSyncRunner {
   static async syncInheritModel(model, options) {
-    var _a;
     const { transaction } = options;
     options.hooks = options.hooks === void 0 ? true : !!options.hooks;
     const inheritedCollection = model.collection;
@@ -78,8 +77,9 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
       let maxSequenceName;
       if (childAttributes.id && childAttributes.id.autoIncrement) {
         for (const parent of parents) {
-          const parentIdField = parent.getField("id");
-          if (!((_a = parentIdField == null ? void 0 : parentIdField.options) == null ? void 0 : _a.autoIncrement)) {
+          const attributes2 = parent.model.getAttributes();
+          const parentIdField = attributes2["id"];
+          if (!(parentIdField == null ? void 0 : parentIdField.autoIncrement)) {
             continue;
           }
           const sequenceNameResult = await queryInterface.sequelize.query(
@@ -151,8 +151,14 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
       const columns = await queryInterface.describeTable(tableName, options);
       for (const attribute in childAttributes) {
         const columnName = childAttributes[attribute].field;
+        const fieldName = childAttributes[attribute].fieldName;
         if (!columns[columnName]) {
-          await queryInterface.addColumn(tableName, columnName, childAttributes[columnName], options);
+          await queryInterface.addColumn(
+            tableName,
+            columnName,
+            childAttributes[columnName] || childAttributes[fieldName],
+            options
+          );
         }
       }
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.0-beta.9",
+  "version": "2.0.0-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.0-beta.9",
-    "@nocobase/utils": "1.9.0-beta.9",
+    "@nocobase/logger": "2.0.0-alpha.3",
+    "@nocobase/utils": "2.0.0-alpha.3",
     "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": "b44464f1d1bbc96022d0f622e0a2f1d7e8d7142f"
+  "gitHead": "8efc23aa78058d871e98a91419f3c4a61762cc15"
 }