Run CI tests on PG17 (beta) (npgsql#3256)

WhatzGames · Dec 18, 2024 · 22cc147 · 22cc147
1 parent a2ac8bd
commit 22cc147
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,10 +29,10 @@ jobs:
           - os: ubuntu-22.04
             pg_major: 16
             config: Debug
-#          - os: ubuntu-22.04
-#            pg_major: 17
-#            config: Release
-#            pg_prerelease: 'PG Prerelease'
+          - os: ubuntu-22.04
+            pg_major: 17
+            config: Release
+            pg_prerelease: 'PG Prerelease'
 
     outputs:
       is_release: ${{ steps.analyze_tag.outputs.is_release }}

diff --git a/src/EFCore.PG/Scaffolding/Internal/NpgsqlDatabaseModelFactory.cs b/src/EFCore.PG/Scaffolding/Internal/NpgsqlDatabaseModelFactory.cs
@@ -1167,7 +1167,11 @@ private static void GetCollations(
         var commandText = $"""
 SELECT
     nspname, collname, collprovider, collcollate, collctype,
-    {(connection.PostgreSqlVersion >= new Version(15, 0) ? "colliculocale" : "NULL AS colliculocale")},
+    {(connection.PostgreSqlVersion.Major switch {
+        >= 17 => "colllocale",
+        >= 15 => "colliculocale AS colllocale",
+        _ => "NULL AS colllocale"
+         })},
     {(connection.PostgreSqlVersion >= new Version(12, 0) ? "collisdeterministic" : "true AS collisdeterministic")}
 FROM pg_collation coll
     JOIN pg_namespace ns ON ns.oid=coll.collnamespace
@@ -1183,7 +1187,7 @@ nspname NOT IN ({internalSchemas})
             {
                 var schema = reader.GetString(reader.GetOrdinal("nspname"));
                 var name = reader.GetString(reader.GetOrdinal("collname"));
-                var icuLocale = reader.GetValueOrDefault<string>("colliculocale");
+                var icuLocale = reader.GetValueOrDefault<string>("colllocale");
                 var lcCollate = reader.GetValueOrDefault<string>("collcollate");
                 var lcCtype = reader.GetValueOrDefault<string>("collctype");
                 var providerCode = reader.GetChar(reader.GetOrdinal("collprovider"));