diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-07 15:59:15 -0700 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-01-07 15:59:15 -0700 |
commit | af2e0fec0971e1a9d76a5cd87c9324c3d92e5ec1 (patch) | |
tree | 3feab31df0649507c8c75ce11fc71bdb1fc1071b /activerecord | |
parent | 9892d445bcff57f0a8bd8eb467cb7bf8c40a285b (diff) | |
parent | 824862807be47bee5adbd15e365a2add57df5301 (diff) | |
download | rails-af2e0fec0971e1a9d76a5cd87c9324c3d92e5ec1.tar.gz rails-af2e0fec0971e1a9d76a5cd87c9324c3d92e5ec1.tar.bz2 rails-af2e0fec0971e1a9d76a5cd87c9324c3d92e5ec1.zip |
Merge pull request #18377 from brainopia/custom_connection_with_count
Fix count on a separate connection
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/multiple_db_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index c3a8bf5c74..e52b666296 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -392,7 +392,7 @@ module ActiveRecord end def column_name_for_operation(operation, node) # :nodoc: - node.to_sql + visitor.accept(node, collector).value end protected diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb index 3831de6ae3..15c60d5562 100644 --- a/activerecord/test/cases/multiple_db_test.rb +++ b/activerecord/test/cases/multiple_db_test.rb @@ -93,6 +93,13 @@ class MultipleDbTest < ActiveRecord::TestCase assert_not_equal Entrant.arel_engine.connection, Course.arel_engine.connection end + def test_count_on_custom_connection + ActiveRecord::Base.remove_connection + assert_equal 1, College.count + ensure + ActiveRecord::Base.establish_connection :arunit + end + unless in_memory_db? def test_associations_should_work_when_model_has_no_connection begin |