Merge pull request rails#53702 from zzak/mysql2-prepared_statements

Fix prepared statements on mysql2 adapter

Author: byroot

activerecord/lib/active_record/connection_adapters/mysql2/database_statements.rb

@@ -48,26 +48,39 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
             # made since we established the connection
             raw_connection.query_options[:database_timezone] = default_timezone
 
-            result = if prepare
-              stmt = @statements[sql] ||= raw_connection.prepare(sql)
+            result = if !prepared_statements || binds.nil? || binds.empty?
+              ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+                result = raw_connection.query(sql)
+                @affected_rows_before_warnings = raw_connection.affected_rows
+                result
+              end
+              result
+            else
+              if prepare
+                stmt = @statements[sql] ||= raw_connection.prepare(sql)
+              else
+                stmt = raw_connection.prepare(sql)
+              end
 
               begin
                 ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
                   result = stmt.execute(*type_casted_binds)
+                  @affected_rows_before_warnings = stmt.affected_rows
+                  result
                 end
               rescue ::Mysql2::Error
-                @statements.delete(sql)
-                stmt.close
+                if prepare
+                  @statements.delete(sql)
+                else
+                  stmt.close
+                end
                 raise
               end
               verified!
 
               result
-            else
-              raw_connection.query(sql)
             end
 
-            @affected_rows_before_warnings = raw_connection.affected_rows
 
             notification_payload[:affected_rows] = @affected_rows_before_warnings
             notification_payload[:row_count] = result&.size || 0

activerecord/test/cases/adapters/postgresql/quoting_test.rb

@@ -29,6 +29,18 @@ def test_quote_float_infinity
           assert_equal "'Infinity'", @conn.quote(infinity)
         end
 
+        def test_cast_bound_integer
+          assert_equal "42", @conn.quote(42)
+        end
+
+        def test_cast_bound_big_decimal
+          assert_equal "4.2", @conn.quote(BigDecimal("4.2"))
+        end
+
+        def test_cast_bound_rational
+          assert_equal "3/4", @conn.quote(Rational(3, 4))
+        end
+
         def test_quote_range
           range = "1,2]'; SELECT * FROM users; --".."a"
           type = OID::Range.new(Type::Integer.new, :int8range)

activerecord/test/cases/bind_parameter_test.rb

@@ -238,8 +238,13 @@ def assert_bind_params_to_sql
           #
           #   SELECT `authors`.* FROM `authors` WHERE `authors`.`id` IN (1, 2, 3)
           #
-          sql = "SELECT #{table}.* FROM #{table} WHERE #{pk} IN (#{bind_params(1..3)})"
+          if current_adapter?(:Mysql2Adapter)
+            params = bind_params((1..3).map(&:to_s))
+          else
+            params = bind_params(1..3)
+          end
 
+          sql = "SELECT #{table}.* FROM #{table} WHERE #{pk} IN (#{params})"
           arel_node = Arel.sql("SELECT #{table}.* FROM #{table} WHERE #{pk} IN (?)", [1, 2, 3])
           assert_equal sql, @connection.to_sql(arel_node)
           assert_queries_match(sql) { assert_equal 3, @connection.select_all(arel_node).length }

activerecord/test/cases/explain_test.rb

@@ -89,22 +89,26 @@ def test_relation_explain_with_sum
       assert_match(expected_query, message)
     end
 
-    def test_relation_explain_with_first
-      expected_query = capture_sql {
-        Car.all.first
-      }.first
-      message = Car.all.explain.first
-      assert_match(/^EXPLAIN/, message)
-      assert_match(expected_query, message)
-    end
+    unless current_adapter?(:Mysql2Adapter) && ActiveRecord::Base.lease_connection.prepared_statements
+      def test_relation_explain_with_first
+        expected_query = capture_sql {
+          Car.all.first
+        }.first
+        message = Car.all.explain.first
+        assert_match(/^EXPLAIN/, message)
+        puts expected_query
+        puts message
+        assert_match(expected_query, message)
+      end
 
-    def test_relation_explain_with_last
-      expected_query = capture_sql {
-        Car.all.last
-      }.first
-      message = Car.all.explain.last
-      assert_match(/^EXPLAIN/, message)
-      assert_match(expected_query, message)
+      def test_relation_explain_with_last
+        expected_query = capture_sql {
+          Car.all.last
+        }.first
+        message = Car.all.explain.last
+        assert_match(/^EXPLAIN/, message)
+        assert_match(expected_query, message)
+      end
     end
 
     def test_relation_explain_with_pluck

activerecord/test/cases/finder_test.rb

@@ -1406,7 +1406,7 @@ def test_condition_utc_time_interpolation_with_default_timezone_local
     with_env_tz "America/New_York" do
       with_timezone_config default: :local do
         topic = Topic.first
-        assert_equal topic, Topic.where(["written_on = ?", topic.written_on.getutc]).first
+        assert_equal topic, Topic.where(["written_on = ?", topic.written_on]).first
       end
     end
   end
@@ -1424,7 +1424,7 @@ def test_condition_local_time_interpolation_with_default_timezone_utc
     with_env_tz "America/New_York" do
       with_timezone_config default: :utc do
         topic = Topic.first
-        assert_equal topic, Topic.where(["written_on = ?", topic.written_on.getlocal]).first
+        assert_equal topic, Topic.where(["written_on = ?", topic.written_on]).first
       end
     end
   end