Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/EFCore.Relational/Migrations/HistoryRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,7 @@ async Task<bool> IHistoryRepository.CreateIfNotExistsAsync(CancellationToken can
private IReadOnlyList<MigrationCommand> GetCreateIfNotExistsCommands()
=> Dependencies.MigrationsSqlGenerator.Generate([new SqlOperation
{
Sql = GetCreateIfNotExistsScript(),
SuppressTransaction = true
Sql = GetCreateIfNotExistsScript()
}]);

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,62 @@ await history.GetAppliedMigrationsAsync(),
x => Assert.Equal("00000000000002_Migration2", x.MigrationId));
}

[ConditionalFact]
public virtual void Can_apply_two_migrations_in_transaction()
{
using var db = Fixture.CreateContext();
db.Database.EnsureDeleted();
GiveMeSomeTime(db);
db.GetService<IRelationalDatabaseCreator>().Create();

var strategy = db.Database.CreateExecutionStrategy();
strategy.Execute(() =>
{
using var transaction = db.Database.BeginTransaction();
var migrator = db.GetService<IMigrator>();
migrator.Migrate("Migration1");
migrator.Migrate("Migration2");

var history = db.GetService<IHistoryRepository>();
Assert.Collection(
history.GetAppliedMigrations(),
x => Assert.Equal("00000000000001_Migration1", x.MigrationId),
x => Assert.Equal("00000000000002_Migration2", x.MigrationId));
});

Assert.Equal(
LogLevel.Warning,
Fixture.TestSqlLoggerFactory.Log.First(l => l.Id == RelationalEventId.MigrationsUserTransactionWarning).Level);
}

[ConditionalFact]
public virtual async Task Can_apply_two_migrations_in_transaction_async()
{
using var db = Fixture.CreateContext();
await db.Database.EnsureDeletedAsync();
await GiveMeSomeTimeAsync(db);
await db.GetService<IRelationalDatabaseCreator>().CreateAsync();

var strategy = db.Database.CreateExecutionStrategy();
await strategy.ExecuteAsync(async () =>
{
using var transaction = db.Database.BeginTransactionAsync();
var migrator = db.GetService<IMigrator>();
await migrator.MigrateAsync("Migration1");
await migrator.MigrateAsync("Migration2");

var history = db.GetService<IHistoryRepository>();
Assert.Collection(
await history.GetAppliedMigrationsAsync(),
x => Assert.Equal("00000000000001_Migration1", x.MigrationId),
x => Assert.Equal("00000000000002_Migration2", x.MigrationId));
});

Assert.Equal(
LogLevel.Warning,
Fixture.TestSqlLoggerFactory.Log.First(l => l.Id == RelationalEventId.MigrationsUserTransactionWarning).Level);
}

[ConditionalFact]
public virtual async Task Can_generate_no_migration_script()
{
Expand Down Expand Up @@ -549,6 +605,7 @@ public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder build
e => e
.Log(RelationalEventId.PendingModelChangesWarning)
.Log(RelationalEventId.NonTransactionalMigrationOperationWarning)
.Log(RelationalEventId.MigrationsUserTransactionWarning)
);

protected override bool ShouldLogCategory(string logCategory)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,14 @@ public async Task Executes_transaction_suppressed_migration_commands_in_user_tra
Assert.Equal(
RelationalStrings.TransactionSuppressedMigrationInUserTransaction,
(await Assert.ThrowsAsync<NotSupportedException>(
async ()
=> await migrationCommandExecutor.ExecuteNonQueryAsync(commandList, fakeConnection))).Message);
async () => await migrationCommandExecutor.ExecuteNonQueryAsync(commandList, fakeConnection))).Message);
}
else
{
Assert.Equal(
RelationalStrings.TransactionSuppressedMigrationInUserTransaction,
Assert.Throws<NotSupportedException>(
()
=> migrationCommandExecutor.ExecuteNonQuery(commandList, fakeConnection)).Message);
() => migrationCommandExecutor.ExecuteNonQuery(commandList, fakeConnection)).Message);
}

tx.Rollback();
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.Specification.Tests/CustomConvertersTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1184,8 +1184,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
b.Property(e => e.ByteArray5)
.HasConversion(
new ValueConverter<byte[], byte[]>(
v => v.Reverse().Concat(new byte[] { 4, 20 }).ToArray(),
v => v.Reverse().Skip(2).ToArray()),
v => ((IEnumerable<byte>)v).Reverse().Concat(new byte[] { 4, 20 }).ToArray(),
v => ((IEnumerable<byte>)v).Reverse().Skip(2).ToArray()),
bytesComparer)
.HasMaxLength(7);

Expand Down