@nocobase/database 0.21.0-alpha.1 → 0.21.0-alpha.2

package/lib/collection.js

@@ -260,9 +260,6 @@ const _Collection = class _Collection extends import_events.EventEmitter {
         `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);

package/lib/database.js

@@ -183,7 +183,13 @@ const _Database = class _Database extends import_events.EventEmitter {
       opts.timezone = "+00:00";
     }
     if (options.dialect === "postgres") {
-      require("pg").defaults.parseInt8 = true;
+      const types = require("pg").types;
+      types.setTypeParser(types.builtins.INT8, function(val) {
+        if (val <= Number.MAX_SAFE_INTEGER) {
+          return Number(val);
+        }
+        return val;
+      });
     }
     this.options = opts;
     const sequelizeOptions = this.sequelizeOptions(this.options);

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

@@ -21,6 +21,7 @@ __export(must_have_filter_decorator_exports, {
   default: () => must_have_filter_decorator_default
 });
 module.exports = __toCommonJS(must_have_filter_decorator_exports);
+var import_utils = require("@nocobase/utils");
 const mustHaveFilter = /* @__PURE__ */ __name(() => (target, propertyKey, descriptor) => {
   const oldValue = descriptor.value;
   descriptor.value = function(...args) {
@@ -28,7 +29,7 @@ const mustHaveFilter = /* @__PURE__ */ __name(() => (target, propertyKey, descri
     if (Array.isArray(options.values)) {
       return oldValue.apply(this, args);
     }
-    if (!(options == null ? void 0 : options.filter) && !(options == null ? void 0 : options.filterByTk) && !(options == null ? void 0 : options.forceUpdate)) {
+    if (!(0, import_utils.isValidFilter)(options == null ? void 0 : options.filter) && !(options == null ? void 0 : options.filterByTk) && !(options == null ? void 0 : options.forceUpdate)) {
       throw new Error(`must provide filter or filterByTk for ${propertyKey} call, or set forceUpdate to true`);
     }
     return oldValue.apply(this, args);

package/lib/fields/nanoid-field.d.ts

@@ -10,4 +10,5 @@ export interface NanoidFieldOptions extends BaseColumnFieldOptions {
     type: 'nanoid';
     size?: number;
     customAlphabet?: string;
+    autoFill?: boolean;
 }

package/lib/fields/nanoid-field.js

@@ -30,10 +30,10 @@ const _NanoidField = class _NanoidField extends import_field.Field {
     return import_sequelize.DataTypes.STRING;
   }
   init() {
-    const { name, size, customAlphabet: customAlphabetOptions } = this.options;
+    const { name, size, customAlphabet: customAlphabetOptions, autoFill } = this.options;
     this.listener = async (instance) => {
       const value = instance.get(name);
-      if (!value) {
+      if (!value && autoFill !== false) {
         const nanoIdFunc = customAlphabetOptions ? (0, import_nanoid.customAlphabet)(customAlphabetOptions) : import_nanoid.nanoid;
         instance.set(name, nanoIdFunc(size || DEFAULT_SIZE));
       }

package/lib/fields/uuid-field.d.ts

@@ -1,9 +1,12 @@
 import { DataTypes } from 'sequelize';
-import { BaseColumnFieldOptions, Field, FieldContext } from './field';
+import { BaseColumnFieldOptions, Field } from './field';
 export declare class UuidField extends Field {
-    constructor(options?: any, context?: FieldContext);
     get dataType(): DataTypes.AbstractDataTypeConstructor;
+    init(): void;
+    bind(): void;
+    unbind(): void;
 }
 export interface UUIDFieldOptions extends BaseColumnFieldOptions {
     type: 'uuid';
+    autoFill?: boolean;
 }

package/lib/fields/uuid-field.js

@@ -23,19 +23,30 @@ __export(uuid_field_exports, {
 module.exports = __toCommonJS(uuid_field_exports);
 var import_sequelize = require("sequelize");
 var import_field = require("./field");
+var import_uuid = require("uuid");
 const _UuidField = class _UuidField extends import_field.Field {
-  constructor(options, context) {
-    super(
-      {
-        defaultValue: new import_sequelize.DataTypes.UUIDV4(),
-        ...options
-      },
-      context
-    );
-  }
   get dataType() {
     return import_sequelize.DataTypes.UUID;
   }
+  init() {
+    const { name, autoFill } = this.options;
+    this.listener = async (instance) => {
+      const value = instance.get(name);
+      if (!value && autoFill !== false) {
+        instance.set(name, (0, import_uuid.v4)());
+      }
+    };
+  }
+  bind() {
+    super.bind();
+    this.on("beforeCreate", this.listener);
+    this.on("beforeUpdate", this.listener);
+  }
+  unbind() {
+    super.unbind();
+    this.off("beforeCreate", this.listener);
+    this.off("beforeUpdate", this.listener);
+  }
 };
 __name(_UuidField, "UuidField");
 let UuidField = _UuidField;

package/lib/repository.js

@@ -44,6 +44,7 @@ module.exports = __toCommonJS(repository_exports);
 var import_flat = require("flat");
 var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
+var import_utils = require("@nocobase/utils");
 var import_must_have_filter_decorator = __toESM(require("./decorators/must-have-filter-decorator"));
 var import_target_collection_decorator = __toESM(require("./decorators/target-collection-decorator"));
 var import_transaction_decorator = require("./decorators/transaction-decorator");
@@ -469,7 +470,7 @@ const _Repository = class _Repository {
         transaction: transaction2
       });
     }
-    if (options.filter) {
+    if (options.filter && (0, import_utils.isValidFilter)(options.filter)) {
       if (this.collection.model.primaryKeyAttributes.length !== 1 && !import_lodash.default.get(this.collection.options, "filterTargetKey")) {
         const queryOptions = {
           ...this.buildQueryOptions(options)

package/lib/sync-runner.d.ts

@@ -5,6 +5,7 @@ export declare class SyncRunner {
     private readonly collection;
     private readonly database;
     private tableDescMap;
+    private uniqueAttributes;
     constructor(model: typeof Model);
     get tableName(): string | {
         tableName: string;
@@ -17,6 +18,8 @@ export declare class SyncRunner {
         [attribute: string]: import("sequelize").ModelAttributeColumnOptions<SequelizeModel<any, any>>;
     };
     runSync(options: any): Promise<any>;
+    handleUniqueFieldBeforeSync(beforeColumns: any, options: any): Promise<void>;
+    handlePrimaryKeyBeforeSync(columns: any, options: any): Promise<void>;
     handlePrimaryKey(columns: any, options: any): Promise<void>;
     handleDefaultValues(columns: any, options: any): Promise<void>;
     handleUniqueIndex(options: any): Promise<void>;

package/lib/sync-runner.js

@@ -34,6 +34,7 @@ const _SyncRunner = class _SyncRunner {
   collection;
   database;
   tableDescMap = {};
+  uniqueAttributes = [];
   get tableName() {
     return this.model.getTableName();
   }
@@ -68,6 +69,15 @@ const _SyncRunner = class _SyncRunner {
       }
       throw e;
     }
+    try {
+      const beforeColumns = await this.queryInterface.describeTable(this.tableName, options);
+      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);
     await this.handlePrimaryKey(columns, options);
@@ -75,10 +85,34 @@ const _SyncRunner = class _SyncRunner {
     await this.handleUniqueIndex(options);
     return syncResult;
   }
-  async handlePrimaryKey(columns, options) {
-    if (!this.database.inDialect("postgres")) {
+  async handleUniqueFieldBeforeSync(beforeColumns, options) {
+    if (!this.database.inDialect("sqlite")) {
       return;
     }
+    const newAttributes = Object.keys(this.rawAttributes).filter((key) => {
+      return !Object.keys(beforeColumns).includes(this.rawAttributes[key].field) && this.rawAttributes[key].unique;
+    });
+    this.uniqueAttributes = newAttributes;
+    for (const newAttribute of newAttributes) {
+      this.rawAttributes[newAttribute].unique = false;
+    }
+  }
+  async handlePrimaryKeyBeforeSync(columns, options) {
+    const columnsBePrimaryKey = Object.keys(columns).filter((key) => {
+      return columns[key].primaryKey == true;
+    }).sort();
+    const columnsWillBePrimaryKey = Object.keys(this.rawAttributes).filter((key) => {
+      return this.rawAttributes[key].primaryKey == true;
+    }).map((key) => {
+      return this.rawAttributes[key].field;
+    }).sort();
+    if (columnsBePrimaryKey.length == 1 && !columnsWillBePrimaryKey.includes(columnsBePrimaryKey[0])) {
+      if (this.database.inDialect("mariadb", "mysql")) {
+        await this.sequelize.query(`ALTER TABLE ${this.collection.quotedTableName()} DROP PRIMARY KEY;`, options);
+      }
+    }
+  }
+  async handlePrimaryKey(columns, options) {
     try {
       const columnsBePrimaryKey = Object.keys(columns).filter((key) => {
         return columns[key].primaryKey == true;
@@ -91,18 +125,26 @@ const _SyncRunner = class _SyncRunner {
       if (columnsWillBePrimaryKey.length == 0) {
         return;
       }
-      if (JSON.stringify(columnsBePrimaryKey) != JSON.stringify(columnsWillBePrimaryKey)) {
-        await this.queryInterface.addConstraint(this.tableName, {
-          type: "primary key",
-          fields: columnsWillBePrimaryKey,
-          name: `${this.collection.tableName()}_${columnsWillBePrimaryKey.join("_")}_pk`,
-          transaction: options == null ? void 0 : options.transaction
-        });
+      if (columnsWillBePrimaryKey.length == 1 && JSON.stringify(columnsBePrimaryKey) != JSON.stringify(columnsWillBePrimaryKey)) {
+        if (this.database.inDialect("mariadb", "mysql")) {
+          await this.sequelize.query(
+            `ALTER TABLE ${this.collection.quotedTableName()} ADD PRIMARY KEY (${columnsWillBePrimaryKey[0]});`,
+            options
+          );
+        } else {
+          await this.queryInterface.addConstraint(this.tableName, {
+            type: "primary key",
+            fields: columnsWillBePrimaryKey,
+            name: `${this.collection.tableName()}_${columnsWillBePrimaryKey.join("_")}_pk`,
+            transaction: options == null ? void 0 : options.transaction
+          });
+        }
       }
     } catch (e) {
       if (e.message.includes("No description found")) {
         return;
       }
+      throw e;
     }
   }
   async handleDefaultValues(columns, options) {
@@ -154,6 +196,9 @@ const _SyncRunner = class _SyncRunner {
     }
   }
   async handleUniqueIndex(options) {
+    for (const uniqueAttribute of this.uniqueAttributes) {
+      this.rawAttributes[uniqueAttribute].unique = true;
+    }
     const existsIndexes = await this.queryInterface.showIndex(this.collection.getTableNameWithSchema(), options);
     const existsUniqueIndexes = existsIndexes.filter((index) => index.unique);
     const uniqueAttributes = Object.keys(this.rawAttributes).filter((key) => {
@@ -190,7 +235,8 @@ const _SyncRunner = class _SyncRunner {
       if (!indexExists) {
         await this.queryInterface.addIndex(this.tableName, [this.rawAttributes[uniqueAttribute].field], {
           unique: true,
-          transaction: options == null ? void 0 : options.transaction
+          transaction: options == null ? void 0 : options.transaction,
+          name: `${this.collection.tableName()}_${this.rawAttributes[uniqueAttribute].field}_uk`
         });
       }
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.21.0-alpha.1",
+  "version": "0.21.0-alpha.2",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.21.0-alpha.1",
-    "@nocobase/utils": "0.21.0-alpha.1",
+    "@nocobase/logger": "0.21.0-alpha.2",
+    "@nocobase/utils": "0.21.0-alpha.2",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -25,7 +25,8 @@
     "qs": "^6.11.2",
     "semver": "^7.3.7",
     "sequelize": "^6.26.0",
-    "umzug": "^3.1.1"
+    "umzug": "^3.1.1",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0"
@@ -35,5 +36,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
+  "gitHead": "90628f2e2da846208fb2d7966ddb4e467d187ffb"
 }