Skip to content

NpgsqlRelationalConnection owns newly created connection. #3565

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

Open
marcusber wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NpgsqlRelationalConnection owns newly created connection. #3565

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
10 changes: 10 additions & 0 deletions src/EFCore.PG/Infrastructure/Internal/NpgsqlOptionsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,16 @@ public override RelationalOptionsExtension WithConnection(DbConnection? connecti
return clone;
}

/// <inheritdoc />
public override RelationalOptionsExtension WithConnection(DbConnection? connection, bool owned)
{
var clone = (NpgsqlOptionsExtension)base.WithConnection(connection, owned);

clone.DataSource = null;

return clone;
}

/// <summary>
/// Returns a copy of the current instance configured with the specified range mapping.
/// </summary>
Expand Down
4 changes: 2 additions & 2 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 @@ -205,7 +205,7 @@ public virtual INpgsqlRelationalConnection CreateAdminConnection()
var adminNpgsqlOptions = DataSource is not null
? npgsqlOptions.WithConnection(((NpgsqlConnection)CreateDbConnection()).CloneWith(adminConnectionString))
: npgsqlOptions.Connection is not null
? npgsqlOptions.WithConnection(DbConnection.CloneWith(adminConnectionString))
? npgsqlOptions.WithConnection(DbConnection.CloneWith(adminConnectionString), owned: true)
: npgsqlOptions.WithConnectionString(adminConnectionString);

var optionsBuilder = new DbContextOptionsBuilder();
Expand Down Expand Up @@ -243,7 +243,7 @@ public virtual async ValueTask<INpgsqlRelationalConnection> CloneWith(

var relationalOptions = RelationalOptionsExtension.Extract(Dependencies.ContextOptions)
.WithConnectionString(null)
.WithConnection(clonedDbConnection);
.WithConnection(clonedDbConnection, owned: true);

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