diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-12-28 23:08:10 +0000 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-28 23:08:40 +0000 |
commit | f06074f365932f47e108004b93f05b259cf0c5db (patch) | |
tree | 77a72b8077ce790ecf90b47c086cf8981f901ccc /activerecord/test/cases/adapter_test.rb | |
parent | e99987bc309a276bb6aea700ff184194768a6ee4 (diff) | |
download | rails-f06074f365932f47e108004b93f05b259cf0c5db.tar.gz rails-f06074f365932f47e108004b93f05b259cf0c5db.tar.bz2 rails-f06074f365932f47e108004b93f05b259cf0c5db.zip |
Fix CI
Diffstat (limited to 'activerecord/test/cases/adapter_test.rb')
-rw-r--r-- | activerecord/test/cases/adapter_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb index 56c359650e..852fc0e26e 100644 --- a/activerecord/test/cases/adapter_test.rb +++ b/activerecord/test/cases/adapter_test.rb @@ -69,16 +69,16 @@ module ActiveRecord def test_not_specifying_database_name_for_cross_database_selects begin assert_nothing_raised do - ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database)) + ActiveRecord::Model.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database)) config = ARTest.connection_config - ActiveRecord::Base.connection.execute( + ActiveRecord::Model.connection.execute( "SELECT #{config['arunit']['database']}.pirates.*, #{config['arunit2']['database']}.courses.* " \ "FROM #{config['arunit']['database']}.pirates, #{config['arunit2']['database']}.courses" ) end ensure - ActiveRecord::Base.establish_connection 'arunit' + ActiveRecord::Model.establish_connection 'arunit' end end end |