@nocobase/database 0.9.4-alpha.1 → 0.10.0-alpha.2

package/lib/repository.js

@@ -31,10 +31,14 @@ var _hasoneRepository = require("./relation-repository/hasone-repository");
 var _updateAssociations = require("./update-associations");
 var _updateGuard = require("./update-guard");
 var _eagerLoadingTree = require("./eager-loading/eager-loading-tree");
+function _flat() {
+  const data = require("flat");
+  _flat = function _flat() {
+    return data;
+  };
+  return data;
+}
 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); }
-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 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; }
@@ -42,6 +46,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 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 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 _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; }
 var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
     r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
@@ -97,6 +104,51 @@ class Repository {
     this.collection = collection;
     this.model = collection.model;
   }
+  static valuesToFilter(values, filterKeys) {
+    const filterAnd = [];
+    const flattedValues = (0, _flat().flatten)(values);
+    const keyWithOutArrayIndex = key => {
+      const chunks = key.split('.');
+      return chunks.filter(chunk => {
+        return !Boolean(chunk.match(/\d+/));
+      }).join('.');
+    };
+    var _iterator = _createForOfIteratorHelper(filterKeys),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        const filterKey = _step.value;
+        let filterValue;
+        for (var _i = 0, _Object$keys = Object.keys(flattedValues); _i < _Object$keys.length; _i++) {
+          const flattedKey = _Object$keys[_i];
+          const flattedKeyWithoutIndex = keyWithOutArrayIndex(flattedKey);
+          if (flattedKeyWithoutIndex === filterKey) {
+            if (filterValue) {
+              if (Array.isArray(filterValue)) {
+                filterValue.push(flattedValues[flattedKey]);
+              } else {
+                filterValue = [filterValue, flattedValues[flattedKey]];
+              }
+            } else {
+              filterValue = flattedValues[flattedKey];
+            }
+          }
+        }
+        if (filterValue) {
+          filterAnd.push({
+            [filterKey]: filterValue
+          });
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return {
+      $and: filterAnd
+    };
+  }
   /**
    * return count by filter
    */
@@ -207,7 +259,8 @@ class Repository {
           model,
           rootAttributes: opts.attributes,
           includeOption: opts.include,
-          rootOrder: opts.order
+          rootOrder: opts.order,
+          db: _this3.database
         });
         yield eagerLoadingTree.load(ids.map(i => i.pk), transaction);
         rows = eagerLoadingTree.root.instances;
@@ -262,6 +315,53 @@ class Repository {
       return rows.length == 1 ? rows[0] : null;
     })();
   }
