@mikro-orm/sql 7.1.1-dev.1 → 7.1.1-dev.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.1-dev.1",
+  "version": "7.1.1-dev.11",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.1-dev.1"
+    "@mikro-orm/core": "7.1.1-dev.11"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/DatabaseTable.js

@@ -1025,6 +1025,7 @@ export class DatabaseTable {
             };
             const optional = [
                 'expression',
+                'where',
                 'type',
                 'deferMode',
                 'columns',

package/schema/SchemaComparator.js

@@ -977,6 +977,9 @@ export class SchemaComparator {
             from.default.toString().startsWith('nextval(')) {
             return to.default == null || to.default.toLowerCase() === 'null';
         }
+        if (to.default == null || to.default.toLowerCase() === 'null') {
+            return false;
+        }
         if (to.mappedType instanceof BooleanType) {
             const defaultValueFrom = !['0', 'false', 'f', 'n', 'no', 'off'].includes('' + from.default);
             const defaultValueTo = !['0', 'false', 'f', 'n', 'no', 'off'].includes('' + to.default);

package/schema/SchemaHelper.js

@@ -490,10 +490,21 @@ export class SchemaHelper {
     }
     alterTableColumn(column, table, changedProperties) {
         const sql = [];
-        if (changedProperties.has('default') && column.default == null) {
+        const typeChanged = changedProperties.has('type') || changedProperties.has('collation');
+        const defaultChanged = changedProperties.has('default');
+        // Postgres can't implicitly cast a stored DEFAULT across array element types
+        // (e.g. `'{}'::text[]` -> `numeric(3,2)[]`), so drop+re-set it around ALTER TYPE.
+        const fromColumn = typeChanged ? table.getColumn(column.name) : undefined;
+        const needsArrayDefaultRecast = typeChanged &&
+            fromColumn?.default != null &&
+            fromColumn.type.endsWith(']') &&
+            column.type.endsWith(']') &&
+            fromColumn.type !== column.type;
+        const recastDefault = needsArrayDefaultRecast && !defaultChanged;
+        if ((defaultChanged && column.default == null) || needsArrayDefaultRecast) {
             sql.push(`alter table ${table.getQuotedName()} alter column ${this.quote(column.name)} drop default`);
         }
-        if (changedProperties.has('type') || changedProperties.has('collation')) {
+        if (typeChanged) {
             let type = column.type + (column.generated ? ` generated always as ${column.generated}` : '');
             if (column.nativeEnumName) {
                 const parts = type.split('.');
@@ -508,7 +519,7 @@ export class SchemaHelper {
             const collateClause = column.collation ? ` ${this.getCollateSQL(column.collation)}` : '';
             sql.push(`alter table ${table.getQuotedName()} alter column ${this.quote(column.name)} type ${type + collateClause + this.castColumn(column.name, type)}`);
         }
-        if (changedProperties.has('default') && column.default != null) {
+        if ((defaultChanged && column.default != null) || recastDefault) {
             sql.push(`alter table ${table.getQuotedName()} alter column ${this.quote(column.name)} set default ${column.default}`);
         }
         if (changedProperties.has('nullable')) {