@mikro-orm/knex 6.3.14-dev.0 → 6.3.14-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.14-dev.0",
+  "version": "6.3.14-dev.2",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.3.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.14-dev.0",
+    "@mikro-orm/core": "6.3.14-dev.2",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/schema/DatabaseTable.js

@@ -557,9 +557,9 @@ class DatabaseTable {
             const column = this.getColumn(fk.columnNames[0]);
             const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, column.type, true);
             const defaultTs = this.getPropertyDefaultValue(schemaHelper, column, column.type);
-            columnOptions.default = defaultRaw !== defaultTs ? defaultTs : undefined;
+            columnOptions.default = (defaultRaw !== defaultTs || defaultRaw === '') ? defaultTs : undefined;
             columnOptions.defaultRaw = (column.nullable && defaultRaw === 'null') ? undefined : defaultRaw;
-            columnOptions.optional = typeof column.generated !== 'undefined' || defaultTs != null;
+            columnOptions.optional = typeof column.generated !== 'undefined' || defaultRaw !== 'null';
             columnOptions.generated = column.generated;
             columnOptions.nullable = column.nullable;
             columnOptions.primary = column.primary;
@@ -598,7 +598,7 @@ class DatabaseTable {
         const ignoreSchemaChanges = (type === 'unknown' && column.length) ? (column.extra ? ['type', 'extra'] : ['type']) : undefined;
         const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, runtimeType, true);
         const defaultParsed = this.getPropertyDefaultValue(schemaHelper, column, runtimeType);
-        const defaultTs = defaultRaw !== defaultParsed ? defaultParsed : undefined;
+        const defaultTs = (defaultRaw !== defaultParsed || defaultParsed === '') ? defaultParsed : undefined;
         const fkOptions = {};
         if (fk) {
             fkOptions.fieldNames = fk.columnNames;
@@ -677,19 +677,16 @@ class DatabaseTable {
         return column.mappedType?.runtimeType ?? 'unknown';
     }
     getPropertyDefaultValue(schemaHelper, column, propType, raw = false) {
-        const empty = raw ? 'null' : undefined;
-        if (!column.default) {
-            return empty;
-        }
-        const val = schemaHelper.normalizeDefaultValue(column.default, column.length);
-        if (column.nullable && val === 'null') {
-            return empty;
+        const defaultValue = column.default ?? 'null';
+        const val = schemaHelper.normalizeDefaultValue(defaultValue, column.length);
+        if (val === 'null') {
+            return raw ? 'null' : (column.nullable ? null : undefined);
         }
         if (propType === 'boolean' && !raw) {
             return !['0', 'false', 'f', 'n', 'no', 'off'].includes('' + column.default);
         }
         if (propType === 'number' && !raw) {
-            return +column.default;
+            return +defaultValue;
         }
         // unquote string defaults if `raw = false`
         const match = ('' + val).match(/^'(.*)'$/);