activerecord-collation 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b08951bb81767158f2bb2182f468a658c763879c00f03a3173f7ed7fdb82dac4
-  data.tar.gz: 63d6d457800220ab6962bf1d201febdcdfa1f4d71128fb4ed7db2a3c28109a48
+  metadata.gz: 4030382ddc37e42c183e0c718597e127a923626e33d4d20d1454ee79523b8980
+  data.tar.gz: eb336c834feab12f38a41283acf6c35ed379fcdb3a8ba55ed3b4b9887094debd
 SHA512:
-  metadata.gz: f0c2107d45f7d6f5878494e91716e96f4853c6403c8c423eec5b0c61f1156567609417179ec4b2a39b6ef577a18466c0f9d6414b06b893eb4086e2159493e776
-  data.tar.gz: 85bdcf26363009c077c105eac437ee6cd0d5f8710a5f927f66c3b9e247c919278017c40dd02dd31e0d7ff246e701593ead7b93f3bcff90031c9c415447917a73
+  metadata.gz: 566a00cac7e367909daa3b196f7b9dc7308151f176ed73d880746cb96066914126543ac693e4c5f2c6903a321d318967a5b4c9ca11138ac175a64a2b8629fc77
+  data.tar.gz: 54b78aadfe34f5a3da6df6494f62ddf38e1f46d4c81d7318614038ef1067a066a69dc34b55b04c6d4ed0fd92adb5d4bf470362ae48fdba0f4a0a0f571c38317b

data/README.md

@@ -18,17 +18,17 @@ See [Postgres collation documentation](https://www.postgresql.org/docs/current/c
 
 ## Setup
 
-Add `activerecord-collations` to your dependencies. If you also want the `collate` class method on your model you also include the collation module:
+Add `activerecord-collations` to your dependencies. Include the collation concern into your models to get access to the `collate` class method.
 
 ```ruby
 class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
+  primary_abstract_class
 
   include ActiveRecord::Collation
 end
 ```
 
-The collate method creates an ARel expression for the column with a certain collation.
+The `collate` method creates an ARel expression for the column with a certain collation.
 
 ```ruby
 scope :ordered, -> { order(collate(:title, "natural_#{I18n.locale}") }
@@ -45,11 +45,13 @@ Arel::Nodes::InfixOperation.new(
 )
 ```
 
-## Testing
+## Development
 
-The Dummy application uses the gem so you can load the schema and run migrations there:
+Run tests in this repository with `rake`. Migrations are exercised by running them in the dummy application.
 
 ```
 cd test/dummy
-RAILS_ENV=test rake db:migrate
+rm -f db/schema.rb && RAILS_ENV=test bundle exec rake db:drop db:create db:migrate
+cd ../../
+bundle exec rake
 ```

data/lib/active_record/collation/schema_dumper.rb

@@ -10,15 +10,15 @@ module ActiveRecord
         collations = @connection.collations
         return unless collations.any?
 
-        stream.puts
         collations.each do |row|
           stream.puts(
             "  create_collation(#{row['collname'].inspect}, #{row['colllocale'].inspect})"
           )
         end
+        stream.puts
       end
 
-      def trailer(stream)
+      def tables(stream)
         collations(stream)
         super
       end

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.1'
+    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.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Manfred Stienstra
@@ -24,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: "  Adds methods like create_collation to manage collations in your Ruby
-  on Rials project.\n"
+  on Rails project.\n"
 email:
 - manfred@fngtps.com
 executables: []
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Collation support for Active Record.
 test_files: []