Unify the collation API for the database adpters

3 files changed, 8 insertions, 8 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
index 148584214e..113c27b194 100644
--- a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
@@ -21,8 +21,8 @@ class PostgresqlActiveSchemaTest < ActiveRecord::TestCase
     assert_equal %(CREATE DATABASE "aimonetti" ENCODING = 'latin1'), create_database(:aimonetti, :encoding => :latin1)
   end
 
-  def test_create_database_with_collate_and_ctype
-    assert_equal %(CREATE DATABASE "aimonetti" ENCODING = 'UTF8' LC_COLLATE = 'ja_JP.UTF8' LC_CTYPE = 'ja_JP.UTF8'), create_database(:aimonetti, :encoding => :"UTF8", :collate => :"ja_JP.UTF8", :ctype => :"ja_JP.UTF8")
+  def test_create_database_with_collation_and_ctype
+    assert_equal %(CREATE DATABASE "aimonetti" ENCODING = 'UTF8' LC_COLLATE = 'ja_JP.UTF8' LC_CTYPE = 'ja_JP.UTF8'), create_database(:aimonetti, :encoding => :"UTF8", :collation => :"ja_JP.UTF8", :ctype => :"ja_JP.UTF8")
   end
 
   def test_add_index
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index 9b5c5eb72f..f823ce33d8 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -21,8 +21,8 @@ module ActiveRecord
       assert_not_nil @connection.encoding
     end
 
-    def test_collate
-      assert_not_nil @connection.collate
+    def test_collation
+      assert_not_nil @connection.collation
     end
 
     def test_ctype
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index df1075d816..62acd53003 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -38,12 +38,12 @@ module ActiveRecord
         merge('encoding' => 'latin')
     end
 
-    def test_creates_database_with_given_collate_and_ctype
+    def test_creates_database_with_given_collation_and_ctype
       @connection.expects(:create_database).
-        with('my-app-db', @configuration.merge('encoding' => 'utf8', 'collate' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8'))
+        with('my-app-db', @configuration.merge('encoding' => 'utf8', 'collation' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8'))
 
       ActiveRecord::Tasks::DatabaseTasks.create @configuration.
-        merge('collate' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8')
+        merge('collation' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8')
     end
 
     def test_establishes_connection_to_new_database
@@ -172,7 +172,7 @@ module ActiveRecord
     end
 
     def test_db_retrieves_collation
-      @connection.expects(:collate)
+      @connection.expects(:collation)
       ActiveRecord::Tasks::DatabaseTasks.collation @configuration
     end
   end