Skip to content
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

Run CI tests on PG17 (beta) #3256

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Run CI tests on PG17 (beta) #3256

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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 6 additions & 2 deletions src/EFCore.PG/Scaffolding/Internal/NpgsqlDatabaseModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"));
Expand Down