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

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

@@ -19,6 +19,9 @@ import { Repository } 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 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 {
@@ -84,6 +87,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     pendingFields: Map<string, FieldTypes.RelationField[]>;
     modelCollection: Map<ModelStatic<any>, Collection<any, any>>;
     tableNameCollectionMap: Map<string, Collection<any, any>>;
+    queryInterface: QueryInterface;
     utils: DatabaseUtils;
     referenceMap: ReferencesMap;
     inheritanceMap: InheritanceMap;
@@ -94,11 +98,16 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
         collectionOptions: CollectionOptions;
         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;
     inDialect(...dialect: string[]): boolean;
+    escapeId(identifier: string): string;
     /**
      * Add collection to database
      * @param options