aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/postgresql
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-01 12:57:48 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-01 12:58:41 -0300
commitaafa00f4c10a6791e6470112f0f1fbe5f2c3f649 (patch)
treeeba2b5554545cc2a84933f443763a28d9f4c0a8f /activerecord/test/cases/adapters/postgresql
parent36938b410e7c7396ee5934246fddc048b898f7ef (diff)
downloadrails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.tar.gz
rails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.tar.bz2
rails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.zip
Unify the collation API for the database adpters
Diffstat (limited to 'activerecord/test/cases/adapters/postgresql')
-rw-r--r--activerecord/test/cases/adapters/postgresql/active_schema_test.rb4
-rw-r--r--activerecord/test/cases/adapters/postgresql/connection_test.rb4
2 files changed, 4 insertions, 4 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