@mikro-orm/knex 6.1.5-dev.3 → 6.1.5-dev.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.5-dev.3",
+  "version": "6.1.5-dev.4",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^6.1.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.5-dev.3"
+    "@mikro-orm/core": "6.1.5-dev.4"
   }
 }

package/schema/DatabaseTable.js

@@ -477,8 +477,11 @@ class DatabaseTable {
         const columnOptions = {};
         if (fk.columnNames.length === 1) {
             const column = this.getColumn(fk.columnNames[0]);
-            columnOptions.default = this.getPropertyDefaultValue(schemaHelper, column, type);
-            columnOptions.defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, type, true);
+            const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, column.type, true);
+            const defaultTs = this.getPropertyDefaultValue(schemaHelper, column, column.type);
+            columnOptions.default = defaultRaw !== defaultTs ? defaultTs : undefined;
+            columnOptions.defaultRaw = (column.nullable && defaultRaw === 'null') ? undefined : defaultRaw;
+            columnOptions.optional = typeof column.generated !== 'undefined' || defaultTs != null;
             columnOptions.generated = column.generated;
             columnOptions.nullable = column.nullable;
             columnOptions.primary = column.primary;
@@ -507,6 +510,9 @@ class DatabaseTable {
         const unique = compositeFkUniques[prop] || this.indexes.find(idx => idx.columnNames[0] === column.name && !idx.composite && idx.unique && !idx.primary);
         const kind = this.getReferenceKind(fk, unique);
         const type = this.getPropertyTypeForColumn(namingStrategy, column, fk);
+        const defaultRaw = this.getPropertyDefaultValue(schemaHelper, column, type, true);
+        const defaultParsed = this.getPropertyDefaultValue(schemaHelper, column, type);
+        const defaultTs = defaultRaw !== defaultParsed ? defaultParsed : undefined;
         const fkOptions = {};
         if (fk) {
             fkOptions.fieldNames = fk.columnNames;
@@ -520,9 +526,10 @@ class DatabaseTable {
             type,
             kind,
             generated: column.generated,
+            optional: defaultRaw !== 'null' || defaultTs != null || typeof column.generated !== 'undefined',
             columnType: column.type,
-            default: this.getPropertyDefaultValue(schemaHelper, column, type),
-            defaultRaw: this.getPropertyDefaultValue(schemaHelper, column, type, true),
+            default: defaultTs,
+            defaultRaw: (column.nullable && defaultRaw === 'null') ? undefined : defaultRaw,
             nullable: column.nullable,
             primary: column.primary && persist,
             autoincrement: column.autoincrement,
@@ -591,7 +598,7 @@ class DatabaseTable {
         if (propType === 'boolean' && !raw) {
             return !['0', 'false', 'f', 'n', 'no', 'off'].includes('' + column.default);
         }
-        if (propType === 'number') {
+        if (propType === 'number' && !raw) {
             return +column.default;
         }
         // unquote string defaults if `raw = false`