@nocobase/database 1.6.25 → 1.6.27

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

@@ -6,9 +6,11 @@
  * 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 { DatabaseOptions } from '../database';
 import { BaseDialect } from './base-dialect';
 export declare class MariadbDialect extends BaseDialect {
     static dialectName: string;
+    getSequelizeOptions(options: DatabaseOptions): import("../database").IDatabaseOptions;
     getVersionGuard(): {
         sql: string;
         get: (v: string) => string;

package/lib/dialects/mariadb-dialect.js

@@ -34,6 +34,10 @@ __export(mariadb_dialect_exports, {
 module.exports = __toCommonJS(mariadb_dialect_exports);
 var import_base_dialect = require("./base-dialect");
 const _MariadbDialect = class _MariadbDialect extends import_base_dialect.BaseDialect {
+  getSequelizeOptions(options) {
+    options.dialectOptions = { ...options.dialectOptions || {}, supportBigNumbers: true, bigNumberStrings: true };
+    return options;
+  }
   getVersionGuard() {
     return {
       sql: "select version() as version",

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

@@ -11,7 +11,7 @@ import { BaseColumnFieldOptions, Field } from './field';
 export declare class StringField extends Field {
     get dataType(): DataTypes.StringDataTypeConstructor | DataTypes.StringDataType;
     additionalSequelizeOptions(): {
-        set(value: any): any;
+        set(value: any): void;
     };
 }
 export interface StringFieldOptions extends BaseColumnFieldOptions {

package/lib/fields/string-field.js

@@ -40,11 +40,15 @@ const _StringField = class _StringField extends import_field.Field {
     return import_sequelize.DataTypes.STRING;
   }
   additionalSequelizeOptions() {
-    const { name, trim } = this.options;
+    const { name, trim, unique } = this.options;
     return {
       set(value) {
+        if (unique && value === "") {
+          value = null;
+        }
         if (value == null) {
-          return value;
+          this.setDataValue(name, null);
+          return;
         }
         if (typeof value !== "string") {
           value = value.toString();

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

@@ -12,7 +12,7 @@ export declare class TextField extends Field {
     get dataType(): DataTypes.TextDataTypeConstructor | DataTypes.TextDataType;
     init(): void;
     additionalSequelizeOptions(): {
-        set(value: any): any;
+        set(value: any): void;
     };
 }
 export interface TextFieldOptions extends BaseColumnFieldOptions {

package/lib/fields/text-field.js

@@ -45,11 +45,15 @@ const _TextField = class _TextField extends import_field.Field {
     }
   }
   additionalSequelizeOptions() {
-    const { name, trim } = this.options;
+    const { name, trim, unique } = this.options;
     return {
       set(value) {
+        if (unique && value === "") {
+          value = null;
+        }
         if (value == null) {
-          return value;
+          this.setDataValue(name, null);
+          return;
         }
         if (typeof value !== "string") {
           value = value.toString();

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.6.25",
+  "version": "1.6.27",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.6.25",
-    "@nocobase/utils": "1.6.25",
+    "@nocobase/logger": "1.6.27",
+    "@nocobase/utils": "1.6.27",
     "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": "569e5ab32f72a9876408ff2bc37fc8a2a307f237"
+  "gitHead": "ec32854b338d799b52278829261355b756e577b5"
 }