Merge pull request rails#46108 from adrianna-chang-shopify/ac-retry-on-quote-string

Use `#with_raw_connection` in `#quote_string` to retry connection errors

Author: byroot

activerecord/CHANGELOG.md

@@ -1,3 +1,10 @@
+*   Use connection from `#with_raw_connection` in `#quote_string`.
+
+    This ensures that the string quoting is wrapped in the reconnect and retry logic
+    that `#with_raw_connection` offers.
+
+    *Adrianna Chang*
+
 *   Add `expires_in` option to `signed_id`.
 
     *Shouichi Kamiya*

activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -97,10 +97,11 @@ def error_number(exception)
       # QUOTING ==================================================
       #++
 
+      # Quotes strings for use in SQL input.
       def quote_string(string)
-        any_raw_connection.escape(string)
-      rescue Mysql2::Error => error
-        raise translate_exception(error, message: error.message, sql: "<escape>", binds: [])
+        with_raw_connection(allow_retry: true, uses_transaction: false) do |connection|
+          connection.escape(string)
+        end
       end
 
       #--

activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb

@@ -43,7 +43,9 @@ def quote(value) # :nodoc:
 
         # Quotes strings for use in SQL input.
         def quote_string(s) # :nodoc:
-          valid_raw_connection.escape(s)
+          with_raw_connection(allow_retry: true, uses_transaction: false) do |connection|
+            connection.escape(s)
+          end
         end
 
         # Checks the following cases: