aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-09-12 02:54:56 +0900
committerkennyj <kennyj@gmail.com>2012-09-12 02:54:56 +0900
commitdf9e135281463f11756ba7bf8f399523dfc1ee3c (patch)
treed662aaa76fe2e64fcb4f34b7496465df66d033c1 /activerecord/test
parentccc6910cb034efc6b749e1ae82c748085a671fa9 (diff)
downloadrails-df9e135281463f11756ba7bf8f399523dfc1ee3c.tar.gz
rails-df9e135281463f11756ba7bf8f399523dfc1ee3c.tar.bz2
rails-df9e135281463f11756ba7bf8f399523dfc1ee3c.zip
Use configuration['encoding'], because database configuration use not charset but encoding.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/tasks/mysql_rake_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index eafead66a9..46b97a1274 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -32,7 +32,7 @@ module ActiveRecord
with('my-app-db', {:charset => 'latin', :collation => 'latin_ci'})
ActiveRecord::Tasks::DatabaseTasks.create @configuration.merge(
- 'charset' => 'latin', 'collation' => 'latin_ci'
+ 'encoding' => 'latin', 'collation' => 'latin_ci'
)
end
@@ -176,7 +176,7 @@ module ActiveRecord
with('test-db', {:charset => 'latin', :collation => 'latin_ci'})
ActiveRecord::Tasks::DatabaseTasks.purge @configuration.merge(
- 'charset' => 'latin', 'collation' => 'latin_ci'
+ 'encoding' => 'latin', 'collation' => 'latin_ci'
)
end
end