From 6020b4727dc07bc4a6765080d7e64586d063b479 Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Fri, 31 Jul 2020 14:42:11 -0700 Subject: [PATCH] Rename MigrationOperation.For methods to CreateFrom Part of #20409 --- .../Migrations/Internal/MigrationsModelDiffer.cs | 10 +++++----- .../Operations/AddCheckConstraintOperation.cs | 4 ++-- .../Operations/AddForeignKeyOperation.cs | 4 ++-- .../Operations/AddPrimaryKeyOperation.cs | 4 ++-- .../Operations/AddUniqueConstraintOperation.cs | 4 ++-- .../Migrations/Operations/CreateIndexOperation.cs | 4 ++-- .../Migrations/SqlServerMigrationsSqlGenerator.cs | 2 +- .../Migrations/SqliteMigrationsSqlGenerator.cs | 14 +++++++------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs b/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs index 9bd8de2b01e..11a1fe035be 100644 --- a/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs +++ b/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs @@ -1177,11 +1177,11 @@ protected virtual IEnumerable Add([NotNull] IUniqueConstrain { if (target.GetIsPrimaryKey()) { - yield return AddPrimaryKeyOperation.For((IPrimaryKeyConstraint)target); + yield return AddPrimaryKeyOperation.CreateFrom((IPrimaryKeyConstraint)target); } else { - yield return AddUniqueConstraintOperation.For(target); + yield return AddUniqueConstraintOperation.CreateFrom(target); } } @@ -1276,7 +1276,7 @@ protected virtual IEnumerable Add([NotNull] IForeignKeyConst yield break; } - var operation = AddForeignKeyOperation.For(target); + var operation = AddForeignKeyOperation.CreateFrom(target); var createTableOperation = diffContext.FindCreate(targetTable); if (createTableOperation != null) @@ -1383,7 +1383,7 @@ protected virtual IEnumerable Add( [NotNull] ITableIndex target, [NotNull] DiffContext diffContext) { - yield return CreateIndexOperation.For(target); + yield return CreateIndexOperation.CreateFrom(target); } /// @@ -1450,7 +1450,7 @@ protected virtual IEnumerable Diff( /// protected virtual IEnumerable Add([NotNull] ICheckConstraint target, [NotNull] DiffContext diffContext) { - yield return AddCheckConstraintOperation.For(target); + yield return AddCheckConstraintOperation.CreateFrom(target); } /// diff --git a/src/EFCore.Relational/Migrations/Operations/AddCheckConstraintOperation.cs b/src/EFCore.Relational/Migrations/Operations/AddCheckConstraintOperation.cs index cfc8bfba3d1..e66a57c83f8 100644 --- a/src/EFCore.Relational/Migrations/Operations/AddCheckConstraintOperation.cs +++ b/src/EFCore.Relational/Migrations/Operations/AddCheckConstraintOperation.cs @@ -38,11 +38,11 @@ public class AddCheckConstraintOperation : MigrationOperation, ITableMigrationOp public virtual string Sql { get; [param: NotNull] set; } /// - /// Creates a new for the specified check constraint. + /// Creates a new from the specified check constraint. /// /// The check constraint. /// The operation. - public static AddCheckConstraintOperation For([NotNull] ICheckConstraint checkConstraint) + public static AddCheckConstraintOperation CreateFrom([NotNull] ICheckConstraint checkConstraint) { Check.NotNull(checkConstraint, nameof(checkConstraint)); diff --git a/src/EFCore.Relational/Migrations/Operations/AddForeignKeyOperation.cs b/src/EFCore.Relational/Migrations/Operations/AddForeignKeyOperation.cs index 208bc2a668e..d4c60d7bd52 100644 --- a/src/EFCore.Relational/Migrations/Operations/AddForeignKeyOperation.cs +++ b/src/EFCore.Relational/Migrations/Operations/AddForeignKeyOperation.cs @@ -62,11 +62,11 @@ public class AddForeignKeyOperation : MigrationOperation, ITableMigrationOperati public virtual ReferentialAction OnDelete { get; set; } /// - /// Creates a new for the specified foreign key. + /// Creates a new from the specified foreign key. /// /// The foreign key. /// The operation. - public static AddForeignKeyOperation For([NotNull] IForeignKeyConstraint foreignKey) + public static AddForeignKeyOperation CreateFrom([NotNull] IForeignKeyConstraint foreignKey) { Check.NotNull(foreignKey, nameof(foreignKey)); diff --git a/src/EFCore.Relational/Migrations/Operations/AddPrimaryKeyOperation.cs b/src/EFCore.Relational/Migrations/Operations/AddPrimaryKeyOperation.cs index 14be552a29a..dfb58c2a9ce 100644 --- a/src/EFCore.Relational/Migrations/Operations/AddPrimaryKeyOperation.cs +++ b/src/EFCore.Relational/Migrations/Operations/AddPrimaryKeyOperation.cs @@ -36,11 +36,11 @@ public class AddPrimaryKeyOperation : MigrationOperation, ITableMigrationOperati public virtual string[] Columns { get; [param: NotNull] set; } /// - /// Creates a new for the specified primary key. + /// Creates a new from the specified primary key. /// /// The primary key. /// The operation. - public static AddPrimaryKeyOperation For([NotNull] IPrimaryKeyConstraint primaryKey) + public static AddPrimaryKeyOperation CreateFrom([NotNull] IPrimaryKeyConstraint primaryKey) { Check.NotNull(primaryKey, nameof(primaryKey)); diff --git a/src/EFCore.Relational/Migrations/Operations/AddUniqueConstraintOperation.cs b/src/EFCore.Relational/Migrations/Operations/AddUniqueConstraintOperation.cs index 85f00f0a805..2be8d188854 100644 --- a/src/EFCore.Relational/Migrations/Operations/AddUniqueConstraintOperation.cs +++ b/src/EFCore.Relational/Migrations/Operations/AddUniqueConstraintOperation.cs @@ -36,11 +36,11 @@ public class AddUniqueConstraintOperation : MigrationOperation, ITableMigrationO public virtual string[] Columns { get; [param: NotNull] set; } /// - /// Creates a new for the specified unique constraint. + /// Creates a new from the specified unique constraint. /// /// The unique constraint. /// The operation. - public static AddUniqueConstraintOperation For([NotNull] IUniqueConstraint uniqueConstraint) + public static AddUniqueConstraintOperation CreateFrom([NotNull] IUniqueConstraint uniqueConstraint) { Check.NotNull(uniqueConstraint, nameof(uniqueConstraint)); diff --git a/src/EFCore.Relational/Migrations/Operations/CreateIndexOperation.cs b/src/EFCore.Relational/Migrations/Operations/CreateIndexOperation.cs index e8c500f42fe..5eac851ab79 100644 --- a/src/EFCore.Relational/Migrations/Operations/CreateIndexOperation.cs +++ b/src/EFCore.Relational/Migrations/Operations/CreateIndexOperation.cs @@ -46,11 +46,11 @@ public class CreateIndexOperation : MigrationOperation, ITableMigrationOperation public virtual string Filter { get; [param: CanBeNull] set; } /// - /// Creates a new for the specified index. + /// Creates a new from the specified index. /// /// The index. /// The operation. - public static CreateIndexOperation For([NotNull] ITableIndex index) + public static CreateIndexOperation CreateFrom([NotNull] ITableIndex index) { Check.NotNull(index, nameof(index)); diff --git a/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs b/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs index 3c541735837..1568398d1ea 100644 --- a/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs +++ b/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs @@ -1739,7 +1739,7 @@ protected virtual void CreateIndexes( foreach (var index in indexes) { - Generate(CreateIndexOperation.For(index), index.Table.Model.Model, builder, terminate: false); + Generate(CreateIndexOperation.CreateFrom(index), index.Table.Model.Model, builder, terminate: false); builder.AppendLine(Dependencies.SqlGenerationHelper.StatementTerminator); } } diff --git a/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs b/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs index 373b817207d..2d1b4a0c6c1 100644 --- a/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs +++ b/src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs @@ -163,7 +163,7 @@ private IReadOnlyList RewriteOperations( Name = renameIndexOperation.Name }); - operations.Add(CreateIndexOperation.For(index)); + operations.Add(CreateIndexOperation.CreateFrom(index)); } else { @@ -299,7 +299,7 @@ private IReadOnlyList RewriteOperations( var primaryKey = table.PrimaryKey; if (primaryKey != null) { - createTableOperation.PrimaryKey = AddPrimaryKeyOperation.For(primaryKey); + createTableOperation.PrimaryKey = AddPrimaryKeyOperation.CreateFrom(primaryKey); } foreach (var column in table.Columns) @@ -325,17 +325,17 @@ private IReadOnlyList RewriteOperations( foreach (var foreignKey in table.ForeignKeyConstraints) { - createTableOperation.ForeignKeys.Add(AddForeignKeyOperation.For(foreignKey)); + createTableOperation.ForeignKeys.Add(AddForeignKeyOperation.CreateFrom(foreignKey)); } foreach (var uniqueConstraint in table.UniqueConstraints.Where(c => !c.GetIsPrimaryKey())) { - createTableOperation.UniqueConstraints.Add(AddUniqueConstraintOperation.For(uniqueConstraint)); + createTableOperation.UniqueConstraints.Add(AddUniqueConstraintOperation.CreateFrom(uniqueConstraint)); } foreach (var checkConstraint in table.CheckConstraints) { - createTableOperation.CheckConstraints.Add(AddCheckConstraintOperation.For(checkConstraint)); + createTableOperation.CheckConstraints.Add(AddCheckConstraintOperation.CreateFrom(checkConstraint)); } createTableOperation.AddAnnotations(table.GetAnnotations()); @@ -345,7 +345,7 @@ private IReadOnlyList RewriteOperations( { if (index.IsUnique && rebuild.Value.CreateIndexesDeferred.Contains(index.Name)) { - var createIndexOperation = CreateIndexOperation.For(index); + var createIndexOperation = CreateIndexOperation.CreateFrom(index); createIndexOperation.Table = createTableOperation.Name; operations.Add(createIndexOperation); } @@ -472,7 +472,7 @@ private IReadOnlyList RewriteOperations( foreach (var index in indexesToRebuild) { - operations.Add(CreateIndexOperation.For(index)); + operations.Add(CreateIndexOperation.CreateFrom(index)); } return operations;