Skip to content

Use NpgsqlConnection when checking if database exists. #3562

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

Closed
marcusber wants to merge 1 commit into from
Closed

Use NpgsqlConnection when checking if database exists. #3562

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
2 changes: 1 addition & 1 deletion src/EFCore.PG/Storage/Internal/INpgsqlRelationalConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ public interface INpgsqlRelationalConnection : IRelationalConnection
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
ValueTask<INpgsqlRelationalConnection> CloneWith(string connectionString, bool async, CancellationToken cancellationToken = default);
ValueTask<NpgsqlConnection> CloneWith(string connectionString, bool async, CancellationToken cancellationToken = default);
}
4 changes: 2 additions & 2 deletions src/EFCore.PG/Storage/Internal/NpgsqlDatabaseCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@ private async Task<bool> Exists(bool async, CancellationToken cancellationToken
{
if (async)
{
await unpooledRelationalConnection.OpenAsync(errorsExpected: true, cancellationToken: cancellationToken)
await unpooledRelationalConnection.OpenAsync(cancellationToken: cancellationToken)
.ConfigureAwait(false);
}
else
{
unpooledRelationalConnection.Open(errorsExpected: true);
unpooledRelationalConnection.Open();
}

return true;
Expand Down
11 changes: 2 additions & 9 deletions src/EFCore.PG/Storage/Internal/NpgsqlRelationalConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public override Transaction? CurrentAmbientTransaction
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual async ValueTask<INpgsqlRelationalConnection> CloneWith(
public virtual async ValueTask<NpgsqlConnection> CloneWith(
string connectionString,
bool async,
CancellationToken cancellationToken = default)
Expand All @@ -241,13 +241,6 @@ public virtual async ValueTask<INpgsqlRelationalConnection> CloneWith(
? await DbConnection.CloneWithAsync(connectionString, cancellationToken).ConfigureAwait(false)
: DbConnection.CloneWith(connectionString);

var relationalOptions = RelationalOptionsExtension.Extract(Dependencies.ContextOptions)
.WithConnectionString(null)
.WithConnection(clonedDbConnection);

var optionsBuilder = new DbContextOptionsBuilder();
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(relationalOptions);

return new NpgsqlRelationalConnection(Dependencies with { ContextOptions = optionsBuilder.Options }, dataSource: null);
return clonedDbConnection;
}
}