Merge pull request #6895 from kennyj/support_collate_for_postgresql

Support collate for postgresql

1 files changed, 20 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index a9940209fa..507e937c3e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -916,7 +916,8 @@ module ActiveRecord
       end
 
       # Create a new PostgreSQL database. Options include <tt>:owner</tt>, <tt>:template</tt>,
-      # <tt>:encoding</tt>, <tt>:tablespace</tt>, and <tt>:connection_limit</tt> (note that MySQL uses
+      # <tt>:encoding</tt>, <tt>:collate</tt>, <tt>:ctype</tt>,
+      # <tt>:tablespace</tt>, and <tt>:connection_limit</tt> (note that MySQL uses
       # <tt>:charset</tt> while PostgreSQL uses <tt>:encoding</tt>).
       #
       # Example:
@@ -933,6 +934,10 @@ module ActiveRecord
             " TEMPLATE = \"#{value}\""
           when :encoding
             " ENCODING = '#{value}'"
+          when :collate
+            " LC_COLLATE = '#{value}'"
+          when :ctype
+            " LC_CTYPE = '#{value}'"
           when :tablespace
             " TABLESPACE = \"#{value}\""
           when :connection_limit
@@ -1059,6 +1064,20 @@ module ActiveRecord
         end_sql
       end
 
+      # Returns the current database collate.
+      def collate
+        query(<<-end_sql, 'SCHEMA')[0][0]
+          SELECT pg_database.datcollate FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
+        end_sql
+      end
+
+      # Returns the current database ctype.
+      def ctype
+        query(<<-end_sql, 'SCHEMA')[0][0]
+          SELECT pg_database.datctype FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
+        end_sql
+      end
+
       # Returns an array of schema names.
       def schema_names
         query(<<-SQL, 'SCHEMA').flatten