@nocobase/database 0.19.0-alpha.5 → 0.19.0-alpha.7

package/lib/fields/password-field.js

@@ -74,7 +74,7 @@ const _PasswordField = class _PasswordField extends import_field.Field {
         const hash = await this.hash(value);
         model.set(name, hash);
       } else {
-        model.set(name, null);
+        model.set(name, model.previous(name));
       }
     };
   }

package/lib/fields/uid-field.js

@@ -38,7 +38,9 @@ const _UidField = class _UidField extends import_field.Field {
       } else if (re.test(value)) {
         instance.set(name, value);
       } else {
-        throw new Error(`uid '${value}' is invalid`);
+        throw new Error(
+          `${this.collection.name}.${this.options.name} can only include A-Z, a-z, 0-9, _-*$, '${value}' is invalid`
+        );
       }
     };
   }

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

@@ -2,6 +2,7 @@ declare const _default: {
     postgres: {
         'character varying': string;
         varchar: string;
+        character: string;
         text: string;
         char: string;
         oid: string;
@@ -11,9 +12,11 @@ declare const _default: {
         bigint: string;
         decimal: string;
         numeric: string;
+        real: string;
         'double precision': string;
         'timestamp without time zone': string;
         'timestamp with time zone': string;
+        'time without time zone': string;
         date: string;
         boolean: string;
         json: string[];
@@ -22,18 +25,30 @@ declare const _default: {
         path: string;
         polygon: string;
         circle: string;
+        uuid: string;
     };
     mysql: {
+        smallint: string[];
+        tinyint: string[];
+        mediumint: string[];
+        'smallint unsigned': string[];
+        'tinyint unsigned': string[];
+        'mediumint unsigned': string[];
+        char: string;
+        date: string;
+        time: string;
         varchar: string;
         text: string;
         longtext: string;
         int: string;
+        'int unsigned': string;
         integer: string;
         bigint: string;
+        'bigint unsigned': string;
         float: string;
         double: string;
         boolean: string;
-        tinyint: string;
+        decimal: string;
         datetime: string;
         timestamp: string;
         json: string[];
@@ -51,16 +66,27 @@ declare const _default: {
         json: string[];
     };
     mariadb: {
+        smallint: string[];
+        tinyint: string[];
+        mediumint: string[];
+        'smallint unsigned': string[];
+        'tinyint unsigned': string[];
+        'mediumint unsigned': string[];
+        char: string;
+        date: string;
+        time: string;
         varchar: string;
         text: string;
         longtext: string;
         int: string;
+        'int unsigned': string;
         integer: string;
         bigint: string;
+        'bigint unsigned': string;
         float: string;
         double: string;
         boolean: string;
-        tinyint: string;
+        decimal: string;
         datetime: string;
         timestamp: string;
         json: string[];

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

@@ -23,6 +23,7 @@ module.exports = __toCommonJS(field_type_map_exports);
 const postgres = {
   "character varying": "string",
   varchar: "string",
+  character: "string",
   text: "text",
   char: "string",
   oid: "string",
@@ -30,31 +31,45 @@ const postgres = {
   smallint: "integer",
   integer: "integer",
   bigint: "bigInt",
-  decimal: "float",
+  decimal: "decimal",
   numeric: "float",
+  real: "float",
   "double precision": "float",
   "timestamp without time zone": "date",
   "timestamp with time zone": "date",
+  "time without time zone": "time",
   date: "date",
   boolean: "boolean",
   json: ["json", "array"],
   jsonb: ["json", "array", "jsonb"],
-  point: "point",
-  path: "lineString",
-  polygon: "polygon",
-  circle: "circle"
+  point: "json",
+  path: "json",
+  polygon: "json",
+  circle: "json",
+  uuid: "string"
 };
 const mysql = {
+  smallint: ["integer", "boolean"],
+  tinyint: ["integer", "boolean"],
+  mediumint: ["integer", "boolean"],
+  "smallint unsigned": ["integer", "boolean"],
+  "tinyint unsigned": ["integer", "boolean"],
+  "mediumint unsigned": ["integer", "boolean"],
+  char: "string",
+  date: "date",
+  time: "time",
   varchar: "string",
   text: "text",
   longtext: "text",
   int: "integer",
+  "int unsigned": "integer",
   integer: "integer",
   bigint: "bigInt",
+  "bigint unsigned": "bigInt",
   float: "float",
   double: "float",
   boolean: "boolean",
-  tinyint: "integer",
+  decimal: "decimal",
   datetime: "date",
   timestamp: "date",
   json: ["json", "array"]

package/lib/view/view-inference.d.ts

@@ -8,6 +8,7 @@ type InferredFieldResult = {
     [key: string]: InferredField;
 };
 export declare class ViewFieldInference {
+    static extractTypeFromDefinition(typeDefinition: any): any;
     static inferFields(options: {
         db: Database;
         viewName: string;

package/lib/view/view-inference.js

@@ -34,6 +34,13 @@ module.exports = __toCommonJS(view_inference_exports);
 var import_mathjs = require("mathjs");
 var import_field_type_map = __toESM(require("./field-type-map"));
 const _ViewFieldInference = class _ViewFieldInference {
+  static extractTypeFromDefinition(typeDefinition) {
+    const leftParenIndex = typeDefinition.indexOf("(");
+    if (leftParenIndex === -1) {
+      return typeDefinition.toLowerCase();
+    }
+    return typeDefinition.substring(0, leftParenIndex).toLowerCase().trim();
+  }
   static async inferFields(options) {
     const { db } = options;
     if (!db.inDialect("postgres")) {
@@ -120,7 +127,7 @@ const _ViewFieldInference = class _ViewFieldInference {
         possibleTypes: Object.keys(fieldTypeMap)
       };
     }
-    const queryType = options.type.toLowerCase().replace(/\(\d+\)/, "");
+    const queryType = this.extractTypeFromDefinition(options.type);
     const mappedType = fieldTypeMap[queryType];
     if ((0, import_mathjs.isArray)(mappedType)) {
       return {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.19.0-alpha.5",
+  "version": "0.19.0-alpha.7",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.19.0-alpha.5",
-    "@nocobase/utils": "0.19.0-alpha.5",
+    "@nocobase/logger": "0.19.0-alpha.7",
+    "@nocobase/utils": "0.19.0-alpha.7",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -35,5 +35,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "580eca25451ec731d17ddef285d0b8c52c48d501"
+  "gitHead": "cbbfd4de14b8f73417e613af6927d2fbbdbd2b41"
 }