+  /**
+   * Get the first record matching the attributes or create it.
+   */
+  firstOrCreate(options) {
+    var _this6 = this;
+    return _asyncToGenerator(function* () {
+      const filterKeys = options.filterKeys,
+        values = options.values,
+        transaction = options.transaction;
+      const filter = Repository.valuesToFilter(values, filterKeys);
+      const instance = yield _this6.findOne({
+        filter,
+        transaction
+      });
+      if (instance) {
+        return instance;
+      }
+      return _this6.create({
+        values,
+        transaction
+      });
+    })();
+  }
+  updateOrCreate(options) {
+    var _this7 = this;
+    return _asyncToGenerator(function* () {
+      const filterKeys = options.filterKeys,
+        values = options.values,
+        transaction = options.transaction;
+      const filter = Repository.valuesToFilter(values, filterKeys);
+      const instance = yield _this7.findOne({
+        filter,
+        transaction
+      });
+      if (instance) {
+        return yield _this7.update({
+          filterByTk: instance.get(_this7.collection.model.primaryKeyAttribute),
+          values,
+          transaction
+        });
+      }
+      return _this7.create({
+        values,
+        transaction
+      });
+    })();
+  }
   /**
    * Save instance to database
    *
@@ -269,20 +369,20 @@ class Repository {
    * @param options
    */
   create(options) {
-    var _this6 = this;
+    var _this8 = this;
     return _asyncToGenerator(function* () {
       if (Array.isArray(options.values)) {
-        return _this6.createMany(_objectSpread(_objectSpread({}, options), {}, {
+        return _this8.createMany(_objectSpread(_objectSpread({}, options), {}, {
           records: options.values
         }));
       }
-      const transaction = yield _this6.getTransaction(options);
-      const guard = _updateGuard.UpdateGuard.fromOptions(_this6.model, _objectSpread(_objectSpread({}, options), {}, {
+      const transaction = yield _this8.getTransaction(options);
+      const guard = _updateGuard.UpdateGuard.fromOptions(_this8.model, _objectSpread(_objectSpread({}, options), {}, {
         action: 'create',
-        underscored: _this6.collection.options.underscored
+        underscored: _this8.collection.options.underscored
       }));
       const values = guard.sanitize(options.values || {});
-      const instance = yield _this6.model.create(values, _objectSpread(_objectSpread({}, options), {}, {
+      const instance = yield _this8.model.create(values, _objectSpread(_objectSpread({}, options), {}, {
         transaction
       }));
       if (!instance) {
@@ -292,10 +392,10 @@ class Repository {
         transaction
       }));
       if (options.hooks !== false) {
-        yield _this6.database.emitAsync(`${_this6.collection.name}.afterCreateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+        yield _this8.database.emitAsync(`${_this8.collection.name}.afterCreateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
           transaction
         }));
-        yield _this6.database.emitAsync(`${_this6.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+        yield _this8.database.emitAsync(`${_this8.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
           transaction
         }));
         instance.clearChangedWithAssociations();
@@ -310,26 +410,26 @@ class Repository {
    * @param options
    */
   createMany(options) {
-    var _this7 = this;
+    var _this9 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this7.getTransaction(options);
+      const transaction = yield _this9.getTransaction(options);
       const records = options.records;
       const instances = [];
-      var _iterator = _createForOfIteratorHelper(records),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(records),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          const values = _step.value;
-          const instance = yield _this7.create({
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          const values = _step2.value;
+          const instance = yield _this9.create({
             values,
             transaction
           });
           instances.push(instance);
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
       return instances;
     })();
@@ -341,76 +441,76 @@ class Repository {
    * @param options
    */
   update(options) {
-    var _this8 = this;
+    var _this10 = this;
     return _asyncToGenerator(function* () {
       if (Array.isArray(options.values)) {
-        return _this8.updateMany(_objectSpread(_objectSpread({}, options), {}, {
+        return _this10.updateMany(_objectSpread(_objectSpread({}, options), {}, {
           records: options.values
         }));
       }
-      const transaction = yield _this8.getTransaction(options);
-      const guard = _updateGuard.UpdateGuard.fromOptions(_this8.model, _objectSpread(_objectSpread({}, options), {}, {
-        underscored: _this8.collection.options.underscored
+      const transaction = yield _this10.getTransaction(options);
+      const guard = _updateGuard.UpdateGuard.fromOptions(_this10.model, _objectSpread(_objectSpread({}, options), {}, {
+        underscored: _this10.collection.options.underscored
       }));
       const values = guard.sanitize(options.values);
-      const queryOptions = _this8.buildQueryOptions(options);
-      const instances = yield _this8.find(_objectSpread(_objectSpread({}, queryOptions), {}, {
+      const queryOptions = _this10.buildQueryOptions(options);
+      const instances = yield _this10.find(_objectSpread(_objectSpread({}, queryOptions), {}, {
         transaction
       }));
-      var _iterator2 = _createForOfIteratorHelper(instances),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(instances),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          const instance = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          const instance = _step3.value;
           yield (0, _updateAssociations.updateModelByValues)(instance, values, _objectSpread(_objectSpread({}, options), {}, {
             sanitized: true,
             transaction
           }));
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       if (options.hooks !== false) {
-        var _iterator3 = _createForOfIteratorHelper(instances),
-          _step3;
+        var _iterator4 = _createForOfIteratorHelper(instances),
+          _step4;
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            const instance = _step3.value;
-            yield _this8.database.emitAsync(`${_this8.collection.name}.afterUpdateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            const instance = _step4.value;
+            yield _this10.database.emitAsync(`${_this10.collection.name}.afterUpdateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
-            yield _this8.database.emitAsync(`${_this8.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+            yield _this10.database.emitAsync(`${_this10.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
             instance.clearChangedWithAssociations();
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator4.e(err);
         } finally {
-          _iterator3.f();
+          _iterator4.f();
         }
       }
       return instances;
     })();
   }
   updateMany(options) {
-    var _this9 = this;
+    var _this11 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this9.getTransaction(options);
+      const transaction = yield _this11.getTransaction(options);
       const records = options.records;
       const instances = [];
-      var _iterator4 = _createForOfIteratorHelper(records),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(records),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          const values = _step4.value;
-          const filterByTk = values[_this9.model.primaryKeyAttribute];
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          const values = _step5.value;
+          const filterByTk = values[_this11.model.primaryKeyAttribute];
           if (!filterByTk) {
             throw new Error('filterByTk invalid');
           }
-          const instance = yield _this9.update({
+          const instance = yield _this11.update({
             values,
             filterByTk,
             transaction
@@ -418,32 +518,32 @@ class Repository {
           instances.push(instance);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return instances;
     })();
   }
   destroy(options) {
-    var _this10 = this;
+    var _this12 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this10.getTransaction(options);
-      const modelFilterKey = _this10.collection.filterTargetKey;
+      const transaction = yield _this12.getTransaction(options);
+      const modelFilterKey = _this12.collection.filterTargetKey;
       options = options;
       if (options['individualHooks'] === undefined) {
         options['individualHooks'] = true;
       }
       const filterByTk = options.filterByTk && !_lodash().default.isArray(options.filterByTk) ? [options.filterByTk] : options.filterByTk;
-      if (_this10.collection.model.primaryKeyAttributes.length !== 1 && filterByTk && !_lodash().default.get(_this10.collection.options, 'filterTargetKey')) {
-        if (_this10.collection.model.primaryKeyAttributes.length > 1) {
+      if (_this12.collection.model.primaryKeyAttributes.length !== 1 && filterByTk && !_lodash().default.get(_this12.collection.options, 'filterTargetKey')) {
+        if (_this12.collection.model.primaryKeyAttributes.length > 1) {
           throw new Error(`filterByTk is not supported for composite primary key`);
         } else {
           throw new Error(`filterByTk is not supported for collection that has no primary key`);
         }
       }
       if (filterByTk && !options.filter) {
-        return yield _this10.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
+        return yield _this12.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
           where: {
             [modelFilterKey]: {
               [_sequelize().Op.in]: filterByTk
@@ -453,26 +553,26 @@ class Repository {
         }));
       }
       if (options.filter) {
-        if (_this10.collection.model.primaryKeyAttributes.length !== 1 && !_lodash().default.get(_this10.collection.options, 'filterTargetKey')) {
-          const queryOptions = _objectSpread({}, _this10.buildQueryOptions(options));
-          return yield _this10.model.destroy(_objectSpread(_objectSpread({}, queryOptions), {}, {
+        if (_this12.collection.model.primaryKeyAttributes.length !== 1 && !_lodash().default.get(_this12.collection.options, 'filterTargetKey')) {
+          const queryOptions = _objectSpread({}, _this12.buildQueryOptions(options));
+          return yield _this12.model.destroy(_objectSpread(_objectSpread({}, queryOptions), {}, {
             transaction
           }));
         }
-        let pks = (yield _this10.find({
+        let pks = (yield _this12.find({
           filter: options.filter,
           transaction
         })).map(instance => instance.get(modelFilterKey));
         if (filterByTk) {
           pks = _lodash().default.intersection(pks.map(i => `${i}`), filterByTk.map(i => `${i}`));
         }
-        return yield _this10.destroy(_objectSpread(_objectSpread({}, _lodash().default.omit(options, 'filter')), {}, {
+        return yield _this12.destroy(_objectSpread(_objectSpread({}, _lodash().default.omit(options, 'filter')), {}, {
           filterByTk: pks,
           transaction
         }));
       }
       if (options.truncate) {
-        return yield _this10.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
+        return yield _this12.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
           truncate: true,
           transaction
         }));
@@ -505,13 +605,13 @@ class Repository {
     return parser.toSequelizeParams();
   }
   getTransaction(options, autoGen = false) {
-    var _this11 = this;
+    var _this13 = this;
     return _asyncToGenerator(function* () {
       if (_lodash().default.isPlainObject(options) && options.transaction) {
         return options.transaction;
       }
       if (autoGen) {
-        return yield _this11.model.sequelize.transaction();
+        return yield _this13.model.sequelize.transaction();
       }
       return null;
     })();

package/lib/update-associations.js

@@ -196,7 +196,7 @@ function isReverseAssociationPair(a, b) {
   if (typeSet.has('HasOne') && typeSet.has('BelongsTo') || typeSet.has('HasMany') && typeSet.has('BelongsTo')) {
     const sourceAssoc = a.associationType == 'BelongsTo' ? b : a;
     const targetAssoc = sourceAssoc == a ? b : a;
-    return sourceAssoc.source.name === targetAssoc.target.name && sourceAssoc.foreignKey === targetAssoc.foreignKey && sourceAssoc.sourceKey === targetAssoc.targetKey;
+    return sourceAssoc.source.name === targetAssoc.target.name && sourceAssoc.target.name === targetAssoc.source.name && sourceAssoc.foreignKey === targetAssoc.foreignKey && sourceAssoc.sourceKey === targetAssoc.targetKey;
   }
   return false;
 }

package/lib/view/field-type-map.d.ts

@@ -4,6 +4,8 @@ declare const _default: {
         varchar: string;
         text: string;
         char: string;
+        oid: string;
+        name: string;
         smallint: string;
         integer: string;
         bigint: string;

package/lib/view/field-type-map.js

@@ -9,6 +9,8 @@ const postgres = {
   varchar: 'string',
   text: 'text',
   char: 'string',
+  oid: 'string',
+  name: 'string',
   smallint: 'integer',
   integer: 'integer',
   bigint: 'bigInt',

package/lib/view/view-inference.js

@@ -13,11 +13,12 @@ function _mathjs() {
   return data;
 }
 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 ViewFieldInference {
@@ -33,38 +34,63 @@ class ViewFieldInference {
         viewName: options.viewName,
         schema: options.viewSchema
       });
-      // @ts-ignore
-      return Object.fromEntries(Object.entries(columns).map(([name, column]) => {
+      const rawFields = [];
+      for (var _i = 0, _Object$entries = Object.entries(columns); _i < _Object$entries.length; _i++) {
+        const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+          name = _Object$entries$_i[0],
+          column = _Object$entries$_i[1];
+        const inferResult = {
+          name
+        };
         const usage = columnUsage[name];
         if (usage) {
+          const collection = db.tableNameCollectionMap.get(`${usage.table_schema ? `${usage.table_schema}.` : ''}${usage.table_name}`);
           const collectionField = (() => {
-            const tableName = `${usage.table_schema ? `${usage.table_schema}.` : ''}${usage.table_name}`;
-            const collection = db.tableNameCollectionMap.get(tableName);
             if (!collection) return false;
-            const fieldValue = Object.values(collection.model.rawAttributes).find(field => field.field === usage.column_name);
-            if (!fieldValue) {
+            const fieldAttribute = Object.values(collection.model.rawAttributes).find(field => field.field === usage.column_name);
+            if (!fieldAttribute) {
               return false;
             }
             // @ts-ignore
-            const fieldName = fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.fieldName;
+            const fieldName = fieldAttribute.fieldName;
             return collection.getField(fieldName);
           })();
-          if (collectionField && collectionField.options.interface) {
-            return [name, {
-              name,
-              type: collectionField.type,
-              source: `${collectionField.collection.name}.${collectionField.name}`
-            }];
+          const belongsToAssociationField = (() => {
+            if (!collection) return false;
+            const field = Object.values(collection.model.rawAttributes).find(field => field.field === usage.column_name);
+            if (!field) {
+              return false;
+            }
+            const association = Object.values(collection.model.associations).find(association => association.associationType === 'BelongsTo' && association.foreignKey === field.fieldName);
+            if (!association) {
+              return false;
+            }
+            return collection.getField(association.as);
+          })();
+          if (belongsToAssociationField) {
+            rawFields.push([belongsToAssociationField.name, {
+              name: belongsToAssociationField.name,
+              type: belongsToAssociationField.type,
+              source: `${belongsToAssociationField.collection.name}.${belongsToAssociationField.name}`
+            }]);
+          }
+          if (collectionField) {
+            if (collectionField.options.interface) {
+              inferResult.type = collectionField.type;
+              inferResult.source = `${collectionField.collection.name}.${collectionField.name}`;
+            }
           }
         }
-        return [name, _objectSpread({
-          name
-        }, _this.inferToFieldType({
-          db,
-          name,
-          type: column.type
-        }))];
-      }));
+        if (!inferResult.type) {
+          Object.assign(inferResult, _this.inferToFieldType({
+            db,
+            name,
+            type: column.type
+          }));
+        }
+        rawFields.push([name, inferResult]);
+      }
+      return Object.fromEntries(rawFields);
     })();
   }
   static inferToFieldType(options) {

package/lib/view-collection.js

@@ -9,7 +9,6 @@ class ViewCollection extends _collection.Collection {
   constructor(options, context) {
     options.autoGenId = false;
     options.timestamps = false;
-    options.underscored = false;
     super(options, context);
   }
   sequelizeModelOptions() {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.9.4-alpha.1",
+  "version": "0.10.0-alpha.2",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.9.4-alpha.1",
-    "@nocobase/utils": "0.9.4-alpha.1",
+    "@nocobase/logger": "0.10.0-alpha.2",
+    "@nocobase/utils": "0.10.0-alpha.2",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
@@ -28,5 +28,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "0b4936be557be918dbdf8196dadcbc7eb395906d"
+  "gitHead": "85028ae1733fcbd46ecd5d291dacbdc175f7f073"
 }