Merge pull request rails#53425 from skipkayhil/hm-allow-retry-query-value

Make internal query() retryable

Author: byroot

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

@@ -110,8 +110,8 @@ def query_values(...) # :nodoc:
         query(...).map(&:first)
       end
 
-      def query(...) # :nodoc:
-        internal_exec_query(...).rows
+      def query(sql, name = nil, allow_retry: true, materialize_transactions: true) # :nodoc:
+        internal_exec_query(sql, name, allow_retry:, materialize_transactions:).rows
       end
 
       # Determines whether the SQL statement is a write query.

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

@@ -320,7 +320,7 @@ def set_pk_sequence!(table, value) # :nodoc:
             if sequence
               quoted_sequence = quote_table_name(sequence)
 
-              query_value("SELECT setval(#{quote(quoted_sequence)}, #{value})", "SCHEMA")
+              internal_execute("SELECT setval(#{quote(quoted_sequence)}, #{value})", "SCHEMA")
             else
               @logger.warn "#{table} has primary key #{pk} with no default sequence." if @logger
             end
@@ -351,7 +351,7 @@ def reset_pk_sequence!(table, pk = nil, sequence = nil) # :nodoc:
               end
             end
 
-            query_value("SELECT setval(#{quote(quoted_sequence)}, #{max_pk || minvalue}, #{max_pk ? true : false})", "SCHEMA")
+            internal_execute("SELECT setval(#{quote(quoted_sequence)}, #{max_pk || minvalue}, #{max_pk ? true : false})", "SCHEMA")
           end
         end