@mikro-orm/sql 7.1.9-dev.11 → 7.1.9-dev.12

package/dialects/mysql/MySqlSchemaHelper.js

@@ -322,7 +322,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
         const ret = [];
         for (const event of trigger.events) {
             const name = trigger.events.length > 1 ? `${trigger.name}_${event}` : trigger.name;
-            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ROW begin ${trigger.body}; end`);
+            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ROW begin ${this.normalizeTriggerBody(trigger.body)} end`);
         }
         return ret.join(';\n');
     }

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -513,7 +513,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         const when = trigger.when ? `\n  when (${trigger.when})` : '';
         const fnName = this.getSchemaQualifiedTriggerFnName(table, trigger);
         const triggerName = this.platform.quoteIdentifier(trigger.name);
-        const fnSql = `create or replace function ${fnName}() returns trigger as $$ begin ${trigger.body}; end; $$ language plpgsql`;
+        const fnSql = `create or replace function ${fnName}() returns trigger as $$ begin ${this.normalizeTriggerBody(trigger.body)} end; $$ language plpgsql`;
         const triggerSql = `create trigger ${triggerName} ${timing} ${events} on ${table.getQuotedName()} for each ${forEach}${when} execute function ${fnName}()`;
         return `${fnSql};\n${triggerSql}`;
     }

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -561,7 +561,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         for (const event of trigger.events) {
             const name = trigger.events.length > 1 ? `${trigger.name}_${event}` : trigger.name;
             const when = trigger.when ? `\n  when ${trigger.when}` : '';
-            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ${forEach}${when} begin ${trigger.body}; end`);
+            ret.push(`create trigger ${this.quote(name)} ${timing} ${event.toUpperCase()} on ${table.getQuotedName()} for each ${forEach}${when} begin ${this.normalizeTriggerBody(trigger.body)} end`);
         }
         return ret.join(';\n');
     }

package/package.json

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

package/schema/SchemaHelper.d.ts

@@ -176,6 +176,8 @@ export declare abstract class SchemaHelper {
     createRoutine(_routine: SqlRoutineDef): string;
     dropRoutine(_routine: SqlRoutineDef): string;
     getAllRoutines(_connection: AbstractSqlConnection, _schemas?: string[]): Promise<SqlRoutineDef[]>;
+    /** Flattens internal `;\n` so the statement splitter doesn't tear the DDL, and ensures exactly one trailing `;` for the enclosing `begin ... end` block. */
+    protected normalizeTriggerBody(body: string): string;
     /** Wraps the body in `BEGIN ... END` if not already, and flattens internal `;\n` so the schema-generator's statement splitter doesn't tear the DDL. */
     protected wrapRoutineBody(body: string): string;
     protected stripRoutineBody(body: string): string;

package/schema/SchemaHelper.js

@@ -861,7 +861,7 @@ export class SchemaHelper {
         const events = trigger.events.map(e => e.toUpperCase()).join(' OR ');
         const forEach = trigger.forEach === 'statement' ? 'STATEMENT' : 'ROW';
         const when = trigger.when ? ` when (${trigger.when})` : '';
-        return `create trigger ${this.quote(trigger.name)} ${timing} ${events} on ${table.getQuotedName()} for each ${forEach}${when} begin ${trigger.body}; end`;
+        return `create trigger ${this.quote(trigger.name)} ${timing} ${events} on ${table.getQuotedName()} for each ${forEach}${when} begin ${this.normalizeTriggerBody(trigger.body)} end`;
     }
     /**
      * Generates SQL to drop a database trigger from a table.
@@ -885,6 +885,11 @@ export class SchemaHelper {
     async getAllRoutines(_connection, _schemas = []) {
         return [];
     }
+    /** Flattens internal `;\n` so the statement splitter doesn't tear the DDL, and ensures exactly one trailing `;` for the enclosing `begin ... end` block. */
+    normalizeTriggerBody(body) {
+        const trimmed = stripStatementNewlines(body).trim();
+        return /;\s*$/.test(trimmed) ? trimmed : `${trimmed};`;
+    }
     /** Wraps the body in `BEGIN ... END` if not already, and flattens internal `;\n` so the schema-generator's statement splitter doesn't tear the DDL. */
     wrapRoutineBody(body) {
         const trimmed = stripStatementNewlines(body).trim();