Skip to content
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

Jump to bottom

[release/5.0-preview8] SQLite Migrations: Test table rebuilds #21783

Merged
merged 1 commit into from
Jul 25, 2020
Merged

[release/5.0-preview8] SQLite Migrations: Test table rebuilds #21783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
172 changes: 62 additions & 110 deletions src/EFCore.Sqlite.Core/Migrations/SqliteMigrationsSqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
case DropColumnOperation dropColumnOperation:
{
var rebuild = rebuilds.GetOrAddNew((dropColumnOperation.Table, dropColumnOperation.Schema));
rebuild.OldColumns.Remove(dropColumnOperation.Name);
rebuild.OperationsToReplace.Add(dropColumnOperation);
rebuild.DropColumnsDeferred.Add(dropColumnOperation.Name);

Expand Down Expand Up @@ -128,13 +127,7 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
{
var rebuild = rebuilds.GetOrAddNew((alterColumnOperation.Table, alterColumnOperation.Schema));
rebuild.OperationsToReplace.Add(alterColumnOperation);

if (alterColumnOperation.OldColumn.IsNullable && !alterColumnOperation.IsNullable)
{
var overrides = rebuild.NewlyRequiredColumns.GetOrAddNew(alterColumnOperation.Name);
overrides.DefaultValueSql = alterColumnOperation.DefaultValueSql;
overrides.DefaultValue = alterColumnOperation.DefaultValue;
}
rebuild.AlterColumnsDeferred.Add(alterColumnOperation.Name, alterColumnOperation);

operations.Add(alterColumnOperation);

Expand All @@ -144,9 +137,11 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
case CreateIndexOperation createIndexOperation:
{
if (rebuilds.TryGetValue((createIndexOperation.Table, createIndexOperation.Schema), out var rebuild)
&& rebuild.AddColumnsDeferred.Intersect(createIndexOperation.Columns).Any())
&& (rebuild.AddColumnsDeferred.Keys.Intersect(createIndexOperation.Columns).Any()
|| rebuild.RenameColumnsDeferred.Keys.Intersect(createIndexOperation.Columns).Any()))
{
rebuild.OperationsToReplace.Add(createIndexOperation);
rebuild.CreateIndexesDeferred.Add(createIndexOperation.Name);
}

operations.Add(createIndexOperation);
Expand All @@ -168,14 +163,7 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
Name = renameIndexOperation.Name
});

var createOperation = CreateIndexOperation.For(index);
operations.Add(createOperation);

if (rebuilds.TryGetValue((renameIndexOperation.Table, renameIndexOperation.Schema), out var rebuild)
&& rebuild.AddColumnsDeferred.Intersect(index.Columns.Select(c => c.Name)).Any())
{
rebuild.OperationsToReplace.Add(createOperation);
}
operations.Add(CreateIndexOperation.For(index));
}
else
{
Expand All @@ -190,9 +178,8 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
if (rebuilds.TryGetValue((addColumnOperation.Table, addColumnOperation.Schema), out var rebuild)
&& rebuild.DropColumnsDeferred.Contains(addColumnOperation.Name))
{
rebuild.OldColumns.Add(addColumnOperation.Name, null);
rebuild.OperationsToReplace.Add(addColumnOperation);
rebuild.AddColumnsDeferred.Add(addColumnOperation.Name);
rebuild.AddColumnsDeferred.Add(addColumnOperation.Name, addColumnOperation);
}
else if (addColumnOperation.Comment != null)
{
Expand All @@ -208,26 +195,11 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
{
if (rebuilds.TryGetValue((renameColumnOperation.Table, renameColumnOperation.Schema), out var rebuild))
{
if (rebuild.AddColumnsDeferred.Contains(renameColumnOperation.Name))
if (rebuild.DropColumnsDeferred.Contains(renameColumnOperation.NewName))
{
rebuild.OldColumns.Add(
renameColumnOperation.NewName,
rebuild.OldColumns.Remove(renameColumnOperation.Name, out var oldName)
? oldName
: renameColumnOperation.Name);
rebuild.OperationsToReplace.Add(renameColumnOperation);
rebuild.AddColumnsDeferred.Add(renameColumnOperation.NewName);
}
else if (rebuild.DropColumnsDeferred.Contains(renameColumnOperation.NewName))
{
rebuild.OldColumns.Add(
renameColumnOperation.NewName,
rebuild.OldColumns.Remove(renameColumnOperation.Name, out var oldName)
? oldName
: renameColumnOperation.Name);
rebuild.OperationsToReplace.Add(renameColumnOperation);
rebuild.AddColumnsDeferred.Add(renameColumnOperation.NewName);
rebuild.DropColumnsDeferred.Add(renameColumnOperation.Name);
rebuild.RenameColumnsDeferred.Add(renameColumnOperation.NewName, renameColumnOperation);
}
}

Expand All @@ -254,6 +226,7 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
case DropIndexOperation _:
case DropSchemaOperation _:
case DropSequenceOperation _:
case DropTableOperation _:
case EnsureSchemaOperation _:
case RenameSequenceOperation _:
case RestartSequenceOperation _:
Expand All @@ -263,21 +236,6 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
break;
}

case DropTableOperation dropTableOperation:
{
if (rebuilds.Remove((dropTableOperation.Name, dropTableOperation.Schema), out var rebuild))
{
foreach (var operationToReplace in rebuild.OperationsToReplace)
{
operations.Remove(operationToReplace);
}
}

operations.Add(operation);

break;
}

case DeleteDataOperation _:
case InsertDataOperation _:
case UpdateDataOperation _:
Expand Down Expand Up @@ -307,12 +265,15 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
}
}

