Merge branch 'master' into set_binds

* master: (2794 commits)
  doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
  Restore DATABASE_URL even if it's nil in connection_handler test
  [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
  Ensure Active Record connection consistency
  Revert "ask the fixture set for the sql statements"
  Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
  Adding Hash#compact and Hash#compact! methods
  MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
  clear cache on body close so that cache remains during rendering
  add a more restricted codepath for templates fixes #13390
  refactor generator tests to use block form of Tempfile
  Fix typo [ci skip]
  Move finish_template as the last public method in the generator
  Minor typos fix [ci skip]
  make `change_column_null` reversible. Closes #13576.
  create/drop test and development databases only if RAILS_ENV is nil
  Revert "Speedup String#to"
  typo fix in test name. [ci skip].
  `core_ext/string/access.rb` test what we are documenting.
  Fix typo in image_tag documentation
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency/join_association.rb
	activerecord/lib/active_record/relation/query_methods.rb

1 files changed, 41 insertions, 36 deletions

diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
index 03aa9fdb27..291751c435 100644
--- a/activerecord/test/cases/bind_parameter_test.rb
+++ b/activerecord/test/cases/bind_parameter_test.rb
@@ -23,46 +23,56 @@ module ActiveRecord
       @listener   = LogListener.new
       @pk         = Topic.columns.find { |c| c.primary }
       ActiveSupport::Notifications.subscribe('sql.active_record', @listener)
-
-      skip_if_prepared_statement_caching_is_not_supported
     end
 
     def teardown
       ActiveSupport::Notifications.unsubscribe(@listener)
     end
 
-    def test_binds_are_logged
-      sub   = @connection.substitute_at(@pk, 0)
-      binds = [[@pk, 1]]
-      sql   = "select * from topics where id = #{sub}"
+    if ActiveRecord::Base.connection.supports_statement_cache?
+      def test_binds_are_logged
+        sub   = @connection.substitute_at(@pk, 0)
+        binds = [[@pk, 1]]
+        sql   = "select * from topics where id = #{sub}"
 
-      @connection.exec_query(sql, 'SQL', binds)
+        @connection.exec_query(sql, 'SQL', binds)
 
-      message = @listener.calls.find { |args| args[4][:sql] == sql }
-      assert_equal binds, message[4][:binds]
-    end
+        message = @listener.calls.find { |args| args[4][:sql] == sql }
+        assert_equal binds, message[4][:binds]
+      end
 
-    def test_find_one_uses_binds
-      Topic.find(1)
-      binds = [[@pk, 1]]
-      message = @listener.calls.find { |args| args[4][:binds] == binds }
-      assert message, 'expected a message with binds'
-    end
+      def test_binds_are_logged_after_type_cast
+        sub   = @connection.substitute_at(@pk, 0)
+        binds = [[@pk, "3"]]
+        sql   = "select * from topics where id = #{sub}"
 
-    def test_logs_bind_vars
-      pk = Topic.columns.find { |x| x.primary }
-
-      payload = {
-        :name  => 'SQL',
-        :sql   => 'select * from topics where id = ?',
-        :binds => [[pk, 10]]
-      }
-      event  = ActiveSupport::Notifications::Event.new(
-        'foo',
-        Time.now,
-        Time.now,
-        123,
-        payload)
+        @connection.exec_query(sql, 'SQL', binds)
+
+        message = @listener.calls.find { |args| args[4][:sql] == sql }
+        assert_equal [[@pk, 3]], message[4][:binds]
+      end
+
+      def test_find_one_uses_binds
+        Topic.find(1)
+        binds = [[@pk, 1]]
+        message = @listener.calls.find { |args| args[4][:binds] == binds }
+        assert message, 'expected a message with binds'
+      end
+
+      def test_logs_bind_vars
+        pk = Topic.columns.find { |x| x.primary }
+
+        payload = {
+          :name  => 'SQL',
+          :sql   => 'select * from topics where id = ?',
+          :binds => [[pk, 10]]
+        }
+        event  = ActiveSupport::Notifications::Event.new(
+          'foo',
+          Time.now,
+          Time.now,
+          123,
+          payload)
 
         logger = Class.new(ActiveRecord::LogSubscriber) {
           attr_reader :debugs
@@ -78,12 +88,7 @@ module ActiveRecord
 
         logger.sql event
         assert_match([[pk.name, 10]].inspect, logger.debugs.first)
-    end
-
-    private
-
-    def skip_if_prepared_statement_caching_is_not_supported
-      skip('prepared statement caching is not supported') unless @connection.supports_statement_cache?
+      end
     end
   end
 end