Merge pull request #6197 from blakesmith/connection_adapters_without_explain_support

Don't run explain on slow queries for database adapters that don't support it

1 files changed, 10 insertions, 0 deletions

diff --git a/activerecord/test/cases/explain_test.rb b/activerecord/test/cases/explain_test.rb
index 6dce8ccdd1..a7e5fdf709 100644
--- a/activerecord/test/cases/explain_test.rb
+++ b/activerecord/test/cases/explain_test.rb
@@ -108,6 +108,16 @@ if ActiveRecord::Base.connection.supports_explain?
       assert_equal expected, base.exec_explain(queries)
     end
 
+    def test_unsupported_connection_adapter
+      connection.stubs(:supports_explain?).returns(false)
+
+      base.logger.expects(:warn).never
+
+      with_threshold(0) do
+        Car.where(:name => 'honda').to_a
+      end
+    end
+
     def test_silence_auto_explain
       base.expects(:collecting_sqls_for_explain).never
       base.logger.expects(:warn).never