@nocobase/database 1.2.33-alpha → 1.2.35-alpha

package/lib/collection.js

@@ -40,8 +40,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var collection_exports = {};

package/lib/database-utils/index.js

@@ -46,8 +46,7 @@ const _DatabaseUtils = class _DatabaseUtils {
     this.db = db;
   }
   addSchema(tableName, schema) {
-    if (!this.db.inDialect("postgres"))
-      return tableName;
+    if (!this.db.inDialect("postgres")) return tableName;
     if (this.db.options.schema && !schema) {
       schema = this.db.options.schema;
     }

package/lib/database.js

@@ -80,28 +80,28 @@ var import_view_collection = require("./view-collection");
 const DialectVersionAccessors = {
   sqlite: {
     sql: "select sqlite_version() as version",
-    get: (v) => v
+    get: /* @__PURE__ */ __name((v) => v, "get")
   },
   mysql: {
     sql: "select version() as version",
-    get: (v) => {
+    get: /* @__PURE__ */ __name((v) => {
       const m = /([\d+.]+)/.exec(v);
       return m[0];
-    }
+    }, "get")
   },
   mariadb: {
     sql: "select version() as version",
-    get: (v) => {
+    get: /* @__PURE__ */ __name((v) => {
       const m = /([\d+.]+)/.exec(v);
       return m[0];
-    }
+    }, "get")
   },
   postgres: {
     sql: "select version() as version",
-    get: (v) => {
+    get: /* @__PURE__ */ __name((v) => {
       const m = /([\d+.]+)/.exec(v);
       return import_semver.default.minVersion(m[0]).version;
-    }
+    }, "get")
   }
 };
 const _Database = class _Database extends import_events.EventEmitter {
@@ -738,14 +738,14 @@ const _Database = class _Database extends import_events.EventEmitter {
   }
   registerCollectionType() {
     this.collectionFactory.registerCollectionType(import_inherited_collection.InheritedCollection, {
-      condition: (options) => {
+      condition: /* @__PURE__ */ __name((options) => {
         return options.inherits && import_lodash.default.castArray(options.inherits).length > 0;
-      }
+      }, "condition")
     });
     this.collectionFactory.registerCollectionType(import_view_collection.ViewCollection, {
-      condition: (options) => {
+      condition: /* @__PURE__ */ __name((options) => {
         return options.viewName || options.view;
-      },
+      }, "condition"),
       async onSync() {
         return;
       },

package/lib/field-repository/array-field-repository.js

@@ -40,8 +40,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var array_field_repository_exports = {};

package/lib/fields/array-field.js

@@ -39,7 +39,7 @@ const _ArrayField = class _ArrayField extends import_field.Field {
     }
     return import_sequelize.DataTypes.JSON;
   }
-  sortValue = (model) => {
+  sortValue = /* @__PURE__ */ __name((model) => {
     let oldValue = model.get(this.options.name);
     if (oldValue) {
       if (typeof oldValue === "string") {
@@ -48,7 +48,7 @@ const _ArrayField = class _ArrayField extends import_field.Field {
       const newValue = oldValue.sort();
       model.set(this.options.name, newValue);
     }
-  };
+  }, "sortValue");
   bind() {
     super.bind();
     this.on("beforeSave", this.sortValue);

package/lib/fields/belongs-to-field.js

@@ -36,10 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var belongs_to_field_exports = {};
 __export(belongs_to_field_exports, {
   BelongsToField: () => BelongsToField

package/lib/fields/context-field.js

@@ -48,12 +48,12 @@ const _ContextField = class _ContextField extends import_field.Field {
     const type = this.options.dataType || "string";
     return import_sequelize.DataTypes[type.toUpperCase()] || import_sequelize.DataTypes.STRING;
   }
-  listener = async (model, options) => {
+  listener = /* @__PURE__ */ __name(async (model, options) => {
     const { name, dataIndex } = this.options;
     const { context } = options;
     model.set(name, import_lodash.default.get(context, dataIndex));
     model.changed(name, true);
-  };
+  }, "listener");
   bind() {
     super.bind();
     const { createOnly } = this.options;

package/lib/fields/password-field.js

@@ -55,8 +55,7 @@ const _PasswordField = class _PasswordField extends import_field.Field {
       const salt = hash.substring(0, randomBytesSize * 2);
       const key = hash.substring(randomBytesSize * 2);
       import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
-        if (err)
-          reject(err);
+        if (err) reject(err);
         resolve(key == derivedKey.toString("hex"));
       });
     });
@@ -66,8 +65,7 @@ const _PasswordField = class _PasswordField extends import_field.Field {
     return new Promise((resolve, reject) => {
       const salt = import_crypto.default.randomBytes(randomBytesSize).toString("hex");
       import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
-        if (err)
-          reject(err);
+        if (err) reject(err);
         resolve(salt + derivedKey.toString("hex"));
       });
     });

package/lib/fields/radio-field.js

@@ -36,7 +36,7 @@ const _RadioField = class _RadioField extends import_field.Field {
   get dataType() {
     return import_sequelize.DataTypes.BOOLEAN;
   }
-  listener = async (model, { transaction }) => {
+  listener = /* @__PURE__ */ __name(async (model, { transaction }) => {
     const { name } = this.options;
     if (!model.changed(name)) {
       return;
@@ -55,7 +55,7 @@ const _RadioField = class _RadioField extends import_field.Field {
         }
       );
     }
-  };
+  }, "listener");
   bind() {
     super.bind();
     this.on("beforeCreate", this.listener);

package/lib/fields/set-field.js

@@ -32,12 +32,12 @@ __export(set_field_exports, {
 module.exports = __toCommonJS(set_field_exports);
 var import_array_field = require("./array-field");
 const _SetField = class _SetField extends import_array_field.ArrayField {
-  beforeSave = (model) => {
+  beforeSave = /* @__PURE__ */ __name((model) => {
     const oldValue = model.get(this.options.name);
     if (oldValue) {
       model.set(this.options.name, [...new Set(oldValue)]);
     }
-  };
+  }, "beforeSave");
   bind() {
     super.bind();
     this.on("beforeSave", this.beforeSave);

package/lib/fields/sort-field.js

@@ -39,7 +39,7 @@ const _SortField = class _SortField extends import_field.Field {
   get dataType() {
     return import_sequelize.DataTypes.BIGINT;
   }
-  setSortValue = async (instance, options) => {
+  setSortValue = /* @__PURE__ */ __name(async (instance, options) => {
     const { name, scopeKey } = this.options;
     const { model } = this.context.collection;
     if ((0, import_lodash.isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] == instance[scopeKey]) {
@@ -57,14 +57,14 @@ const _SortField = class _SortField extends import_field.Field {
       const newValue = (max || 0) + 1;
       instance.set(name, newValue);
     });
-  };
-  onScopeChange = async (instance, options) => {
+  }, "setSortValue");
+  onScopeChange = /* @__PURE__ */ __name(async (instance, options) => {
     const { scopeKey } = this.options;
     if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] != instance[scopeKey]) {
       await this.setSortValue(instance, options);
     }
-  };
-  initRecordsSortValue = async (options) => {
+  }, "onScopeChange");
+  initRecordsSortValue = /* @__PURE__ */ __name(async (options) => {
     const { transaction } = options;
     const orderField = (() => {
       const model = this.collection.model;
@@ -175,7 +175,7 @@ const _SortField = class _SortField extends import_field.Field {
     } else if (await needInit()) {
       await doInit();
     }
-  };
+  }, "initRecordsSortValue");
   bind() {
     super.bind();
     this.on("afterSync", this.initRecordsSortValue);

package/lib/filter-match.js

@@ -36,16 +36,16 @@ function filterMatch(model, where) {
     where = import_mathjs.filter;
   }
   const operatorFunctions = {
-    $eq: (value, condition) => value === condition,
-    $not: (value, condition) => !filterMatch(model, condition),
-    $gt: (value, condition) => value > condition,
-    $gte: (value, condition) => value >= condition,
-    $lt: (value, condition) => value < condition,
-    $lte: (value, condition) => value <= condition,
-    $ne: (value, condition) => value !== condition,
-    $in: (value, condition) => condition.includes(value),
-    $or: (model2, conditions) => Object.values(conditions).some((condition) => filterMatch(model2, condition)),
-    $and: (model2, conditions) => Object.values(conditions).every((condition) => filterMatch(model2, condition))
+    $eq: /* @__PURE__ */ __name((value, condition) => value === condition, "$eq"),
+    $not: /* @__PURE__ */ __name((value, condition) => !filterMatch(model, condition), "$not"),
+    $gt: /* @__PURE__ */ __name((value, condition) => value > condition, "$gt"),
+    $gte: /* @__PURE__ */ __name((value, condition) => value >= condition, "$gte"),
+    $lt: /* @__PURE__ */ __name((value, condition) => value < condition, "$lt"),
+    $lte: /* @__PURE__ */ __name((value, condition) => value <= condition, "$lte"),
+    $ne: /* @__PURE__ */ __name((value, condition) => value !== condition, "$ne"),
+    $in: /* @__PURE__ */ __name((value, condition) => condition.includes(value), "$in"),
+    $or: /* @__PURE__ */ __name((model2, conditions) => Object.values(conditions).some((condition) => filterMatch(model2, condition)), "$or"),
+    $and: /* @__PURE__ */ __name((model2, conditions) => Object.values(conditions).every((condition) => filterMatch(model2, condition)), "$and")
   };
   for (const [key, value] of Object.entries(where)) {
     if (operatorFunctions[key] !== void 0) {

package/lib/helpers.js

@@ -82,16 +82,11 @@ function extractSSLOptionsFromEnv() {
     getValueOrFileContent("DB_DIALECT_OPTIONS_SSL_REJECT_UNAUTHORIZED")
   ]).then(([mode, ca, key, cert, rejectUnauthorized]) => {
     const sslOptions = {};
-    if (mode)
-      sslOptions["mode"] = mode;
-    if (ca)
-      sslOptions["ca"] = ca;
-    if (key)
-      sslOptions["key"] = key;
-    if (cert)
-      sslOptions["cert"] = cert;
-    if (rejectUnauthorized)
-      sslOptions["rejectUnauthorized"] = rejectUnauthorized === "true";
+    if (mode) sslOptions["mode"] = mode;
+    if (ca) sslOptions["ca"] = ca;
+    if (key) sslOptions["key"] = key;
+    if (cert) sslOptions["cert"] = cert;
+    if (rejectUnauthorized) sslOptions["rejectUnauthorized"] = rejectUnauthorized === "true";
     return sslOptions;
   });
 }
@@ -129,31 +124,31 @@ __name(customLogger, "customLogger");
 const dialectVersionAccessors = {
   sqlite: {
     sql: "select sqlite_version() as version",
-    get: (v) => v,
+    get: /* @__PURE__ */ __name((v) => v, "get"),
     version: "3.x"
   },
   mysql: {
     sql: "select version() as version",
-    get: (v) => {
+    get: /* @__PURE__ */ __name((v) => {
       const m = /([\d+.]+)/.exec(v);
       return m[0];
-    },
+    }, "get"),
     version: ">=8.0.17"
   },
   mariadb: {
     sql: "select version() as version",
-    get: (v) => {
+    get: /* @__PURE__ */ __name((v) => {
       const m = /([\d+.]+)/.exec(v);
       return m[0];
-    },
+    }, "get"),
     version: ">=10.9"
   },
   postgres: {
     sql: "select version() as version",
-    get: (v) => {
+    get: /* @__PURE__ */ __name((v) => {
       const m = /([\d+.]+)/.exec(v);
       return import_semver.default.minVersion(m[0]).version;
-    },
+    }, "get"),
     version: ">=10"
   }
 };

package/lib/inherited-collection.js

@@ -84,12 +84,12 @@ const _InheritedCollection = class _InheritedCollection extends import_collectio
     for (const parent of this.parents) {
       if (parent.isInherited()) {
         for (const [name, field] of parent.parentFields()) {
-          fields.set(name, field.options);
+          fields.set(name, field);
         }
       }
       const parentFields = parent.fields;
       for (const [name, field] of parentFields) {
-        fields.set(name, field.options);
+        fields.set(name, field);
       }
     }
     return fields;
@@ -124,9 +124,20 @@ const _InheritedCollection = class _InheritedCollection extends import_collectio
     });
   }
   setParentFields() {
-    for (const [name, fieldOptions] of this.parentFields()) {
+    const delayFields = /* @__PURE__ */ new Map();
+    for (const [name, field] of this.parentFields()) {
+      if (field.isRelationField()) {
+        delayFields.set(name, field);
+        continue;
+      }
+      this.setField(name, {
+        ...field.options,
+        inherit: true
+      });
+    }
+    for (const [name, field] of delayFields) {
       this.setField(name, {
-        ...fieldOptions,
+        ...field.options,
         inherit: true
       });
     }

package/lib/inherited-map.js

@@ -57,8 +57,7 @@ const _InheritanceMap = class _InheritanceMap {
   nodes = /* @__PURE__ */ new Map();
   removeNode(name) {
     const node = this.nodes.get(name);
-    if (!node)
-      return;
+    if (!node) return;
     for (const parent of node.parents) {
       parent.children.delete(node);
     }
@@ -91,8 +90,7 @@ const _InheritanceMap = class _InheritanceMap {
   getChildren(name, options = { deep: true }) {
     const results = /* @__PURE__ */ new Set();
     const node = this.getNode(name);
-    if (!node)
-      return results;
+    if (!node) return results;
     for (const child of node.children) {
       results.add(child.name);
       if (!options.deep) {
@@ -107,8 +105,7 @@ const _InheritanceMap = class _InheritanceMap {
   getParents(name, options = { deep: true }) {
     const results = /* @__PURE__ */ new Set();
     const node = this.getNode(name);
-    if (!node)
-      return results;
+    if (!node) return results;
     for (const parent of node.parents) {
       results.add(parent.name);
       if (!options.deep) {

package/lib/interfaces/datetime-interface.js

@@ -49,10 +49,8 @@ function isDate(v) {
 }
 __name(isDate, "isDate");
 function isNumeric(str) {
-  if (typeof str === "number")
-    return true;
-  if (typeof str != "string")
-    return false;
+  if (typeof str === "number") return true;
+  if (typeof str != "string") return false;
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");

package/lib/magic-attribute-model.js

@@ -125,8 +125,7 @@ const _MagicAttributeModel = class _MagicAttributeModel extends import_model.Mod
       }
       return this;
     }
-    if (!options)
-      options = {};
+    if (!options) options = {};
     if (!options.raw) {
       originalValue = this.dataValues[key];
     }

package/lib/model.js

@@ -36,10 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var model_exports = {};
 __export(model_exports, {
   Model: () => Model

package/lib/operators/child-collection.js

@@ -49,8 +49,7 @@ const mapVal = /* @__PURE__ */ __name((values, db) => values.map((v) => {
 const filterItems = /* @__PURE__ */ __name((values, db) => {
   return import_lodash.default.castArray(values).map((v) => {
     const collection = db.getCollection(v);
-    if (!collection)
-      return null;
+    if (!collection) return null;
     return `'${collection.tableNameAsString()}'::regclass`;
   }).filter(Boolean);
 }, "filterItems");

package/lib/options-parser.js

@@ -194,8 +194,7 @@ const _OptionsParser = class _OptionsParser {
         if (this.isAssociationPath(exceptKey)) {
           except.push(exceptKey);
         } else {
-          if (Array.isArray(attributes))
-            continue;
+          if (Array.isArray(attributes)) continue;
           attributes.exclude.push(exceptKey);
         }
       }
@@ -206,8 +205,7 @@ const _OptionsParser = class _OptionsParser {
     };
   }
   parseExcept(except, filterParams) {
-    if (!except)
-      return filterParams;
+    if (!except) return filterParams;
     const setExcept = /* @__PURE__ */ __name((queryParams, except2) => {
       const exceptPath = except2.split(".");
       const association = exceptPath[0];
@@ -247,8 +245,7 @@ const _OptionsParser = class _OptionsParser {
     return obj;
   }
   parseAppends(appends, filterParams) {
-    if (!appends)
-      return filterParams;
+    if (!appends) return filterParams;
     appends = import_lodash.default.sortBy(appends, (append) => append.split(".").length);
     const setInclude = /* @__PURE__ */ __name((model, queryParams, append) => {
       var _a;

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

@@ -100,7 +100,7 @@ const _MysqlQueryInterface = class _MysqlQueryInterface extends import_query_int
   }
   async showTableDefinition(tableInfo) {
     const { tableName } = tableInfo;
-    const sql = `SHOW CREATE TABLE ${tableName}`;
+    const sql = `SHOW CREATE TABLE ${this.db.utils.quoteTable(tableName)}`;
     const results = await this.db.sequelize.query(sql, { type: "SELECT" });
     return results[0]["Create Table"];
   }

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

@@ -37,8 +37,7 @@ const _QueryInterface = class _QueryInterface {
   }
   sequelizeQueryInterface;
   async dropAll(options) {
-    if (options.drop !== true)
-      return;
+    if (options.drop !== true) return;
     const views = await this.listViews();
     for (const view of views) {
       let removeSql;

package/lib/relation-repository/belongs-to-many-repository.js

@@ -40,8 +40,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var belongs_to_many_repository_exports = {};
@@ -61,7 +60,7 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
     const association = this.association;
     return await targetRepository.aggregate({
       ...options,
-      optionsTransformer: (modelOptions) => {
+      optionsTransformer: /* @__PURE__ */ __name((modelOptions) => {
         modelOptions.include = modelOptions.include || [];
         const throughWhere = {};
         throughWhere[association.foreignKey] = sourceModel.get(association.sourceKey);
@@ -71,7 +70,7 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
           attributes: [],
           where: throughWhere
         });
-      }
+      }, "optionsTransformer")
     });
   }
   async create(options) {

package/lib/relation-repository/hasmany-repository.js

@@ -30,8 +30,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var hasmany_repository_exports = {};

package/lib/relation-repository/multiple-relation-repository.js

@@ -40,8 +40,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var multiple_relation_repository_exports = {};
@@ -94,8 +93,7 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
   async count(options) {
     const transaction2 = await this.getTransaction(options);
     const sourceModel = await this.getSourceModel(transaction2);
-    if (!sourceModel)
-      return 0;
+    if (!sourceModel) return 0;
     const queryOptions = this.buildQueryOptions(options);
     const count = await sourceModel[this.accessors().get]({
       where: queryOptions.where,

package/lib/relation-repository/relation-repository.js

@@ -40,8 +40,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var relation_repository_exports = {};

package/lib/relation-repository/single-relation-repository.js

@@ -40,8 +40,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var single_relation_repository_exports = {};
@@ -71,8 +70,7 @@ const _SingleRelationRepository = class _SingleRelationRepository extends import
   async find(options) {
     const targetRepository = this.targetCollection.repository;
     const sourceModel = await this.getSourceModel(await this.getTransaction(options));
-    if (!sourceModel)
-      return null;
+    if (!sourceModel) return null;
     const addFilter = await this.filterOptions(sourceModel);
     const findOptions = {
       ...options,

package/lib/repository.js

@@ -40,8 +40,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 var repository_exports = {};

package/lib/sync-runner.d.ts

@@ -6,8 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Model } from './model';
 import { Model as SequelizeModel } from 'sequelize';
+import { Model } from './model';
 export declare class SyncRunner {
     private model;
     private readonly collection;

package/lib/sync-runner.js

@@ -30,10 +30,10 @@ __export(sync_runner_exports, {
   SyncRunner: () => SyncRunner
 });
 module.exports = __toCommonJS(sync_runner_exports);
-var import_inherited_sync_runner = require("./inherited-sync-runner");
+var import_utils = require("@nocobase/utils");
 var import_sequelize = require("sequelize");
 var import_zero_column_table_error = require("./errors/zero-column-table-error");
-var import_utils = require("@nocobase/utils");
+var import_inherited_sync_runner = require("./inherited-sync-runner");
 const _SyncRunner = class _SyncRunner {
   constructor(model) {
     this.model = model;
@@ -78,14 +78,14 @@ const _SyncRunner = class _SyncRunner {
       }
       throw e;
     }
+    let beforeColumns;
     try {
-      const beforeColumns = await this.queryInterface.describeTable(this.tableName, options);
+      beforeColumns = await this.queryInterface.describeTable(this.tableName, options);
+    } catch (error) {
+    }
+    if (beforeColumns) {
       await this.handlePrimaryKeyBeforeSync(beforeColumns, options);
       await this.handleUniqueFieldBeforeSync(beforeColumns, options);
-    } catch (e) {
-      if (!e.message.includes("No description found")) {
-        throw e;
-      }
     }
     const syncResult = await this.performSync(options);
     const columns = await this.queryInterface.describeTable(this.tableName, options);
@@ -166,19 +166,14 @@ const _SyncRunner = class _SyncRunner {
         const attribute = this.findAttributeByColumnName(columnName);
         return attribute && attribute.primaryKey || column.primaryKey;
       }, "isPrimaryKey");
-      if (isPrimaryKey())
-        continue;
-      if (await this.isParentColumn(columnName, options))
-        continue;
+      if (isPrimaryKey()) continue;
+      if (await this.isParentColumn(columnName, options)) continue;
       const currentAttribute = this.findAttributeByColumnName(columnName);
-      if (!currentAttribute)
-        continue;
+      if (!currentAttribute) continue;
       const attributeDefaultValue = (0, import_utils.isPlainObject)(currentAttribute.defaultValue) && isJSONColumn(column) ? JSON.stringify(currentAttribute.defaultValue) : currentAttribute.defaultValue;
       const columnDefaultValue = columns[columnName].defaultValue;
-      if (columnDefaultValue === null && attributeDefaultValue === void 0)
-        continue;
-      if (columnDefaultValue === "NULL" && attributeDefaultValue === null)
-        continue;
+      if (columnDefaultValue === null && attributeDefaultValue === void 0) continue;
+      if (columnDefaultValue === "NULL" && attributeDefaultValue === null) continue;
       if (columnDefaultValue != attributeDefaultValue) {
         const changeAttribute = {
           ...currentAttribute,
@@ -215,8 +210,7 @@ const _SyncRunner = class _SyncRunner {
     });
     for (const existUniqueIndex of existsUniqueIndexes) {
       const isSingleField = existUniqueIndex.fields.length == 1;
-      if (!isSingleField)
-        continue;
+      if (!isSingleField) continue;
       const columnName = existUniqueIndex.fields[0].attribute;
       const currentAttribute = this.findAttributeByColumnName(columnName);
       if (!currentAttribute || !currentAttribute.unique && !currentAttribute.primaryKey) {

package/lib/value-parsers/date-value-parser.js

@@ -45,10 +45,8 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_excel_date_to_js = require("excel-date-to-js");
 var import_base_value_parser = require("./base-value-parser");
 function isNumeric(str) {
-  if (typeof str === "number")
-    return true;
-  if (typeof str != "string")
-    return false;
+  if (typeof str === "number") return true;
+  if (typeof str != "string") return false;
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");

package/lib/view/view-inference.js

@@ -69,8 +69,7 @@ const _ViewFieldInference = class _ViewFieldInference {
           `${usage.table_schema ? `${usage.table_schema}.` : ""}${usage.table_name}`
         );
         const collectionField = (() => {
-          if (!collection)
-            return false;
+          if (!collection) return false;
           const fieldAttribute = Object.values(collection.model.rawAttributes).find(
             (field) => field.field === usage.column_name
           );
@@ -81,8 +80,7 @@ const _ViewFieldInference = class _ViewFieldInference {
           return collection.getField(fieldName);
         })();
         const belongsToAssociationField = (() => {
-          if (!collection)
-            return false;
+          if (!collection) return false;
           const field = Object.values(collection.model.rawAttributes).find(
             (field2) => field2.field === usage.column_name
           );

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.2.33-alpha",
+  "version": "1.2.35-alpha",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.2.33-alpha",
-    "@nocobase/utils": "1.2.33-alpha",
+    "@nocobase/logger": "1.2.35-alpha",
+    "@nocobase/utils": "1.2.35-alpha",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "b161f5e177c51d92fec745e81853c301689a9d6f"
+  "gitHead": "37a4edc27153f9346b3b08c25a407fb57c78b68e"
 }