@nocobase/database 1.9.0-alpha.14 → 1.9.0-alpha.15

package/lib/database.d.ts

@@ -118,7 +118,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     /**
      * @internal
      */
-    sequelizeOptions(options: any): IDatabaseOptions;
+    sequelizeOptions(options: DatabaseOptions): IDatabaseOptions;
     /**
      * @internal
      */
@@ -128,6 +128,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     inDialect(...dialect: string[]): boolean;
     isMySQLCompatibleDialect(): boolean;
     isPostgresCompatibleDialect(): boolean;
+    wrapSequelizeRunForMySQL(): void;
     /**
      * Add collection to database
      * @param options

package/lib/database.js

@@ -176,6 +176,9 @@ const _Database = class _Database extends import_events.EventEmitter {
     );
     const sequelizeOptions = this.sequelizeOptions(this.options);
     this.sequelize = new import_sequelize.Sequelize(sequelizeOptions);
+    if (options.dialect === "mysql") {
+      this.wrapSequelizeRunForMySQL();
+    }
     this.queryInterface = (0, import_query_interface_builder.default)(this);
     this.collections = /* @__PURE__ */ new Map();
     this.modelHook = new import_model_hook.ModelHook(this);
@@ -397,6 +400,30 @@ const _Database = class _Database extends import_events.EventEmitter {
   isPostgresCompatibleDialect() {
     return this.inDialect("postgres");
   }
+  /*
+   * https://github.com/sidorares/node-mysql2/issues/1239#issuecomment-766867699
+   * https://github.com/sidorares/node-mysql2/pull/1407#issuecomment-1325789581
+   * > I'm starting to think simple "always send (parameter.toString()) as VAR_STRING" unless the type is explicitly specified by user" might be actually the best behaviour
+   */
+  wrapSequelizeRunForMySQL() {
+    const that = this;
+    const run = this.sequelize.dialect.Query.prototype.run;
+    this.sequelize.dialect.Query.prototype.run = function(sql, parameters) {
+      if (!/^update\s+/i.test(sql.trim()) || !(parameters == null ? void 0 : parameters.length)) {
+        return run.apply(this, [sql, parameters]);
+      }
+      try {
+        parameters.forEach((p, index) => {
+          if (typeof p === "number") {
+            parameters[index] = p.toString();
+          }
+        });
+      } catch (err) {
+        that.logger.error(err);
+      }
+      return run.apply(this, [sql, parameters]);
+    };
+  }
   /**
    * Add collection to database
    * @param options
@@ -612,7 +639,7 @@ const _Database = class _Database extends import_events.EventEmitter {
   /* istanbul ignore next -- @preserve */
   async auth(options = {}) {
     const { retry = 9, ...others } = options;
-    const startingDelay = 50;
+    const startingDelay = 200;
     const timeMultiple = 2;
     let attemptNumber = 1;
     const authenticate = /* @__PURE__ */ __name(async () => {

package/lib/dialects/mysql-dialect.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { BaseDialect } from './base-dialect';
+import { DatabaseOptions } from '../database';
 export declare class MysqlDialect extends BaseDialect {
     static dialectName: string;
     getVersionGuard(): {
@@ -14,5 +15,5 @@ export declare class MysqlDialect extends BaseDialect {
         get: (v: string) => string;
         version: string;
     };
-    getSequelizeOptions(options: any): any;
+    getSequelizeOptions(options: DatabaseOptions): import("../database").IDatabaseOptions;
 }

package/lib/dialects/mysql-dialect.js

@@ -32,7 +32,6 @@ __export(mysql_dialect_exports, {
   MysqlDialect: () => MysqlDialect
 });
 module.exports = __toCommonJS(mysql_dialect_exports);
-var import_utils = require("@nocobase/utils");
 var import_base_dialect = require("./base-dialect");
 const _MysqlDialect = class _MysqlDialect extends import_base_dialect.BaseDialect {
   getVersionGuard() {
@@ -46,7 +45,11 @@ const _MysqlDialect = class _MysqlDialect extends import_base_dialect.BaseDialec
     };
   }
   getSequelizeOptions(options) {
-    import_utils.lodash.set(options, "dialectOptions.multipleStatements", true);
+    const dialectOptions = {
+      ...options.dialectOptions || {},
+      multipleStatements: true
+    };
+    options.dialectOptions = dialectOptions;
     return options;
   }
 };

package/lib/fields/index.d.ts

@@ -32,6 +32,7 @@ import { UnixTimestampFieldOptions } from './unix-timestamp-field';
 import { DateOnlyFieldOptions } from './date-only-field';
 import { DatetimeNoTzFieldOptions } from './datetime-no-tz-field';
 import { DatetimeTzFieldOptions } from './datetime-tz-field';
+import { SnowflakeIdFieldOptions } from './snowflake-id-field';
 export * from './array-field';
 export * from './belongs-to-field';
 export * from './belongs-to-many-field';
@@ -60,4 +61,5 @@ export * from './virtual-field';
 export * from './nanoid-field';
 export * from './encryption-field';
 export * from './unix-timestamp-field';
-export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField;
+export * from './snowflake-id-field';
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | EncryptionField | SnowflakeIdFieldOptions;

package/lib/fields/index.js

@@ -51,6 +51,7 @@ __reExport(fields_exports, require("./virtual-field"), module.exports);
 __reExport(fields_exports, require("./nanoid-field"), module.exports);
 __reExport(fields_exports, require("./encryption-field"), module.exports);
 __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
+__reExport(fields_exports, require("./snowflake-id-field"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./array-field"),
@@ -80,5 +81,6 @@ __reExport(fields_exports, require("./unix-timestamp-field"), module.exports);
   ...require("./virtual-field"),
   ...require("./nanoid-field"),
   ...require("./encryption-field"),
-  ...require("./unix-timestamp-field")
+  ...require("./unix-timestamp-field"),
+  ...require("./snowflake-id-field")
 });

package/lib/fields/snowflake-id-field.d.ts

@@ -0,0 +1,29 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, Field } from './field';
+interface Application {
+    snowflakeIdGenerator: {
+        generate(): number | BigInt;
+    };
+}
+export declare class SnowflakeIdField extends Field {
+    private static app;
+    static setApp(app: Application): void;
+    get dataType(): DataTypes.BigIntDataTypeConstructor;
+    private setId;
+    init(): void;
+    bind(): void;
+    unbind(): void;
+}
+export interface SnowflakeIdFieldOptions extends BaseColumnFieldOptions {
+    type: 'snowflakeId';
+    epoch?: number;
+}
+export {};

package/lib/fields/snowflake-id-field.js

@@ -0,0 +1,79 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var snowflake_id_field_exports = {};
+__export(snowflake_id_field_exports, {
+  SnowflakeIdField: () => SnowflakeIdField
+});
+module.exports = __toCommonJS(snowflake_id_field_exports);
+var import_sequelize = require("sequelize");
+var import_field = require("./field");
+const _SnowflakeIdField = class _SnowflakeIdField extends import_field.Field {
+  static setApp(app) {
+    this.app = app;
+  }
+  get dataType() {
+    return import_sequelize.DataTypes.BIGINT;
+  }
+  setId(name, instance) {
+    const value = instance.get(name);
+    if (!value) {
+      const generator = this.constructor.app.snowflakeIdGenerator;
+      instance.set(name, generator.generate());
+    }
+  }
+  init() {
+    const { name } = this.options;
+    this.listener = (instance) => this.setId(name, instance);
+    this.bulkListener = async (instances) => {
+      for (const instance of instances) {
+        this.setId(name, instance);
+      }
+    };
+  }
+  bind() {
+    super.bind();
+    this.on("beforeValidate", this.listener);
+    this.on("beforeSave", this.listener);
+    this.on("beforeBulkCreate", this.bulkListener);
+  }
+  unbind() {
+    super.unbind();
+    this.off("beforeValidate", this.listener);
+    this.off("beforeSave", this.listener);
+    this.off("beforeBulkCreate", this.bulkListener);
+  }
+};
+__name(_SnowflakeIdField, "SnowflakeIdField");
+__publicField(_SnowflakeIdField, "app");
+let SnowflakeIdField = _SnowflakeIdField;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SnowflakeIdField
+});

package/lib/inherited-sync-runner.js

@@ -43,6 +43,7 @@ module.exports = __toCommonJS(inherited_sync_runner_exports);
 var import_lodash = __toESM(require("lodash"));
 const _InheritedSyncRunner = class _InheritedSyncRunner {
   static async syncInheritModel(model, options) {
+    var _a;
     const { transaction } = options;
     options.hooks = options.hooks === void 0 ? true : !!options.hooks;
     const inheritedCollection = model.collection;
@@ -77,6 +78,10 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
       let maxSequenceName;
       if (childAttributes.id && childAttributes.id.autoIncrement) {
         for (const parent of parents) {
+          const parentIdField = parent.getField("id");
+          if (!((_a = parentIdField == null ? void 0 : parentIdField.options) == null ? void 0 : _a.autoIncrement)) {
+            continue;
+          }
           const sequenceNameResult = await queryInterface.sequelize.query(
             `SELECT column_default
              FROM information_schema.columns

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.0-alpha.14",
+  "version": "1.9.0-alpha.15",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.0-alpha.14",
-    "@nocobase/utils": "1.9.0-alpha.14",
+    "@nocobase/logger": "1.9.0-alpha.15",
+    "@nocobase/utils": "1.9.0-alpha.15",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "0e2ad0f673bff626b4d59aaa9657ce5d5efb54c6"
+  "gitHead": "620cda051dd97134add40055d83039e3d9b6891e"
 }