@nocobase/database 0.11.0-alpha.1 → 0.11.1-alpha.2

package/lib/collection.d.ts

@@ -30,6 +30,7 @@ export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'>
     tableName?: string;
     inherits?: string[] | string;
     viewName?: string;
+    writableView?: boolean;
     filterTargetKey?: string;
     fields?: FieldOptions[];
     model?: string | ModelStatic<Model>;

package/lib/collection.js

@@ -33,9 +33,9 @@ function _sequelize() {
   return data;
 }
 var _model = require("./model");
+var _adjacencyListRepository = require("./repositories/tree-repository/adjacency-list-repository");
 var _repository = require("./repository");
 var _utils = require("./utils");
-var _adjacencyListRepository = require("./tree-repository/adjacency-list-repository");
 const _excluded = ["name"],
   _excluded2 = ["name"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -243,7 +243,7 @@ class Collection extends _events().EventEmitter {
       if (!sourceField) {
         this.db.logger.warn(`source field "${sourceFieldName}" not found for field "${name}" at collection "${this.name}"`);
       } else {
-        options = _objectSpread(_objectSpread({}, sourceField.options), options);
+        options = _objectSpread(_objectSpread({}, _lodash().default.omit(sourceField.options, 'name')), options);
       }
     }
     this.emit('field.beforeAdd', name, options, {

package/lib/database.d.ts

@@ -1,11 +1,14 @@
 /// <reference types="node" />
+import { Logger } from '@nocobase/logger';
 import { AsyncEmitter } from '@nocobase/utils';
 import merge from 'deepmerge';
 import { EventEmitter } from 'events';
 import { ModelStatic, Options, QueryInterfaceDropAllTablesOptions, QueryOptions, Sequelize, SyncOptions, Transactionable } from 'sequelize';
 import { Umzug } from 'umzug';
 import { Collection, CollectionOptions, RepositoryType } from './collection';
+import { CollectionGroupManager } from './collection-group-manager';
 import { ImportFileExtension } from './collection-importer';
+import DatabaseUtils from './database-utils';
 import ReferencesMap from './features/ReferencesMap';
 import { ArrayFieldRepository } from './field-repository/array-field-repository';
 import * as FieldTypes from './fields';
@@ -14,13 +17,10 @@ import InheritanceMap from './inherited-map';
 import { MigrationItem, Migrations } from './migration';
 import { Model } from './model';
 import { ModelHook } from './model-hook';
+import QueryInterface from './query-interface/query-interface';
 import { RelationRepository } from './relation-repository/relation-repository';
 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 { Logger } from '@nocobase/logger';
-import { CollectionGroupManager } from './collection-group-manager';
-import DatabaseUtils from './database-utils';
-import QueryInterface from './query-interface/query-interface';
 import { BaseValueParser } from './value-parsers';
 export type MergeOptions = merge.Options;
 export interface PendingOptions {

package/lib/database.js

@@ -62,20 +62,20 @@ function _umzug() {
   return data;
 }
 var _collection = require("./collection");
+var _collectionGroupManager = require("./collection-group-manager");
 var _collectionImporter = require("./collection-importer");
+var _databaseUtils = _interopRequireDefault(require("./database-utils"));
 var _ReferencesMap = _interopRequireDefault(require("./features/ReferencesMap"));
 var _referentialIntegrityCheck = require("./features/referential-integrity-check");
 var FieldTypes = _interopRequireWildcard(require("./fields"));
 var _inheritedCollection = require("./inherited-collection");
 var _inheritedMap = _interopRequireDefault(require("./inherited-map"));
+var _listeners = require("./listeners");
 var _migration = require("./migration");
 var _modelHook = require("./model-hook");
 var _operators = _interopRequireDefault(require("./operators"));
-var _utils2 = require("./utils");
-var _collectionGroupManager = require("./collection-group-manager");
-var _databaseUtils = _interopRequireDefault(require("./database-utils"));
-var _listeners = require("./listeners");
 var _queryInterfaceBuilder = _interopRequireDefault(require("./query-interface/query-interface-builder"));
+var _utils2 = require("./utils");
 var _valueParsers = require("./value-parsers");
 var _viewCollection = require("./view-collection");
 const _excluded = ["drop"],

package/lib/decorators/must-have-filter-decorator.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 const mustHaveFilter = () => (target, propertyKey, descriptor) => {
   const oldValue = descriptor.value;
-  descriptor.value = function () {
-    const options = arguments[0];
+  descriptor.value = function (...args) {
+    const options = args[0];
     if (Array.isArray(options.values)) {
-      return oldValue.apply(this, arguments);
+      return oldValue.apply(this, args);
     }
     if (!(options !== null && options !== void 0 && options.filter) && !(options !== null && options !== void 0 && options.filterByTk) && !(options !== null && options !== void 0 && options.forceUpdate)) {
       throw new Error(`must provide filter or filterByTk for ${propertyKey} call, or set forceUpdate to true`);
     }
-    return oldValue.apply(this, arguments);
+    return oldValue.apply(this, args);
   };
   return descriptor;
 };

package/lib/decorators/target-collection-decorator.d.ts

@@ -0,0 +1,2 @@
+declare const injectTargetCollection: (target: any, propertyKey: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
+export default injectTargetCollection;

package/lib/decorators/target-collection-decorator.js

@@ -0,0 +1,28 @@
+"use strict";
+
+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 }; }
+const injectTargetCollection = (target, propertyKey, descriptor) => {
+  const oldValue = descriptor.value;
+  descriptor.value = function (...args) {
+    const options = args[0];
+    const values = options.values;
+    if (_lodash().default.isPlainObject(values) && values.__collection) {
+      options.targetCollection = values.__collection;
+    }
+    return oldValue.apply(this, args);
+  };
+  return descriptor;
+};
+var _default = injectTargetCollection;
+exports.default = _default;

package/lib/eager-loading/eager-loading-tree.d.ts

@@ -9,6 +9,7 @@ interface EagerLoadingNode {
     parent?: EagerLoadingNode;
     instances?: Array<Model>;
     order?: any;
+    where?: any;
     inspectInheritAttribute?: boolean;
 }
 export declare class EagerLoadingTree {

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

@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EagerLoadingTree = void 0;
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+  _lodash = function _lodash() {
     return data;
   };
   return data;
 }
-function _lodash() {
-  const data = _interopRequireDefault(require("lodash"));
-  _lodash = function _lodash() {
+function _sequelize() {
+  const data = require("sequelize");
+  _sequelize = function _sequelize() {
     return data;
   };
   return data;
 }
-var _optionsParser = require("../options-parser");
 var _appendChildCollectionNameAfterRepositoryFind = require("../listeners/append-child-collection-name-after-repository-find");
+var _optionsParser = require("../options-parser");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -89,7 +89,7 @@ class EagerLoadingTree {
           if (include.fromFilter) {
             continue;
           }
-          const association = eagerLoadingTreeParent.model.associations[include.association];
+          const association = _lodash().default.isString(include.association) ? eagerLoadingTreeParent.model.associations[include.association] : include.association;
           const associationType = association.associationType;
           const child = buildNode({
             model: association.target,
@@ -97,6 +97,7 @@ class EagerLoadingTree {
             rawAttributes: _lodash().default.cloneDeep(include.attributes),
             attributes: _lodash().default.cloneDeep(include.attributes),
             parent: eagerLoadingTreeParent,
+            where: include.where,
             children: []
           });
           if (associationType == 'HasOne' || associationType == 'HasMany') {
@@ -167,10 +168,16 @@ class EagerLoadingTree {
             if (associationType == 'HasOne' || associationType == 'HasMany') {
               const foreignKey = association.foreignKey;
               const foreignKeyValues = node.parent.instances.map(instance => instance.get(association.sourceKey));
+              let where = {
+                [foreignKey]: foreignKeyValues
+              };
+              if (node.where) {
+                where = {
+                  [_sequelize().Op.and]: [where, node.where]
+                };
+              }
               const findOptions = {
-                where: {
-                  [foreignKey]: foreignKeyValues
-                },
+                where,
                 attributes: node.attributes,
                 order: orderOption(association),
                 transaction
@@ -258,7 +265,8 @@ class EagerLoadingTree {
                       }
                     }
                     if (associationType == 'HasOne') {
-                      parentInstance.setDataValue(association.as, instance);
+                      const key = association.options.realAs || association.as;
+                      parentInstance[key] = parentInstance.dataValues[key] = instance;
                     }
                   }
                 }
@@ -346,6 +354,7 @@ class EagerLoadingTree {
       yield loadRecursive(_this.root, pks);
       const appendChildCollectionName = (0, _appendChildCollectionNameAfterRepositoryFind.appendChildCollectionNameAfterRepositoryFind)(_this.db);
       const setInstanceAttributes = node => {
+        var _node$association;
         if (node.inspectInheritAttribute) {
           appendChildCollectionName({
             findOptions: {},
@@ -353,6 +362,10 @@ class EagerLoadingTree {
             dataCollection: _this.db.modelCollection.get(node.model)
           });
         }
+        // skip pivot attributes
+        if (((_node$association = node.association) === null || _node$association === void 0 ? void 0 : _node$association.as) == '_pivot_') {
+          return;
+        }
         // if no attributes are specified, return empty fields
         const nodeRawAttributes = node.rawAttributes || [];
         if (!_lodash().default.isArray(nodeRawAttributes)) {

package/lib/fields/field.d.ts

@@ -9,6 +9,7 @@ export interface FieldContext {
 export interface BaseFieldOptions {
     name?: string;
     hidden?: boolean;
+    translation?: boolean;
     [key: string]: any;
 }
 export interface BaseColumnFieldOptions extends BaseFieldOptions, Omit<ModelAttributeColumnOptions, 'type'> {

package/lib/inherited-collection.d.ts

@@ -1,5 +1,5 @@
-import { Collection, CollectionContext, CollectionOptions } from './collection';
 import { Field } from '.';
+import { Collection, CollectionContext, CollectionOptions } from './collection';
 export declare class InheritedCollection extends Collection {
     parents?: Collection[];
     constructor(options: CollectionOptions, context: CollectionContext);

package/lib/inherited-collection.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InheritedCollection = void 0;
-var _collection = require("./collection");
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
   _lodash = function _lodash() {
@@ -12,6 +11,7 @@ function _lodash() {
   };
   return data;
 }
+var _collection = require("./collection");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

package/lib/listeners/append-child-collection-name-after-repository-find.d.ts

@@ -1,4 +1,5 @@
-export declare const appendChildCollectionNameAfterRepositoryFind: (db: any) => ({ findOptions, dataCollection, data }: {
+import Database from '../database';
+export declare const appendChildCollectionNameAfterRepositoryFind: (db: Database) => ({ findOptions, dataCollection, data }: {
     findOptions: any;
     dataCollection: any;
     data: any;

package/lib/listeners/append-child-collection-name-after-repository-find.js

@@ -7,18 +7,45 @@ exports.appendChildCollectionNameAfterRepositoryFind = void 0;
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+const setRowAttribute = (row, attribute, value, raw) => {
+  if (raw) {
+    row[attribute] = value;
+  } else {
+    row.set(attribute, value, {
+      raw: true
+    });
+  }
+};
 const appendChildCollectionNameAfterRepositoryFind = db => {
   return ({
     findOptions,
     dataCollection,
     data
   }) => {
-    if (dataCollection.isParent()) {
+    if (findOptions.targetCollection) {
+      const collection = db.getCollection(findOptions.targetCollection);
       var _iterator = _createForOfIteratorHelper(data),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           const row = _step.value;
+          setRowAttribute(row, '__collection', collection.name, findOptions.raw);
+          setRowAttribute(row, '__schemaName', collection.collectionSchema(), findOptions.raw);
+          setRowAttribute(row, '__tableName', collection.model.tableName, findOptions.raw);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return;
+    }
+    if (dataCollection.isParent()) {
+      var _iterator2 = _createForOfIteratorHelper(data),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          const row = _step2.value;
           if (row.__collection) {
             continue;
           }
@@ -29,14 +56,12 @@ const appendChildCollectionNameAfterRepositoryFind = db => {
             return;
           }
           const rowCollectionName = rowCollection.name;
-          findOptions.raw ? row['__collection'] = rowCollectionName : row.set('__collection', rowCollectionName, {
-            raw: true
-          });
+          setRowAttribute(row, '__collection', rowCollectionName, findOptions.raw);
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
     }
   };

package/lib/options-parser.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OptionsParser = void 0;
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+  _lodash = function _lodash() {
+    return data;
+  };
+  return data;
+}
 function _sequelize() {
   const data = require("sequelize");
   _sequelize = function _sequelize() {
@@ -63,7 +70,7 @@ class OptionsParser {
     return this.isAssociation(path.split('.')[0]);
   }
   toSequelizeParams() {
-    var _this$options;
+    var _this$options, _this$options2;
     const queryParams = this.filterParser.toSequelizeParams();
     if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.filterByTk) {
       queryParams.where = {
@@ -72,6 +79,12 @@ class OptionsParser {
         }]
       };
     }
+    if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.include) {
+      if (!queryParams.include) {
+        queryParams.include = [];
+      }
+      queryParams.include.push(..._lodash().default.castArray(this.options.include));
+    }
     return this.parseSort(this.parseFields(queryParams));
   }
   /**
@@ -80,8 +93,8 @@ class OptionsParser {
    * @protected
    */
   parseSort(filterParams) {
-    var _this$options2;
-    let sort = ((_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2.sort) || [];
+    var _this$options3;
+    let sort = ((_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.sort) || [];
     if (typeof sort === 'string') {
       sort = sort.split(',');
     }
@@ -127,10 +140,10 @@ class OptionsParser {
     return filterParams;
   }
   parseFields(filterParams) {
-    var _this$options3, _this$options4, _this$options5, _this$options6;
-    const appends = ((_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.appends) || [];
+    var _this$options4, _this$options5, _this$options6, _this$options7;
+    const appends = ((_this$options4 = this.options) === null || _this$options4 === void 0 ? void 0 : _this$options4.appends) || [];
     const except = [];
-    if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.attributes) {
+    if ((_this$options5 = this.options) !== null && _this$options5 !== void 0 && _this$options5.attributes) {
       return {
         attributes: this.options.attributes
       };
@@ -142,7 +155,7 @@ class OptionsParser {
     if (this.collection.isParent()) {
       OptionsParser.appendInheritInspectAttribute(attributes.include, this.collection);
     }
-    if ((_this$options5 = this.options) !== null && _this$options5 !== void 0 && _this$options5.fields) {
+    if ((_this$options6 = this.options) !== null && _this$options6 !== void 0 && _this$options6.fields) {
       attributes = [];
       if (this.collection.isParent()) {
         OptionsParser.appendInheritInspectAttribute(attributes, this.collection);
@@ -167,7 +180,7 @@ class OptionsParser {
         _iterator2.f();
       }
     }
-    if ((_this$options6 = this.options) !== null && _this$options6 !== void 0 && _this$options6.except) {
+    if ((_this$options7 = this.options) !== null && _this$options7 !== void 0 && _this$options7.except) {
       var _iterator3 = _createForOfIteratorHelper(this.options.except),
         _step3;
       try {

package/lib/query-interface/mysql-query-interface.d.ts

@@ -1,6 +1,6 @@
-import QueryInterface from './query-interface';
-import { Collection } from '../collection';
 import { Transactionable } from 'sequelize';
+import { Collection } from '../collection';
+import QueryInterface from './query-interface';
 export default class MysqlQueryInterface extends QueryInterface {
     constructor(db: any);
     collectionTableExists(collection: Collection, options?: Transactionable): Promise<boolean>;
@@ -15,4 +15,6 @@ export default class MysqlQueryInterface extends QueryInterface {
             table_schema?: string;
         };
     }>;
+    parseSQL(sql: string): any;
+    viewDef(viewName: string): Promise<string>;
 }

package/lib/query-interface/mysql-query-interface.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _queryInterface = _interopRequireDefault(require("./query-interface"));
 var _sqlParser = _interopRequireDefault(require("../sql-parser"));
+var _queryInterface = _interopRequireDefault(require("./query-interface"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -49,15 +49,8 @@ class MysqlQueryInterface extends _queryInterface.default {
     var _this3 = this;
     return _asyncToGenerator(function* () {
       try {
-        const viewDefinition = yield _this3.db.sequelize.query(`SHOW CREATE VIEW ${options.viewName}`, {
-          type: 'SELECT'
-        });
-        const createView = viewDefinition[0]['Create View'];
-        const regex = /(?<=AS\s)([\s\S]*)/i;
-        const match = createView.match(regex);
-        const sql = match[0];
-        const _sqlParser$parse = _sqlParser.default.parse(sql),
-          ast = _sqlParser$parse.ast;
+        const _this3$parseSQL = _this3.parseSQL(yield _this3.viewDef(options.viewName)),
+          ast = _this3$parseSQL.ast;
         const columns = ast.columns;
         const results = [];
         var _iterator = _createForOfIteratorHelper(columns),
@@ -84,5 +77,21 @@ class MysqlQueryInterface extends _queryInterface.default {
       }
     })();
   }
+  parseSQL(sql) {
+    return _sqlParser.default.parse(sql);
+  }
+  viewDef(viewName) {
+    var _this4 = this;
+    return _asyncToGenerator(function* () {
+      const viewDefinition = yield _this4.db.sequelize.query(`SHOW CREATE VIEW ${viewName}`, {
+        type: 'SELECT'
+      });
+      const createView = viewDefinition[0]['Create View'];
+      const regex = /(?<=AS\s)([\s\S]*)/i;
+      const match = createView.match(regex);
+      const sql = match[0];
+      return sql;
+    })();
+  }
 }
 exports.default = MysqlQueryInterface;

package/lib/query-interface/postgres-query-interface.d.ts

@@ -1,9 +1,11 @@
-import QueryInterface from './query-interface';
 import { Collection } from '../collection';
+import QueryInterface from './query-interface';
 export default class PostgresQueryInterface extends QueryInterface {
     constructor(db: any);
     collectionTableExists(collection: Collection, options?: any): Promise<any>;
     listViews(): Promise<[unknown[], unknown]>;
+    viewDef(viewName: string): Promise<string>;
+    parseSQL(sql: string): any;
     viewColumnUsage(options: any): Promise<{
         [view_column_name: string]: {
             column_name: string;

package/lib/query-interface/postgres-query-interface.js

@@ -4,14 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _queryInterface = _interopRequireDefault(require("./query-interface"));
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+  _lodash = function _lodash() {
+    return data;
+  };
+  return data;
+}
 var _postgres = _interopRequireDefault(require("../sql-parser/postgres"));
+var _queryInterface = _interopRequireDefault(require("./query-interface"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 class PostgresQueryInterface extends _queryInterface.default {
@@ -49,8 +62,26 @@ class PostgresQueryInterface extends _queryInterface.default {
       });
     })();
   }
-  viewColumnUsage(options) {
+  viewDef(viewName) {
     var _this3 = this;
+    return _asyncToGenerator(function* () {
+      const _viewName$split = viewName.split('.'),
+        _viewName$split2 = _slicedToArray(_viewName$split, 2),
+        schema = _viewName$split2[0],
+        name = _viewName$split2[1];
+      const viewDefQuery = yield _this3.db.sequelize.query(`
+    select pg_get_viewdef(format('%I.%I', '${schema}', '${name}')::regclass, true) as definition
+    `, {
+        type: 'SELECT'
+      });
+      return _lodash().default.trim(viewDefQuery[0]['definition']);
+    })();
+  }
+  parseSQL(sql) {
+    return _postgres.default.parse(sql);
+  }
+  viewColumnUsage(options) {
+    var _this4 = this;
     return _asyncToGenerator(function* () {
       const viewName = options.viewName,
         _options$schema = options.schema,
@@ -61,18 +92,13 @@ class PostgresQueryInterface extends _queryInterface.default {
       WHERE view_schema = '${schema}'
         AND view_name = '${viewName}';
     `;
-      const columnUsages = yield _this3.db.sequelize.query(sql, {
-        type: 'SELECT'
-      });
-      const viewDefQuery = yield _this3.db.sequelize.query(`
-    select pg_get_viewdef(format('%I.%I', '${schema}', '${viewName}')::regclass, true) as definition
-    `, {
+      const columnUsages = yield _this4.db.sequelize.query(sql, {
         type: 'SELECT'
       });
-      const def = viewDefQuery[0]['definition'];
+      const def = yield _this4.viewDef(`${schema}.${viewName}`);
       try {
-        const _sqlParser$parse = _postgres.default.parse(def),
-          ast = _sqlParser$parse.ast;
+        const _this4$parseSQL = _this4.parseSQL(def),
+          ast = _this4$parseSQL.ast;
         const columns = ast[0].columns;
         const usages = columns.map(column => {
           const fieldAlias = column.as || column.expr.column;
@@ -90,7 +116,7 @@ class PostgresQueryInterface extends _queryInterface.default {
         }).filter(([, columnUsage]) => columnUsage !== null);
         return Object.fromEntries(usages);
       } catch (e) {
-        _this3.db.logger.warn(e);
+        console.log(e);
         return {};
       }
     })();

package/lib/query-interface/query-interface.d.ts

@@ -1,12 +1,13 @@
-import Database from '../database';
-import { Collection } from '../collection';
 import { QueryInterface as SequelizeQueryInterface, Transactionable } from 'sequelize';
+import { Collection } from '../collection';
+import Database from '../database';
 export default abstract class QueryInterface {
     db: Database;
     sequelizeQueryInterface: SequelizeQueryInterface;
     protected constructor(db: Database);
     abstract collectionTableExists(collection: Collection, options?: Transactionable): Promise<boolean>;
     abstract listViews(): any;
+    abstract viewDef(viewName: string): Promise<string>;
     abstract viewColumnUsage(options: {
         viewName: string;
         schema?: string;
@@ -17,5 +18,6 @@ export default abstract class QueryInterface {
             table_schema?: string;
         };
     }>;
+    abstract parseSQL(sql: string): any;
     dropAll(options: any): Promise<void>;
 }

package/lib/query-interface/sqlite-query-interface.d.ts

@@ -1,5 +1,5 @@
-import QueryInterface from './query-interface';
 import { Collection } from '../collection';
+import QueryInterface from './query-interface';
 export default class SqliteQueryInterface extends QueryInterface {
     constructor(db: any);
     collectionTableExists(collection: Collection, options?: any): Promise<boolean>;
@@ -14,4 +14,6 @@ export default class SqliteQueryInterface extends QueryInterface {
             table_schema?: string;
         };
     }>;
+    parseSQL(sql: string): any;
+    viewDef(viewName: string): Promise<string>;
 }