Skip to content

Preserve batch terminators in migration scripts for SQL operations with GO separators #37810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndriySvyryd merged 8 commits into from
Feb 27, 2026
Merged

Preserve batch terminators in migration scripts for SQL operations with GO separators #37810

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1955a6a
Initial plan
Copilot Feb 27, 2026
5ce419b
Fix migration script to emit batch terminators between commands withi…
Copilot Feb 27, 2026
5f294ad
Keep BEGIN TRANSACTION and COMMIT in the same batch as commands
Copilot Feb 27, 2026
a5867c8
Revert Migrator.cs change; fix GO handling in SqlServerMigrationsSqlG…
Copilot Feb 27, 2026
687aae2
Add test for SqlOperation with suppressTransaction and multiple GO se…
Copilot Feb 27, 2026
e314e9b
Preserve GO N count in script mode; update test to use GO 2
Copilot Feb 27, 2026
64102e8
Simplify: skip GO parsing in script mode, pass SQL through as-is via …
Copilot Feb 27, 2026
f17adbd
Append line end only if SQL doesn't end with one; update baselines fo…
Copilot Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/EFCore.Relational/Migrations/Internal/Migrator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,8 @@ private static void GenerateSqlScript(
if (!transactionStarted && !command.TransactionSuppressed)
{
builder
.AppendLine(sqlGenerationHelper.StartTransactionStatement);
.AppendLine(sqlGenerationHelper.StartTransactionStatement)
.Append(sqlGenerationHelper.BatchTerminator);
transactionStarted = true;
}

Expand Down Expand Up @@ -674,14 +675,7 @@ private static void GenerateSqlScript(
builder.Append(command.CommandText);
}

if (!transactionStarted)
{
builder.Append(sqlGenerationHelper.BatchTerminator);
}
else
Comment thread
AndriySvyryd marked this conversation as resolved.
Resolved
{
builder.Append(Environment.NewLine);
}
builder.Append(sqlGenerationHelper.BatchTerminator);
}

if (transactionStarted)
Expand Down
75 changes: 75 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsInfrastructureSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,32 @@ CONSTRAINT [PK___EFMigrationsHistory] PRIMARY KEY ([MigrationId])
GO

BEGIN TRANSACTION;
GO

CREATE TABLE [Table1] (
[Id] int NOT NULL,
[Foo] int NOT NULL,
[Description] nvarchar(max) NOT NULL,
CONSTRAINT [PK_Table1] PRIMARY KEY ([Id])
);
GO

INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000001_Migration1', N'7.0.0-test');
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

EXEC sp_rename N'[Table1].[Foo]', N'Bar', 'COLUMN';
GO

INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000002_Migration2', N'7.0.0-test');
GO

COMMIT;
GO
Expand Down Expand Up @@ -155,29 +163,39 @@ INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
GO

BEGIN TRANSACTION;
GO

INSERT INTO Table1 (Id, Bar, Description) VALUES (-1, 3, 'Value With

Empty Lines')
GO

INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000005_Migration5', N'7.0.0-test');
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

INSERT INTO Table1 (Id, Bar, Description) VALUES (-2, 4, 'GO
Value With

Empty Lines')
GO

INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000006_Migration6', N'7.0.0-test');
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

INSERT INTO Table1 (Id, Bar, Description) VALUES (-3, 5, '--Start
GO
Value With
Expand All @@ -187,62 +205,87 @@ Value With
Empty Lines;
GO
')
GO

INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000007_Migration7', N'7.0.0-test');
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000007_Migration7';
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000006_Migration6';
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000005_Migration5';
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000004_Migration4';
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000003_Migration3';
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

EXEC sp_rename N'[Table1].[Bar]', N'Foo', 'COLUMN';
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000002_Migration2';
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

DROP TABLE [Table1];
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000001_Migration1';
GO

COMMIT;
GO
Expand Down Expand Up @@ -411,19 +454,27 @@ public override async Task Can_generate_one_up_and_down_script()
Assert.Equal(
"""
BEGIN TRANSACTION;
GO
Comment thread
AndriySvyryd marked this conversation as resolved.
Resolved

EXEC sp_rename N'[Table1].[Foo]', N'Bar', 'COLUMN';
GO

INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000002_Migration2', N'7.0.0-test');
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

EXEC sp_rename N'[Table1].[Bar]', N'Foo', 'COLUMN';
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000002_Migration2';
GO

COMMIT;
GO
Expand All @@ -441,19 +492,27 @@ public override async Task Can_generate_up_and_down_script_using_names()
Assert.Equal(
"""
BEGIN TRANSACTION;
GO

EXEC sp_rename N'[Table1].[Foo]', N'Bar', 'COLUMN';
GO

INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000002_Migration2', N'7.0.0-test');
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

EXEC sp_rename N'[Table1].[Bar]', N'Foo', 'COLUMN';
GO

DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000002_Migration2';
GO

COMMIT;
GO
Expand Down Expand Up @@ -481,6 +540,8 @@ CONSTRAINT [PK___EFMigrationsHistory] PRIMARY KEY ([MigrationId])
GO

BEGIN TRANSACTION;
GO

IF NOT EXISTS (
SELECT * FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000001_Migration1'
Expand All @@ -493,6 +554,7 @@ [Description] nvarchar(max) NOT NULL,
CONSTRAINT [PK_Table1] PRIMARY KEY ([Id])
);
END;
GO

IF NOT EXISTS (
SELECT * FROM [__EFMigrationsHistory]
Expand All @@ -502,18 +564,22 @@ IF NOT EXISTS (
INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000001_Migration1', N'7.0.0-test');
END;
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

IF NOT EXISTS (
SELECT * FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000002_Migration2'
)
BEGIN
EXEC sp_rename N'[Table1].[Foo]', N'Bar', 'COLUMN';
END;
GO

IF NOT EXISTS (
SELECT * FROM [__EFMigrationsHistory]
Expand All @@ -523,18 +589,22 @@ IF NOT EXISTS (
INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
VALUES (N'00000000000002_Migration2', N'7.0.0-test');
END;
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

IF EXISTS (
SELECT * FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000002_Migration2'
)
BEGIN
EXEC sp_rename N'[Table1].[Bar]', N'Foo', 'COLUMN';
END;
GO

IF EXISTS (
SELECT * FROM [__EFMigrationsHistory]
Expand All @@ -544,18 +614,22 @@ IF EXISTS (
DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000002_Migration2';
END;
GO

COMMIT;
GO

BEGIN TRANSACTION;
GO

IF EXISTS (
SELECT * FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000001_Migration1'
)
BEGIN
DROP TABLE [Table1];
END;
GO

IF EXISTS (
SELECT * FROM [__EFMigrationsHistory]
Expand All @@ -565,6 +639,7 @@ IF EXISTS (
DELETE FROM [__EFMigrationsHistory]
WHERE [MigrationId] = N'00000000000001_Migration1';
END;
GO

COMMIT;
GO
Expand Down
Loading
Loading