@nocobase/database 0.9.1-alpha.2 → 0.9.2-alpha.2

package/lib/database-utils/index.js

@@ -4,30 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 class DatabaseUtils {
   constructor(db) {
     this.db = void 0;
     this.db = db;
   }
-
   addSchema(tableName, schema) {
+    if (!this.db.inDialect('postgres')) return tableName;
     if (this.db.options.schema && !schema) {
       schema = this.db.options.schema;
     }
-
     if (schema) {
       // @ts-ignore
       tableName = this.db.sequelize.getQueryInterface().queryGenerator.addSchema({
@@ -35,25 +29,19 @@ class DatabaseUtils {
         _schema: schema
       });
     }
-
     return tableName;
   }
-
   quoteTable(tableName) {
-    const queryGenerator = this.db.sequelize.getQueryInterface().queryGenerator; // @ts-ignore
-
+    const queryGenerator = this.db.sequelize.getQueryInterface().queryGenerator;
+    // @ts-ignore
     tableName = queryGenerator.quoteTable(_lodash().default.isPlainObject(tableName) ? tableName : this.addSchema(tableName));
     return tableName;
   }
-
   schema() {
     if (!this.db.inDialect('postgres')) {
       return undefined;
     }
-
     return this.db.options.schema || 'public';
   }
-
 }
-
 exports.default = DatabaseUtils;

package/lib/database.d.ts

@@ -21,6 +21,7 @@ import DatabaseUtils from './database-utils';
 import { BaseValueParser } from './value-parsers';
 import QueryInterface from './query-interface/query-interface';
 import { Logger } from '@nocobase/logger';
+import { CollectionGroupManager } from './collection-group-manager';
 export interface MergeOptions extends merge.Options {
 }
 export interface PendingOptions {
@@ -98,8 +99,10 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
         mergeOptions?: any;
     }[]>;
     logger: Logger;
+    collectionGroupManager: CollectionGroupManager;
     constructor(options: DatabaseOptions);
     setLogger(logger: Logger): void;
+    sequelizeOptions(options: any): any;
     initListener(): void;
     addMigration(item: MigrationItem): void;
     addMigrations(options: AddMigrationsOptions): void;