@nocobase/database 2.0.0-alpha.20 → 2.0.0-alpha.22

package/lib/database.d.ts

@@ -215,6 +215,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     private registerCollectionType;
     quoteIdentifier(identifier: string): string;
     quoteTable(tableName: string): string;
+    private runSQLWithSchema;
     runSQL(sql: string, options?: RunSQLOptions): Promise<any>;
 }
 export declare function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {

package/lib/database.js

@@ -431,11 +431,7 @@ const _Database = class _Database extends import_events.EventEmitter {
    */
   collection(options) {
     options = import_lodash.default.cloneDeep(options);
-    if (typeof options.underscored !== "boolean") {
-      if (this.options.underscored) {
-        options.underscored = true;
-      }
-    }
+    options.underscored = options.underscored ?? this.options.underscored;
     this.logger.trace(`beforeDefineCollection: ${(0, import_safe_json_stringify.default)(options)}`, {
       databaseInstanceId: this.instanceId
     });
@@ -791,6 +787,16 @@ const _Database = class _Database extends import_events.EventEmitter {
   quoteTable(tableName) {
     return this.sequelize.getQueryInterface().quoteIdentifiers(tableName);
   }
+  async runSQLWithSchema(finalSQL, bind, transaction) {
+    if (!this.options.schema || !this.isPostgresCompatibleDialect()) {
+      return this.sequelize.query(finalSQL, { bind, transaction });
+    }
+    const execute = /* @__PURE__ */ __name(async (t) => {
+      await this.sequelize.query(`SET LOCAL search_path TO ${this.options.schema}`, { transaction: t });
+      return this.sequelize.query(finalSQL, { bind, transaction: t });
+    }, "execute");
+    return transaction ? execute(transaction) : this.sequelize.transaction(execute);
+  }
   async runSQL(sql, options = {}) {
     const { filter, bind, type, transaction } = options;
     let finalSQL = sql;
@@ -812,11 +818,8 @@ const _Database = class _Database extends import_events.EventEmitter {
         finalSQL = `SELECT * FROM (${normalizedSQL}) AS tmp WHERE ${wSQL}`;
       }
     }
-    if (this.options.schema && this.isPostgresCompatibleDialect()) {
-      finalSQL = `${queryGenerator.setSearchPath(this.options.schema)} ${finalSQL}`;
-    }
     this.logger.debug("runSQL", { finalSQL });
-    const result = await this.sequelize.query(finalSQL, { bind, transaction });
+    const result = await this.runSQLWithSchema(finalSQL, bind, transaction);
     let data = result[0];
     if (type === "selectVar") {
       if (Array.isArray(data)) {

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

@@ -215,7 +215,8 @@ const _EagerLoadingTree = class _EagerLoadingTree {
             attributes: [primaryKeyField],
             group: `${node.model.name}.${primaryKeyField}`,
             transaction,
-            include: (0, import_utils.processIncludes)(includeForFilter, node.model)
+            include: (0, import_utils.processIncludes)(includeForFilter, node.model),
+            raw: true
           })).map((row) => {
             return { row, pk: row[primaryKeyField] };
           });

package/lib/index.d.ts

@@ -36,11 +36,12 @@ export * from './repository';
 export * from './relation-repository/relation-repository';
 export { default as sqlParser, SQLParserTypes } from './sql-parser';
 export * from './update-associations';
-export { snakeCase } from './utils';
+export { snakeCase, extractTypeFromDefinition } from './utils';
 export * from './value-parsers';
 export * from './view-collection';
 export { default as fieldTypeMap } from './view/field-type-map';
 export * from './view/view-inference';
 export * from './update-guard';
+export { TableInfo } from './query-interface/query-interface';
 export { default as operators } from './operators';
 export { filterIncludes, mergeIncludes } from './utils/filter-include';

package/lib/index.js

@@ -49,11 +49,13 @@ __export(src_exports, {
   Op: () => import_sequelize.Op,
   SQLParserTypes: () => import_sql_parser.SQLParserTypes,
   SyncOptions: () => import_sequelize.SyncOptions,
+  TableInfo: () => import_query_interface.TableInfo,
   Transaction: () => import_sequelize.Transaction,
   UniqueConstraintError: () => import_sequelize.UniqueConstraintError,
   ValidationError: () => import_sequelize.ValidationError,
   ValidationErrorItem: () => import_sequelize.ValidationErrorItem,
   default: () => import_database.Database,
+  extractTypeFromDefinition: () => import_utils.extractTypeFromDefinition,
   fieldTypeMap: () => import_field_type_map.default,
   filterIncludes: () => import_filter_include.filterIncludes,
   fn: () => import_sequelize.fn,
@@ -101,6 +103,7 @@ __reExport(src_exports, require("./view-collection"), module.exports);
 var import_field_type_map = __toESM(require("./view/field-type-map"));
 __reExport(src_exports, require("./view/view-inference"), module.exports);
 __reExport(src_exports, require("./update-guard"), module.exports);
+var import_query_interface = require("./query-interface/query-interface");
 var import_operators = __toESM(require("./operators"));
 var import_filter_include = require("./utils/filter-include");
 // Annotate the CommonJS export names for ESM import in node:
@@ -117,10 +120,12 @@ var import_filter_include = require("./utils/filter-include");
   Op,
   SQLParserTypes,
   SyncOptions,
+  TableInfo,
   Transaction,
   UniqueConstraintError,
   ValidationError,
   ValidationErrorItem,
+  extractTypeFromDefinition,
   fieldTypeMap,
   filterIncludes,
   fn,

package/lib/utils.d.ts

@@ -16,4 +16,5 @@ export declare function percent2float(value: string): number;
 export declare function isUndefinedOrNull(value: any): boolean;
 export declare function isStringOrNumber(value: any): boolean;
 export declare function getKeysByPrefix(keys: string[], prefix: string): string[];
+export declare function extractTypeFromDefinition(rawType: string): string;
 export declare function processIncludes(includes: any[], model: any, parentAs?: string): any[];

package/lib/utils.js

@@ -38,6 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkIdentifier: () => checkIdentifier,
+  extractTypeFromDefinition: () => extractTypeFromDefinition,
   getKeysByPrefix: () => getKeysByPrefix,
   getTableName: () => getTableName,
   isStringOrNumber: () => isStringOrNumber,
@@ -141,6 +142,14 @@ function getKeysByPrefix(keys, prefix) {
   return keys.filter((key) => key.startsWith(`${prefix}.`)).map((key) => key.substring(prefix.length + 1));
 }
 __name(getKeysByPrefix, "getKeysByPrefix");
+function extractTypeFromDefinition(rawType) {
+  const leftParenIndex = rawType.indexOf("(");
+  if (leftParenIndex === -1) {
+    return rawType.toLowerCase();
+  }
+  return rawType.substring(0, leftParenIndex).toLowerCase().trim();
+}
+__name(extractTypeFromDefinition, "extractTypeFromDefinition");
 function processIncludes(includes, model, parentAs = "") {
   includes.forEach((include, index) => {
     const association = model.associations[include.association];
@@ -164,6 +173,7 @@ __name(processIncludes, "processIncludes");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkIdentifier,
+  extractTypeFromDefinition,
   getKeysByPrefix,
   getTableName,
   isStringOrNumber,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.22",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.20",
-    "@nocobase/utils": "2.0.0-alpha.20",
+    "@nocobase/logger": "2.0.0-alpha.22",
+    "@nocobase/utils": "2.0.0-alpha.22",
     "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": "af5ff4eaa490349420135405128da466d72ac74c"
+  "gitHead": "717bcfaa0bdeaa8026717b4309a65abdc19478f1"
 }