var skippedRebuilds = new List<(string Table, string Schema)>();
var indexesToRebuild = new List<ITableIndex>();
foreach (var rebuild in rebuilds)
{
var table = model?.GetRelationalModel().FindTable(rebuild.Key.Table, rebuild.Key.Schema);
if (table == null)
{
skippedRebuilds.Add(rebuild.Key);

continue;
}

Expand Down Expand Up @@ -348,7 +309,10 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
Name = column.Name,
ColumnType = column.StoreType,
IsNullable = column.IsNullable,
DefaultValue = column.DefaultValue,
DefaultValue = rebuild.Value.AddColumnsDeferred.TryGetValue(column.Name, out var originalOperation)
&& !originalOperation.IsNullable
? originalOperation.DefaultValue
: column.DefaultValue,
DefaultValueSql = column.DefaultValueSql,
ComputedColumnSql = column.ComputedColumnSql,
IsStored = column.IsStored,
Expand Down Expand Up @@ -377,18 +341,27 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
createTableOperation.AddAnnotations(table.GetAnnotations());
operations.Add(createTableOperation);

indexesToRebuild.AddRange(table.Indexes);
foreach (var index in table.Indexes)
{
if (index.IsUnique && rebuild.Value.CreateIndexesDeferred.Contains(index.Name))
{
var createIndexOperation = CreateIndexOperation.For(index);
createIndexOperation.Table = createTableOperation.Name;
operations.Add(createIndexOperation);
}
else
{
indexesToRebuild.Add(index);
}
}

var intoBuilder = new StringBuilder();
var selectBuilder = new StringBuilder();
var first = true;
foreach (var column in table.Columns)
{
var oldColumnName = rebuild.Value.OldColumns.TryGetValue(column.Name, out var value)
? value
: column.Name;
if (column.ComputedColumnSql != null
|| oldColumnName == null)
|| rebuild.Value.AddColumnsDeferred.ContainsKey(column.Name))
{
continue;
}
Expand All @@ -405,54 +378,33 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(

intoBuilder.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(column.Name));

var isNewlyRequired = rebuild.Value.NewlyRequiredColumns.TryGetValue(column.Name, out var overrides);
if (isNewlyRequired)
var defaultValue = rebuild.Value.AlterColumnsDeferred.TryGetValue(column.Name, out var alterColumnOperation)
&& !alterColumnOperation.IsNullable
&& alterColumnOperation.OldColumn.IsNullable
? alterColumnOperation.DefaultValue
: null;
if (defaultValue != null)
{
selectBuilder.Append("IFNULL(");
}

selectBuilder.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(oldColumnName));
selectBuilder.Append(
Dependencies.SqlGenerationHelper.DelimitIdentifier(
rebuild.Value.RenameColumnsDeferred.TryGetValue(column.Name, out var renameColumnOperation)
? renameColumnOperation.Name
: column.Name));

