Skip to content

Support PostgresSQL before version 17 #5

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

Merged
Manfred merged 3 commits into from
Jun 15, 2026
Merged

Support PostgresSQL before version 17 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f7e637
Chance collations query for older PostgreSQL versions.
Manfred Jun 15, 2026
7bbdc63
Updated generated schema.
Manfred Jun 15, 2026
45b428d
Add newer and older Postgres to test matrix.
Manfred Jun 15, 2026
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
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ jobs:
build:
strategy:
matrix:
ruby_version: ["3.4", "3.3"]
ruby_version: ["4.0", "3.3"]
postgres_version: ["18", "15"]
runs-on: ubuntu-latest
services:
postgres:
image: postgres:17
image: postgres:${{ matrix.postgres_version }}
env:
# Default database that is created when the image is first started.
POSTGRES_DB: active_record_collation_test
Expand Down
33 changes: 25 additions & 8 deletions lib/active_record/collation/schema_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,31 @@ def drop_collation(name)
end

def collations
internal_exec_query(<<~SQL, 'SCHEMA')
SELECT
pg_collation.collname,
pg_collation.colllocale
FROM pg_collation
JOIN pg_namespace
ON pg_collation.collnamespace = pg_namespace.oid AND pg_namespace.nspname = 'public'
SQL
internal_exec_query(collations_sql, 'SCHEMA')
end

private

def collations_sql # rubocop:disable Metrics/MethodLength
if database_version >= 170_000
<<~SQL
SELECT
pg_collation.collname,
pg_collation.colllocale
FROM pg_collation
JOIN pg_namespace
ON pg_collation.collnamespace = pg_namespace.oid AND pg_namespace.nspname = 'public'
SQL
else
<<~SQL
SELECT
pg_collation.collname,
pg_collation.colliculocale AS colllocale
FROM pg_collation
JOIN pg_namespace
ON pg_collation.collnamespace = pg_namespace.oid AND pg_namespace.nspname = 'public'
SQL
end
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions test/dummy/db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"

create_collation("natural_de", "de-u-ka-shifted-kn-ks-level1-kv-symbol")
create_collation("natural_en", "en-u-ka-shifted-kn-ks-level1-kv-symbol")
create_collation("natural_de", "de-u-kn-true-ks-level1-ka-shifted-kv-symbol")
create_collation("natural_en", "en-u-kn-true-ks-level1-ka-shifted-kv-symbol")

create_table "clients", force: :cascade do |t|
t.text "name", null: false
Expand Down