Skip to content

Commit 6375ac0

Browse files
rojiroji
authored
Remove old EF6 connection string parameters (#5422)
1 parent b35cbcb commit 6375ac0

5 files changed

Lines changed: 8 additions & 79 deletions

File tree

‎src/Npgsql/NpgsqlConnection.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -458,12 +458,6 @@ public override string ConnectionString
458458
/// </summary>
459459
public string? UserName => Settings.Username;
460460

461-
// The following two lines are here for backwards compatibility with the EF6 provider
462-
// ReSharper disable UnusedMember.Global
463-
internal string? EntityTemplateDatabase => Settings.EntityTemplateDatabase;
464-
internal string? EntityAdminDatabase => Settings.EntityAdminDatabase;
465-
// ReSharper restore UnusedMember.Global
466-
467461
#endregion Configuration settings
468462

469463
#region State management

‎src/Npgsql/NpgsqlConnectionStringBuilder.cs‎

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@ public string? Database
270270
string? _database;
271271

272272
/// <summary>
273-
/// The username to connect with. Not required if using GSS/SSPI/Kerberos.
273+
/// The username to connect with.
274274
/// </summary>
275275
[Category("Connection")]
276-
[Description("The username to connect with. Not required if using IntegratedSecurity.")]
276+
[Description("The username to connect with.")]
277277
[DisplayName("Username")]
278278
[NpgsqlConnectionStringProperty("User Name", "UserId", "User Id", "UID")]
279279
public string? Username
@@ -288,10 +288,10 @@ public string? Username
288288
string? _username;
289289

290290
/// <summary>
291-
/// The password to connect with. Not required if using GSS/SSPI/Kerberos.
291+
/// The password to connect with.
292292
/// </summary>
293293
[Category("Connection")]
294-
[Description("The password to connect with. Not required if using IntegratedSecurity.")]
294+
[Description("The password to connect with.")]
295295
[PasswordPropertyText(true)]
296296
[DisplayName("Password")]
297297
[NpgsqlConnectionStringProperty("PSW", "PWD")]
@@ -959,52 +959,6 @@ public int HostRecheckSeconds
959959

960960
#endregion Properties - Failover and load balancing
961961

962-
#region Properties - Entity Framework
963-
964-
/// <summary>
965-
/// The database template to specify when creating a database in Entity Framework. If not specified,
966-
/// PostgreSQL defaults to "template1".
967-
/// </summary>
968-
/// <remarks>
969-
/// https://www.postgresql.org/docs/current/static/manage-ag-templatedbs.html
970-
/// </remarks>
971-
[Category("Entity Framework")]
972-
[Description("The database template to specify when creating a database in Entity Framework. If not specified, PostgreSQL defaults to \"template1\".")]
973-
[DisplayName("EF Template Database")]
974-
[NpgsqlConnectionStringProperty]
975-
public string? EntityTemplateDatabase
976-
{
977-
get => _entityTemplateDatabase;
978-
set
979-
{
980-
_entityTemplateDatabase = value;
981-
SetValue(nameof(EntityTemplateDatabase), value);
982-
}
983-
}
984-
string? _entityTemplateDatabase;
985-
986-
/// <summary>
987-
/// The database admin to specify when creating and dropping a database in Entity Framework. This is needed because
988-
/// Npgsql needs to connect to a database in order to send the create/drop database command.
989-
/// If not specified, defaults to "template1". Check NpgsqlServices.UsingPostgresDBConnection for more information.
990-
/// </summary>
991-
[Category("Entity Framework")]
992-
[Description("The database admin to specify when creating and dropping a database in Entity Framework. If not specified, defaults to \"template1\".")]
993-
[DisplayName("EF Admin Database")]
994-
[NpgsqlConnectionStringProperty]
995-
public string? EntityAdminDatabase
996-
{
997-
get => _entityAdminDatabase;
998-
set
999-
{
1000-
_entityAdminDatabase = value;
1001-
SetValue(nameof(EntityAdminDatabase), value);
1002-
}
1003-
}
1004-
string? _entityAdminDatabase;
1005-
1006-
#endregion
1007-
1008962
#region Properties - Advanced
1009963

1010964
/// <summary>

‎src/Npgsql/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,6 @@
1212
[module: SkipLocalsInit]
1313
#endif
1414

15-
[assembly: InternalsVisibleTo("EntityFramework6.Npgsql, PublicKey=" +
16-
"0024000004800000940000000602000000240000525341310004000001000100" +
17-
"2b3c590b2a4e3d347e6878dc0ff4d21eb056a50420250c6617044330701d35c9" +
18-
"8078a5df97a62d83c9a2db2d072523a8fc491398254c6b89329b8c1dcef43a1e" +
19-
"7aa16153bcea2ae9a471145624826f60d7c8e71cd025b554a0177bd935a78096" +
20-
"29f0a7afc778ebb4ad033e1bf512c1a9c6ceea26b077bc46cac93800435e77ee")]
21-
22-
[assembly: InternalsVisibleTo("EntityFramework5.Npgsql, PublicKey=" +
23-
"0024000004800000940000000602000000240000525341310004000001000100" +
24-
"2b3c590b2a4e3d347e6878dc0ff4d21eb056a50420250c6617044330701d35c9" +
25-
"8078a5df97a62d83c9a2db2d072523a8fc491398254c6b89329b8c1dcef43a1e" +
26-
"7aa16153bcea2ae9a471145624826f60d7c8e71cd025b554a0177bd935a78096" +
27-
"29f0a7afc778ebb4ad033e1bf512c1a9c6ceea26b077bc46cac93800435e77ee")]
28-
2915
[assembly: InternalsVisibleTo("Npgsql.Tests, PublicKey=" +
3016
"0024000004800000940000000602000000240000525341310004000001000100" +
3117
"2b3c590b2a4e3d347e6878dc0ff4d21eb056a50420250c6617044330701d35c9" +

‎src/Npgsql/PublicAPI.Unshipped.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ static NpgsqlTypes.NpgsqlCidr.implicit operator NpgsqlTypes.NpgsqlInet(NpgsqlTyp
141141
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.ContinuousProcessing.set -> void
142142
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.ConvertInfinityDateTime.get -> bool
143143
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.ConvertInfinityDateTime.set -> void
144+
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.EntityAdminDatabase.get -> string?
145+
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.EntityAdminDatabase.set -> void
146+
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.EntityTemplateDatabase.get -> string?
147+
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.EntityTemplateDatabase.set -> void
144148
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.IncludeErrorDetails.get -> bool
145149
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.IncludeErrorDetails.set -> void
146150
*REMOVED*Npgsql.NpgsqlConnectionStringBuilder.IntegratedSecurity.get -> bool

‎test/Npgsql.Tests/ConnectionStringBuilderTests.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ public void Basic()
2020
Assert.That(builder.Count, Is.EqualTo(0));
2121
}
2222

23-
[Test]
24-
public void From_string()
25-
{
26-
var builder = new NpgsqlConnectionStringBuilder();
27-
builder.ConnectionString = "Host=myhost;EF Template Database=foo";
28-
Assert.That(builder.Host, Is.EqualTo("myhost"));
29-
Assert.That(builder.EntityTemplateDatabase, Is.EqualTo("foo"));
30-
}
31-
3223
[Test]
3324
public void TryGetValue()
3425
{

0 commit comments

Comments
 (0)