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

package/lib/collection.js

@@ -4,103 +4,109 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Collection = void 0;
-
 function _deepmerge() {
   const data = _interopRequireDefault(require("deepmerge"));
-
   _deepmerge = function _deepmerge() {
     return data;
   };
-
   return data;
 }
-
 function _events() {
   const data = require("events");
-
   _events = function _events() {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _model = require("./model");
-
 var _repository = require("./repository");
-
 var _utils = require("./utils");
-
 const _excluded = ["name"],
-      _excluded2 = ["name"];
-
+  _excluded2 = ["name"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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); }); }; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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 _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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, 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; }
-
 class Collection extends _events().EventEmitter {
   get filterTargetKey() {
-    return _lodash().default.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
+    let targetKey = _lodash().default.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
+    if (!targetKey && this.model.rawAttributes['id']) {
+      return 'id';
+    }
+    return targetKey;
   }
-
   get name() {
     return this.options.name;
   }
-
   get titleField() {
     return this.options.titleField || this.model.primaryKeyAttribute;
   }
-
   get db() {
     return this.context.database;
   }
-
+  get treeParentField() {
+    var _iterator = _createForOfIteratorHelper(this.fields),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        const _step$value = _slicedToArray(_step.value, 2),
+          _ = _step$value[0],
+          field = _step$value[1];
+        if (field.options.treeParent) {
+          return field;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  get treeChildrenField() {
+    var _iterator2 = _createForOfIteratorHelper(this.fields),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        const _step2$value = _slicedToArray(_step2.value, 2),
+          _ = _step2$value[0],
+          field = _step2$value[1];
+        if (field.options.treeChildren) {
+          return field;
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+  }
   constructor(options, context) {
     super();
     this.options = void 0;
@@ -115,52 +121,46 @@ class Collection extends _events().EventEmitter {
     this.bindFieldEventListener();
     this.modelInit();
     this.db.modelCollection.set(this.model, this);
-    this.db.tableNameCollectionMap.set(this.model.tableName, this);
-
+    // set tableName to collection map
+    // the form of key is `${schema}.${tableName}` if schema exists
+    // otherwise is `${tableName}`
+    this.db.tableNameCollectionMap.set(this.getTableNameWithSchemaAsString(), this);
     if (!options.inherits) {
       this.setFields(options.fields);
     }
-
     this.setRepository(options.repository);
     this.setSortable(options.sortable);
   }
-
   checkOptions(options) {
     (0, _utils.checkIdentifier)(options.name);
     this.checkTableName();
   }
-
   checkTableName() {
     const tableName = this.tableName();
-
-    var _iterator = _createForOfIteratorHelper(this.db.collections),
-        _step;
-
+    var _iterator3 = _createForOfIteratorHelper(this.db.collections),
+      _step3;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        const _step$value = _slicedToArray(_step.value, 2),
-              k = _step$value[0],
-              collection = _step$value[1];
-
-        if (collection.name != this.options.name && tableName === collection.tableName()) {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        const _step3$value = _slicedToArray(_step3.value, 2),
+          k = _step3$value[0],
+          collection = _step3$value[1];
+        if (collection.name != this.options.name && tableName === collection.tableName() && collection.collectionSchema() === this.collectionSchema()) {
           throw new Error(`collection ${collection.name} and ${this.name} have same tableName "${tableName}"`);
         }
       }
     } catch (err) {
-      _iterator.e(err);
+      _iterator3.e(err);
     } finally {
-      _iterator.f();
+      _iterator3.f();
     }
   }
-
   tableName() {
     const _this$options = this.options,
-          name = _this$options.name,
-          tableName = _this$options.tableName;
+      name = _this$options.name,
+      tableName = _this$options.tableName;
     const tName = tableName || name;
-    return this.db.options.underscored ? (0, _utils.snakeCase)(tName) : tName;
+    return this.options.underscored ? (0, _utils.snakeCase)(tName) : tName;
   }
-
   sequelizeModelOptions() {
     const name = this.options.name;
     return _objectSpread(_objectSpread({}, _lodash().default.omit(this.options, ['name', 'fields', 'model', 'targetKey'])), {}, {
@@ -172,155 +172,141 @@ class Collection extends _events().EventEmitter {
   /**
    * TODO
    */
-
-
   modelInit() {
     if (this.model) {
       return;
     }
-
     const _this$options2 = this.options,
-          name = _this$options2.name,
-          model = _this$options2.model,
-          _this$options2$autoGe = _this$options2.autoGenId,
-          autoGenId = _this$options2$autoGe === void 0 ? true : _this$options2$autoGe;
+      name = _this$options2.name,
+      model = _this$options2.model,
+      _this$options2$autoGe = _this$options2.autoGenId,
+      autoGenId = _this$options2$autoGe === void 0 ? true : _this$options2$autoGe;
     let M = _model.Model;
-
     if (this.context.database.sequelize.isDefined(name)) {
       const m = this.context.database.sequelize.model(name);
-
       if (m.isThrough) {
         // @ts-ignore
-        this.model = m; // @ts-ignore
-
-        this.model.database = this.context.database; // @ts-ignore
-
+        this.model = m;
+        // @ts-ignore
+        this.model.database = this.context.database;
+        // @ts-ignore
         this.model.collection = this;
         return;
       }
     }
-
     if (typeof model === 'string') {
       M = this.context.database.models.get(model) || _model.Model;
     } else if (model) {
       M = model;
-    } // @ts-ignore
-
-
+    }
+    // @ts-ignore
     this.model = class extends M {};
     this.model.init(null, this.sequelizeModelOptions());
-
     if (!autoGenId) {
       this.model.removeAttribute('id');
-    } // @ts-ignore
-
-
-    this.model.database = this.context.database; // @ts-ignore
-
+    }
+    // @ts-ignore
+    this.model.database = this.context.database;
+    // @ts-ignore
     this.model.collection = this;
   }
-
   setRepository(repository) {
     let repo = _repository.Repository;
-
     if (typeof repository === 'string') {
       repo = this.context.database.repositories.get(repository) || _repository.Repository;
     }
-
     this.repository = new repo(this);
   }
-
   bindFieldEventListener() {
     this.on('field.afterAdd', field => {
       field.bind();
     });
     this.on('field.afterRemove', field => {
       field.unbind();
+      this.db.emit('field.afterRemove', field);
     });
   }
-
   forEachField(callback) {
     return [...this.fields.values()].forEach(callback);
   }
-
   findField(callback) {
     return [...this.fields.values()].find(callback);
   }
-
   hasField(name) {
     return this.fields.has(name);
   }
-
   getField(name) {
     return this.fields.get(name);
   }
-
   addField(name, options) {
     return this.setField(name, options);
   }
-
   checkFieldType(name, options) {
-    if (!this.db.options.underscored) {
+    if (!this.options.underscored) {
       return;
     }
-
     const fieldName = options.field || (0, _utils.snakeCase)(name);
     const field = this.findField(f => {
       if (f.name === name) {
         return false;
       }
-
       if (f.field) {
         return f.field === fieldName;
       }
-
       return (0, _utils.snakeCase)(f.name) === fieldName;
     });
-
     if (!field) {
       return;
     }
-
     if (options.type !== field.type) {
       throw new Error(`fields with same column must be of the same type ${JSON.stringify(options)}`);
     }
   }
-
   setField(name, options) {
     (0, _utils.checkIdentifier)(name);
     this.checkFieldType(name, options);
     const database = this.context.database;
+    if (options.source) {
+      const _options$source$split = options.source.split('.'),
+        _options$source$split2 = _slicedToArray(_options$source$split, 2),
+        sourceCollectionName = _options$source$split2[0],
+        sourceFieldName = _options$source$split2[1];
+      const sourceCollection = this.db.collections.get(sourceCollectionName);
+      if (!sourceCollection) {
+        throw new Error(`source collection "${sourceCollectionName}" not found`);
+      }
+      const sourceField = sourceCollection.fields.get(sourceFieldName);
+      options = _objectSpread(_objectSpread({}, sourceField.options), options);
+    }
+    this.emit('field.beforeAdd', name, options, {
+      collection: this
+    });
     const field = database.buildField(_objectSpread({
       name
     }, options), _objectSpread(_objectSpread({}, this.context), {}, {
       collection: this
     }));
     const oldField = this.fields.get(name);
-
     if (oldField && oldField.options.inherit && field.typeToString() != oldField.typeToString()) {
       throw new Error(`Field type conflict: cannot set "${name}" on "${this.name}" to ${options.type}, parent "${name}" type is ${oldField.options.type}`);
     }
-
     if (this.options.autoGenId !== false && options.primaryKey) {
       this.model.removeAttribute('id');
     }
-
     this.removeField(name);
     this.fields.set(name, field);
-    this.emit('field.afterAdd', field); // refresh children models
-
+    this.emit('field.afterAdd', field);
+    // refresh children models
     if (this.isParent()) {
-      var _iterator2 = _createForOfIteratorHelper(this.context.database.inheritanceMap.getChildren(this.name, {
-        deep: false
-      })),
-          _step2;
-
+      var _iterator4 = _createForOfIteratorHelper(this.context.database.inheritanceMap.getChildren(this.name, {
+          deep: false
+        })),
+        _step4;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          const child = _step2.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          const child = _step4.value;
           const childCollection = this.db.getCollection(child);
           const existField = childCollection.getField(name);
-
           if (!existField || existField.options.inherit) {
             childCollection.setField(name, _objectSpread(_objectSpread({}, options), {}, {
               inherit: true
@@ -328,155 +314,127 @@ class Collection extends _events().EventEmitter {
           }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator2.f();
+        _iterator4.f();
       }
     }
-
     return field;
   }
-
   setFields(fields, resetFields = true) {
     if (!Array.isArray(fields)) {
       return;
     }
-
     if (resetFields) {
       this.resetFields();
     }
-
-    var _iterator3 = _createForOfIteratorHelper(fields),
-        _step3;
-
+    var _iterator5 = _createForOfIteratorHelper(fields),
+      _step5;
     try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        const _ref = _step3.value;
-
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        const _ref = _step5.value;
         const name = _ref.name,
-              options = _objectWithoutProperties(_ref, _excluded);
-
+          options = _objectWithoutProperties(_ref, _excluded);
         this.addField(name, options);
       }
     } catch (err) {
-      _iterator3.e(err);
+      _iterator5.e(err);
     } finally {
-      _iterator3.f();
+      _iterator5.f();
     }
   }
-
   resetFields() {
     const fieldNames = this.fields.keys();
-
-    var _iterator4 = _createForOfIteratorHelper(fieldNames),
-        _step4;
-
+    var _iterator6 = _createForOfIteratorHelper(fieldNames),
+      _step6;
     try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        const fieldName = _step4.value;
+      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+        const fieldName = _step6.value;
         this.removeField(fieldName);
       }
     } catch (err) {
-      _iterator4.e(err);
+      _iterator6.e(err);
     } finally {
-      _iterator4.f();
+      _iterator6.f();
     }
   }
-
   remove() {
     this.context.database.removeCollection(this.name);
   }
-
   removeFromDb(options) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
-      if (yield _this.existsInDb({
+      if (!_this.isView() && (yield _this.existsInDb({
         transaction: options === null || options === void 0 ? void 0 : options.transaction
-      })) {
+      }))) {
         const queryInterface = _this.db.sequelize.getQueryInterface();
-
-        yield queryInterface.dropTable(_this.model.tableName, options);
+        yield queryInterface.dropTable(_this.getTableNameWithSchema(), options);
       }
-
       _this.remove();
     })();
   }
-
   existsInDb(options) {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
-      return _this2.db.collectionExistsInDb(_this2.name, options);
+      return _this2.db.queryInterface.collectionTableExists(_this2, options);
     })();
   }
-
   removeField(name) {
     if (!this.fields.has(name)) {
       return;
     }
-
     const field = this.fields.get(name);
     const bool = this.fields.delete(name);
-
     if (bool) {
       if (this.isParent()) {
-        var _iterator5 = _createForOfIteratorHelper(this.db.inheritanceMap.getChildren(this.name, {
-          deep: false
-        })),
-            _step5;
-
+        var _iterator7 = _createForOfIteratorHelper(this.db.inheritanceMap.getChildren(this.name, {
+            deep: false
+          })),
+          _step7;
         try {
-          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            const child = _step5.value;
+          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+            const child = _step7.value;
             const childCollection = this.db.getCollection(child);
             const existField = childCollection.getField(name);
-
             if (existField && existField.options.inherit) {
               childCollection.removeField(name);
             }
           }
         } catch (err) {
-          _iterator5.e(err);
+          _iterator7.e(err);
         } finally {
-          _iterator5.f();
+          _iterator7.f();
         }
       }
-
       this.emit('field.afterRemove', field);
     }
-
     return field;
   }
   /**
    * TODO
    */
-
-
   updateOptions(options, mergeOptions) {
     let newOptions = _lodash().default.cloneDeep(options);
-
     newOptions = (0, _deepmerge().default)(this.options, newOptions, mergeOptions);
     this.context.database.emit('beforeUpdateCollection', this, newOptions);
     this.options = newOptions;
     this.setFields(options.fields, false);
-    this.setRepository(options.repository);
+    if (options.repository) {
+      this.setRepository(options.repository);
+    }
     this.context.database.emit('afterUpdateCollection', this);
     return this;
   }
-
   setSortable(sortable) {
     if (!sortable) {
       return;
     }
-
     if (sortable === true) {
       this.setField('sort', {
         type: 'sort',
         hidden: true
       });
     }
-
     if (typeof sortable === 'string') {
       this.setField(sortable, {
         type: 'sort',
@@ -484,8 +442,7 @@ class Collection extends _events().EventEmitter {
       });
     } else if (typeof sortable === 'object') {
       const name = sortable.name,
-            opts = _objectWithoutProperties(sortable, _excluded2);
-
+        opts = _objectWithoutProperties(sortable, _excluded2);
       this.setField(name || 'sort', _objectSpread({
         type: 'sort',
         hidden: true
@@ -498,30 +455,23 @@ class Collection extends _events().EventEmitter {
    * @param name
    * @param options
    */
-
-
   updateField(name, options) {
     if (!this.hasField(name)) {
       throw new Error(`field ${name} not exists`);
     }
-
     if (options.name && options.name !== name) {
       this.removeField(name);
     }
-
     this.setField(options.name || name, options);
   }
-
   addIndex(index) {
     if (!index) {
       return;
-    } // collection defined indexes
-
-
+    }
+    // collection defined indexes
     let indexes = this.model.options.indexes || [];
     let indexName = [];
     let indexItem;
-
     if (typeof index === 'string') {
       indexItem = {
         fields: [index]
@@ -536,140 +486,146 @@ class Collection extends _events().EventEmitter {
       indexItem = index;
       indexName = index.fields;
     }
-
     if (_lodash().default.isEqual(this.model.primaryKeyAttributes, indexName)) {
       return;
     }
-
     const name = this.model.primaryKeyAttributes.join(',');
-
     if (name.startsWith(`${indexName.join(',')},`)) {
       return;
     }
-
-    var _iterator6 = _createForOfIteratorHelper(indexes),
-        _step6;
-
+    var _iterator8 = _createForOfIteratorHelper(indexes),
+      _step8;
     try {
-      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-        const item = _step6.value;
-
+      for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+        const item = _step8.value;
         if (_lodash().default.isEqual(item.fields, indexName)) {
           return;
         }
-
         const name = item.fields.join(',');
-
         if (name.startsWith(`${indexName.join(',')},`)) {
           return;
         }
       }
     } catch (err) {
-      _iterator6.e(err);
+      _iterator8.e(err);
     } finally {
-      _iterator6.f();
+      _iterator8.f();
     }
-
     if (!indexItem) {
       return;
     }
-
     indexes.push(indexItem);
-    const tableName = this.model.getTableName(); // @ts-ignore
-
-    this.model._indexes = this.model.options.indexes // @ts-ignore
+    const tableName = this.model.getTableName();
+    // @ts-ignore
+    this.model._indexes = this.model.options.indexes
+    // @ts-ignore
     .map(index => _sequelize().Utils.nameIndex(this.model._conformIndex(index), tableName)).map(item => {
       if (item.name && item.name.length > 63) {
         item.name = 'i_' + (0, _utils.md5)(item.name);
       }
-
       return item;
     });
     this.refreshIndexes();
   }
-
   removeIndex(fields) {
     if (!fields) {
       return;
-    } // @ts-ignore
-
-
-    const indexes = this.model._indexes; // @ts-ignore
-
+    }
+    // @ts-ignore
+    const indexes = this.model._indexes;
+    // @ts-ignore
     this.model._indexes = indexes.filter(item => {
       return !_lodash().default.isEqual(item.fields, fields);
     });
     this.refreshIndexes();
   }
-
   refreshIndexes() {
     // @ts-ignore
-    const indexes = this.model._indexes; // @ts-ignore
-
+    const indexes = this.model._indexes;
+    // @ts-ignore
     this.model._indexes = _lodash().default.uniqBy(indexes.filter(item => {
       return item.fields.every(field => Object.values(this.model.rawAttributes).find(fieldVal => fieldVal.field === field));
     }).map(item => {
       if (this.options.underscored) {
         item.fields = item.fields.map(field => (0, _utils.snakeCase)(field));
       }
-
       return item;
     }), 'name');
   }
-
   sync(syncOptions) {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       const modelNames = new Set([_this3.model.name]);
       const associations = _this3.model.associations;
-
       for (const associationKey in associations) {
         const association = associations[associationKey];
         modelNames.add(association.target.name);
-
         if (association.through) {
           modelNames.add(association.through.model.name);
         }
       }
-
-      const models = []; // @ts-ignore
-
+      const models = [];
+      // @ts-ignore
       _this3.context.database.sequelize.modelManager.forEachModel(model => {
         if (modelNames.has(model.name)) {
           models.push(model);
         }
       });
-
       for (var _i2 = 0, _models = models; _i2 < _models.length; _i2++) {
         const model = _models[_i2];
         yield model.sync(syncOptions);
       }
     })();
   }
-
   isInherited() {
     return false;
   }
-
   isParent() {
     return this.context.database.inheritanceMap.isParentNode(this.name);
   }
-
-  addSchemaTableName() {
+  getTableNameWithSchema() {
     const tableName = this.model.tableName;
-
-    if (this.options.schema) {
-      return this.db.utils.addSchema(tableName, this.options.schema);
+    if (this.collectionSchema() && this.db.inDialect('postgres')) {
+      return this.db.utils.addSchema(tableName, this.collectionSchema());
+    }
+    return tableName;
+  }
+  tableNameAsString(options) {
+    const tableNameWithSchema = this.getTableNameWithSchema();
+    if (_lodash().default.isString(tableNameWithSchema)) {
+      return tableNameWithSchema;
+    }
+    const schema = tableNameWithSchema.schema;
+    const tableName = tableNameWithSchema.tableName;
+    if ((options === null || options === void 0 ? void 0 : options.ignorePublicSchema) && schema === 'public') {
+      return tableName;
+    }
+    return `${schema}.${tableName}`;
+  }
+  getTableNameWithSchemaAsString() {
+    const tableName = this.model.tableName;
+    if (this.collectionSchema() && this.db.inDialect('postgres')) {
+      return `${this.collectionSchema()}.${tableName}`;
     }
-
     return tableName;
   }
-
   quotedTableName() {
-    return this.db.utils.quoteTable(this.addSchemaTableName());
+    return this.db.utils.quoteTable(this.getTableNameWithSchema());
+  }
+  collectionSchema() {
+    if (this.options.schema) {
+      return this.options.schema;
+    }
+    if (this.db.options.schema) {
+      return this.db.options.schema;
+    }
+    if (this.db.inDialect('postgres')) {
+      return 'public';
+    }
+    return undefined;
+  }
+  isView() {
+    return false;
   }
-
 }
-
 exports.Collection = Collection;