3 files changed, 15 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/migration/join_table.rb b/activerecord/lib/active_record/migration/join_table.rb
index e456c81fc9..e880ae97bb 100644
--- a/activerecord/lib/active_record/migration/join_table.rb
+++ b/activerecord/lib/active_record/migration/join_table.rb
@@ -8,7 +8,7 @@ module ActiveRecord
       end
 
       def join_table_name(table_1, table_2)
-        [table_1, table_2].sort.join("_")
+        [table_1, table_2].sort.join("_").to_sym
       end
     end
   end
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index 4d8283bcff..609d810654 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -62,8 +62,10 @@ module ActiveRecord
     #
     #   Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id"
     def count_by_sql(sql)
-      sql = sanitize_conditions(sql)
-      connection.select_value(sql, "#{name} Count").to_i
+      logging_query_plan do
+        sql = sanitize_conditions(sql)
+        connection.select_value(sql, "#{name} Count").to_i
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/explain_test.rb b/activerecord/test/cases/explain_test.rb
index cb7781f8e7..bcc488f7ee 100644
--- a/activerecord/test/cases/explain_test.rb
+++ b/activerecord/test/cases/explain_test.rb
@@ -68,6 +68,16 @@ if ActiveRecord::Base.connection.supports_explain?
       assert_equal [cars(:honda)], result
     end
 
+    def test_logging_query_plan_when_counting_by_sql
+      base.logger.expects(:warn).with do |message|
+        message.starts_with?('EXPLAIN for:')
+      end
+
+      with_threshold(0) do
+        Car.count_by_sql "SELECT COUNT(*) FROM cars WHERE name = 'honda'"
+      end
+    end
+
     def test_exec_explain_with_no_binds
       sqls    = %w(foo bar)
       binds   = [[], []]