Skip to content

Commit f01c835

Browse files
Maimerrafiss
authored andcommitted
fix: use internal_execute instead of execute_and_clear
it was removed in rails/rails@fd24e5b
1 parent b010da1 commit f01c835

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

lib/active_record/connection_adapters/cockroachdb_adapter.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,8 @@ def load_additional_types(oids = nil)
492492
if @config[:use_follower_reads_for_type_introspection]
493493
initializer = OID::TypeMapInitializer.new(type_map)
494494
load_types_queries_with_aost(initializer, oids) do |query|
495-
execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |records|
496-
initializer.run(records)
497-
end
495+
records = internal_execute(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false)
496+
initializer.run(records)
498497
end
499498
else
500499
super
@@ -550,9 +549,8 @@ def add_pg_decoders
550549
FROM pg_type as t AS OF SYSTEM TIME '-10s'
551550
WHERE t.typname IN (%s)
552551
SQL
553-
coders = execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |result|
554-
result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
555-
end
552+
result = internal_execute(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false)
553+
coders = result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
556554

557555
map = PG::TypeMapByOid.new
558556
coders.each { |coder| map.add_coder(coder) }

0 commit comments

Comments
 (0)