Corrected breaking change in Npgsql 7.0

chrisbbe · chrisbbe · commit fe6adb75cdae · 2022-11-11T01:39:02.000+01:00
diff --git a/TestSupport/EfHelpers/Internal/NpgsqlDatabaseCleaner.cs b/TestSupport/EfHelpers/Internal/NpgsqlDatabaseCleaner.cs
@@ -159,13 +159,19 @@ NOT EXISTS (
 
         private void DropCollations(NpgsqlConnection conn)
         {
-#if NET6_0_OR_GREATER
+#if NET6_0
             if (conn.Settings.ServerCompatibilityMode == ServerCompatibilityMode.Redshift)
             {
                 return;
             }
 #endif
 
+#if NET7_0_OR_GREATER
+            var connectionStringBuilder = new NpgsqlConnectionStringBuilder(conn.ConnectionString);
+            if (connectionStringBuilder.ServerCompatibilityMode == ServerCompatibilityMode.Redshift) return;
+#endif
+
+
             const string getUserCollations = @"SELECT nspname, collname
 FROM pg_collation coll
     JOIN pg_namespace ns ON ns.oid=coll.collnamespace

Original file line number	Diff line number	Diff line change
`@@ -159,13 +159,19 @@ NOT EXISTS (`
`159`	`159`
`160`	`160`	`private void DropCollations(NpgsqlConnection conn)`
`161`	`161`	`{`
`162`		`-#if NET6_0_OR_GREATER`
	`162`	`+#if NET6_0`
`163`	`163`	`if (conn.Settings.ServerCompatibilityMode == ServerCompatibilityMode.Redshift)`
`164`	`164`	`{`
`165`	`165`	`return;`
`166`	`166`	`}`
`167`	`167`	`#endif`
`168`	`168`
	`169`	`+#if NET7_0_OR_GREATER`
	`170`	`+ var connectionStringBuilder = new NpgsqlConnectionStringBuilder(conn.ConnectionString);`
	`171`	`+ if (connectionStringBuilder.ServerCompatibilityMode == ServerCompatibilityMode.Redshift) return;`
	`172`	`+#endif`
	`173`	`+`
	`174`	`+`
`169`	`175`	`const string getUserCollations = @"SELECT nspname, collname`
`170`	`176`	`FROM pg_collation coll`
`171`	`177`	`JOIN pg_namespace ns ON ns.oid=coll.collnamespace`