Merge pull request #18377 from brainopia/custom_connection_with_count

Fix count on a separate connection

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