if (isNewlyRequired)
if (defaultValue != null)
{
selectBuilder.Append(", ");

var defaultValueSql = overrides.DefaultValueSql
?? column.DefaultValueSql;
if (defaultValueSql != null)
{
selectBuilder.Append(defaultValueSql);
}
else
{
var defaultValue = overrides.DefaultValue
?? column.DefaultValue;
if (defaultValue == null)
{
var propertyMapping = column.PropertyMappings.First();
var property = propertyMapping.Property;
var typeMapping = propertyMapping.TypeMapping;
var clrType = ((property.GetValueConverter() ?? (property.FindRelationalTypeMapping() ?? typeMapping)?.Converter)?.ProviderClrType ?? typeMapping.ClrType).UnwrapNullableType();

defaultValue = clrType == typeof(string)
? string.Empty
: clrType.IsArray
? Array.CreateInstance(clrType.GetElementType(), 0)
: clrType.UnwrapNullableType().GetDefaultValue();
}

var defaultValueTypeMapping = column.StoreType != null
? Dependencies.TypeMappingSource.FindMapping(defaultValue.GetType(), column.StoreType)
: null;
if (defaultValueTypeMapping == null)
{
defaultValueTypeMapping = Dependencies.TypeMappingSource.GetMappingForValue(defaultValue);
}

selectBuilder.Append(defaultValueTypeMapping.GenerateSqlLiteral(defaultValue));
}

selectBuilder.Append(")");
var defaultValueTypeMapping = (column.StoreType == null
? null
: Dependencies.TypeMappingSource.FindMapping(defaultValue.GetType(), column.StoreType))
?? Dependencies.TypeMappingSource.GetMappingForValue(defaultValue);

selectBuilder
.Append(", ")
.Append(defaultValueTypeMapping.GenerateSqlLiteral(defaultValue))
.Append(")");
}
}

Expand All @@ -461,7 +413,7 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
{
Sql = new StringBuilder()
.Append("INSERT INTO ")
.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier("ef_temp_" + table.Name))
.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(createTableOperation.Name))
.Append(" (")
.Append(intoBuilder)
.AppendLine(")")
Expand All @@ -470,11 +422,16 @@ private IReadOnlyList<MigrationOperation> RewriteOperations(
.AppendLine()
.Append("FROM ")
.Append(table.Name)
.AppendLine(Dependencies.SqlGenerationHelper.StatementTerminator)
.Append(Dependencies.SqlGenerationHelper.StatementTerminator)
.ToString()
});
}

foreach (var skippedRebuild in skippedRebuilds)
{
rebuilds.Remove(skippedRebuild);
}

if (rebuilds.Any())
{
operations.Add(
Expand Down Expand Up @@ -1095,19 +1052,14 @@ protected override void Generate(DropSequenceOperation operation, IModel model,

#endregion

private sealed class RequiredColumnOverrides
{
public string DefaultValueSql { get; set; }
public object DefaultValue { get; set; }
}

private sealed class RebuildContext
{
public ICollection<MigrationOperation> OperationsToReplace { get; } = new List<MigrationOperation>();
public IDictionary<string, string> OldColumns { get; } = new Dictionary<string, string>();
public IDictionary<string, RequiredColumnOverrides> NewlyRequiredColumns { get; } = new Dictionary<string, RequiredColumnOverrides>();
public ICollection<string> AddColumnsDeferred { get; } = new HashSet<string>();
public IDictionary<string, AddColumnOperation> AddColumnsDeferred { get; } = new Dictionary<string, AddColumnOperation>();
public ICollection<string> DropColumnsDeferred { get; } = new HashSet<string>();
public IDictionary<string, AlterColumnOperation> AlterColumnsDeferred = new Dictionary<string, AlterColumnOperation>();
public IDictionary<string, RenameColumnOperation> RenameColumnsDeferred = new Dictionary<string, RenameColumnOperation>();
public ICollection<string> CreateIndexesDeferred { get; } = new HashSet<string>();
public ICollection<MigrationOperation> OperationsToWarnFor { get; } = new List<MigrationOperation>();
}
}
Expand Down
Loading