@mikro-orm/sql 7.1.9-dev.19 → 7.1.9-dev.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.9-dev.19",
+  "version": "7.1.9-dev.20",
   "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.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.9-dev.19"
+    "@mikro-orm/core": "7.1.9-dev.20"
   },
   "engines": {
     "node": ">= 22.17.0"

package/schema/SchemaComparator.js

@@ -920,7 +920,9 @@ export class SchemaComparator {
                 // Remove AS keyword (optional in SQL, MySQL may add/remove it)
                 .replace(/\bas\b/gi, '')
                 // Remove remaining special chars, parentheses, type casts, asterisks, and normalize whitespace
-                .replace(/[()\n[\]*]|::\w+| +/g, '')
+                // tabs and CRs included — the schema generator trims every line before executing the DDL,
+                // so indentation and CRLF endings can never come back from introspection
+                .replace(/[()\n\r\t[\]*]|::\w+| +/g, '')
                 .replace(/anyarray\[(.*)]/gi, '$1')
                 .toLowerCase()
                 // PostgreSQL adds default aliases to aggregate functions (e.g., count(*) AS count)

package/schema/SchemaHelper.d.ts

@@ -4,7 +4,13 @@ import type { AbstractSqlPlatform } from '../AbstractSqlPlatform.js';
 import type { CheckDef, Column, ForeignKey, IndexDef, Table, TableDifference, SqlTriggerDef, SqlRoutineDef } from '../typings.js';
 import type { DatabaseSchema } from './DatabaseSchema.js';
 import type { DatabaseTable } from './DatabaseTable.js';
-/** Flattens `;\n` boundaries so the schema-generator's statement splitter doesn't break the routine DDL apart. Other whitespace is preserved. */
+/**
+ * Flattens `;\n` boundaries and drops blank lines so the schema-generator's statement splitter
+ * doesn't break the routine or trigger DDL apart — it treats both as statement/group separators.
+ * Blank lines go first, otherwise a `;` followed by one would keep its newline. Like
+ * `normalizeViewDefinition`, this is not string-literal aware, so a blank line inside a multi-line
+ * literal is dropped too. Other whitespace is preserved.
+ */
 export declare function stripStatementNewlines(body: string): string;
 /**
  * Strips SQL line comments and blank lines from a view definition. Comments are dropped by the

package/schema/SchemaHelper.js

@@ -1,7 +1,17 @@
 import { isRaw, Utils, } from '@mikro-orm/core';
-/** Flattens `;\n` boundaries so the schema-generator's statement splitter doesn't break the routine DDL apart. Other whitespace is preserved. */
+/**
+ * Flattens `;\n` boundaries and drops blank lines so the schema-generator's statement splitter
+ * doesn't break the routine or trigger DDL apart — it treats both as statement/group separators.
+ * Blank lines go first, otherwise a `;` followed by one would keep its newline. Like
+ * `normalizeViewDefinition`, this is not string-literal aware, so a blank line inside a multi-line
+ * literal is dropped too. Other whitespace is preserved.
+ */
 export function stripStatementNewlines(body) {
-    return body.replace(/;[\t ]*\r?\n/g, '; ');
+    return body
+        .split('\n')
+        .filter(line => line.trim() !== '')
+        .join('\n')
+        .replace(/;[\t ]*\r?\n/g, '; ');
 }
 /**
  * Strips SQL line comments and blank lines from a view definition. Comments are dropped by the