Skip to content

Commit 69fac7b

Browse files
authored
Run CI tests on PG17 (beta) (#3256)
1 parent 1a95104 commit 69fac7b

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
- os: ubuntu-22.04
3030
pg_major: 16
3131
config: Debug
32-
# - os: ubuntu-22.04
33-
# pg_major: 17
34-
# config: Release
35-
# pg_prerelease: 'PG Prerelease'
32+
- os: ubuntu-22.04
33+
pg_major: 17
34+
config: Release
35+
pg_prerelease: 'PG Prerelease'
3636

3737
outputs:
3838
is_release: ${{ steps.analyze_tag.outputs.is_release }}

src/EFCore.PG/Scaffolding/Internal/NpgsqlDatabaseModelFactory.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,11 @@ private static void GetCollations(
11671167
var commandText = $"""
11681168
SELECT
11691169
nspname, collname, collprovider, collcollate, collctype,
1170-
{(connection.PostgreSqlVersion >= new Version(15, 0) ? "colliculocale" : "NULL AS colliculocale")},
1170+
{(connection.PostgreSqlVersion.Major switch {
1171+
>= 17 => "colllocale",
1172+
>= 15 => "colliculocale AS colllocale",
1173+
_ => "NULL AS colllocale"
1174+
})},
11711175
{(connection.PostgreSqlVersion >= new Version(12, 0) ? "collisdeterministic" : "true AS collisdeterministic")}
11721176
FROM pg_collation coll
11731177
JOIN pg_namespace ns ON ns.oid=coll.collnamespace
@@ -1183,7 +1187,7 @@ nspname NOT IN ({internalSchemas})
11831187
{
11841188
var schema = reader.GetString(reader.GetOrdinal("nspname"));
11851189
var name = reader.GetString(reader.GetOrdinal("collname"));
1186-
var icuLocale = reader.GetValueOrDefault<string>("colliculocale");
1190+
var icuLocale = reader.GetValueOrDefault<string>("colllocale");
11871191
var lcCollate = reader.GetValueOrDefault<string>("collcollate");
11881192
var lcCtype = reader.GetValueOrDefault<string>("collctype");
11891193
var providerCode = reader.GetChar(reader.GetOrdinal("collprovider"));

0 commit comments

Comments
 (0)