Skip to content

Handle multiline statements in migrations #18478

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
AndyButland merged 7 commits into from
Mar 4, 2025
Merged

Handle multiline statements in migrations #18478

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a05afe6
Handle multiline statements in migrations
AndyButland Feb 26, 2025
3f1f6ad
Merge branch 'v13/dev' into v13/bugfix/handle-multi-line-statements-i…
Migaroez Mar 4, 2025
f4d1fff
Merge branch 'v13/dev' into v13/bugfix/handle-multi-line-statements-i…
AndyButland Mar 4, 2025
c36524c
Fixed failing unit tests and incorrect obsoletion.
AndyButland Mar 4, 2025
8194d44
Merge branch 'v13/bugfix/handle-multi-line-statements-in-migrations' …
AndyButland Mar 4, 2025
576dc4d
Fixed failing integration tests.
AndyButland Mar 4, 2025
fdcf1c6
Applied suggestion from code review.
AndyButland Mar 4, 2025
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
1 change: 1 addition & 0 deletions src/Umbraco.Infrastructure/Migrations/MigrationExpressionBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public virtual void Execute()
else
{
stmtBuilder.Append(line);
stmtBuilder.Append(Environment.NewLine);
Comment thread
AndyButland marked this conversation as resolved.
Outdated
}
}

Expand Down
1 change: 0 additions & 1 deletion src/Umbraco.Infrastructure/Migrations/MigrationPlanExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ public MigrationPlanExecutor(
/// <para>Each migration in the plan, may or may not run in a scope depending on the type of plan.</para>
/// <para>A plan can complete partially, the changes of each completed migration will be saved.</para>
/// </remarks>
[Obsolete("This will return an ExecutedMigrationPlan in V13")]
public ExecutedMigrationPlan ExecutePlan(MigrationPlan plan, string fromState)
{
plan.Validate();
Expand Down
9 changes: 4 additions & 5 deletions ...gration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using Umbraco.Cms.Tests.Common.TestHelpers;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.Testing;
using Umbraco.Extensions;

namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.SyntaxProvider;

Expand Down Expand Up @@ -137,7 +136,7 @@ public void CreateIndexBuilder_SqlServer_NonClustered_CreatesNonClusteredIndex()
.Do();

Assert.AreEqual(1, db.Operations.Count);
Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql.Trim());
}

[Test]
Expand All @@ -152,7 +151,7 @@ public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex()
.Do();

Assert.AreEqual(1, db.Operations.Count);
Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql.Trim());
}

[Test]
Expand All @@ -167,7 +166,7 @@ public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex_M
.Do();

Assert.AreEqual(1, db.Operations.Count);
Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_AB] ON [TheTable] ([A],[B])", db.Operations[0].Sql);
Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_AB] ON [TheTable] ([A],[B])", db.Operations[0].Sql.Trim());
}

[Test]
Expand All @@ -182,7 +181,7 @@ public void CreateIndexBuilder_SqlServer_Clustered_CreatesClusteredIndex()
.Do();

Assert.AreEqual(1, db.Operations.Count);
Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql.Trim());
}

private static IndexDefinition CreateIndexDefinition() =>
Expand Down
6 changes: 3 additions & 3 deletions tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void Drop_Foreign_Key()
// Assert
Assert.That(database.Operations.Count, Is.EqualTo(1));
Assert.That(
database.Operations[0].Sql,
database.Operations[0].Sql.Trim(),
Is.EqualTo("ALTER TABLE [umbracoUser2app] DROP CONSTRAINT [FK_umbracoUser2app_umbracoUser_id]"));
}

Expand All @@ -68,7 +68,7 @@ public void CreateColumn()

Assert.That(database.Operations.Count, Is.EqualTo(1));
Assert.That(
database.Operations[0].Sql,
database.Operations[0].Sql.Trim(),
Is.EqualTo("ALTER TABLE [bar] ADD [foo] UniqueIdentifier NOT NULL"));
}

Expand Down Expand Up @@ -97,7 +97,7 @@ public void AlterColumn()

Assert.That(database.Operations.Count, Is.EqualTo(1));
Assert.That(
database.Operations[0].Sql,
database.Operations[0].Sql.Trim(),
Is.EqualTo("ALTER TABLE [bar] ALTER COLUMN [foo] UniqueIdentifier NOT NULL"));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void CanExecute()

Assert.AreEqual("VERSION.33", state);
Assert.AreEqual(1, database.Operations.Count);
Assert.AreEqual("DROP TABLE [umbracoRedirectUrl]", database.Operations[0].Sql);
Assert.AreEqual("DROP TABLE [umbracoRedirectUrl]", database.Operations[0].Sql.Trim());
}

[Test]
Expand Down