Merge branch 'develop'

Author: eveffer

src/orm/field/fields/int-field.ts

@@ -14,6 +14,13 @@ export default new ORMFieldConfig("IntField", {
     return true;
   },
   dbSave(value, _fieldDef) {
+    if (value !== null && value !== undefined) {
+      value = parseInt(value, 10);
+      if (isNaN(value)) {
+        value = null;
+      }
+    }
+
     return value;
   },
 });

src/orm/migrate/migration-planner.ts

@@ -7,7 +7,6 @@ import type { SettingsType } from "~/orm/settings/settings-type.ts";
 import type { PgColumnDefinition } from "~/orm/db/db-types.ts";
 import { MigrationPlan } from "~/orm/migrate/migration-plan.ts";
 import type { InSpatialORM } from "../inspatial-orm.ts";
-import { raiseORMException } from "../orm-exception.ts";
 
 export class MigrationPlanner {
   entryTypes: Map<string, EntryTypeMigrator<EntryType>>;

src/orm/shared/base-class.ts

@@ -215,9 +215,24 @@ export class BaseClass<N extends string = string> {
         break;
       }
       case PGErrorCode.UniqueViolation: {
-        const fieldKey = convertString(e.fullMessage.columnName, "camel");
+        const { tableName, detail } = e.fullMessage;
+        if (detail) {
+          const match = detail.match(
+            /\((?<column>.+)\)=\((?<value>.+)\)/,
+          );
+          if (match?.groups) {
+            const fieldKey = convertString(match.groups.column, "camel");
+            const fieldValue = match.groups.value;
+            raiseORMException(
+              `Field "${fieldKey}" with value "${fieldValue}" must be unique for "${this._name}"`,
+              "UniqueField",
+              400,
+            );
+          }
+          break;
+        }
         raiseORMException(
-          `Field ${fieldKey} must be unique for ${this._name}`,
+          `Unique constraint violation on ${tableName} for ${this._name}`,
           "UniqueField",
           400,
         );
@@ -226,5 +241,6 @@ export class BaseClass<N extends string = string> {
       default:
         throw e;
     }
+    throw e;
   }
 }