activerecord-collation 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a515beeae2f125a1faffb9d4826ecb4566a9482b756a7d65996b6a07981d217f
-  data.tar.gz: 2ed5a94b19f28dfbfc319668218afa21f26e1b348af3e197d0910830647395d3
+  metadata.gz: 4030382ddc37e42c183e0c718597e127a923626e33d4d20d1454ee79523b8980
+  data.tar.gz: eb336c834feab12f38a41283acf6c35ed379fcdb3a8ba55ed3b4b9887094debd
 SHA512:
-  metadata.gz: bf9dd9072a26592c5574be4bcf38b4400900ca82235520a6832de7f7792e72a506e46c9385db5bf6985802527a2cc12251b702659d09ec22b73f14fa7d275e93
-  data.tar.gz: ae3cd929eff72e689b55bead8eb7c4f8531781a1e1e9376f577651d193eee82bff3dd4b71a85a074ada9e60db3bd6196a40b6f840070873aba9215b9bdb2513f
+  metadata.gz: 566a00cac7e367909daa3b196f7b9dc7308151f176ed73d880746cb96066914126543ac693e4c5f2c6903a321d318967a5b4c9ca11138ac175a64a2b8629fc77
+  data.tar.gz: 54b78aadfe34f5a3da6df6494f62ddf38e1f46d4c81d7318614038ef1067a066a69dc34b55b04c6d4ed0fd92adb5d4bf470362ae48fdba0f4a0a0f571c38317b

data/lib/active_record/collation/schema_statements.rb

@@ -18,14 +18,31 @@ module ActiveRecord
       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

data/lib/active_record/collation/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Collation
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-collation
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Manfred Stienstra