From 4d8836f500f06d7bb299842ad4ef83ce2fc79d36 Mon Sep 17 00:00:00 2001 From: Nicholas Lee Date: Thu, 3 Jul 2025 11:41:23 -0700 Subject: [PATCH] fix: use internal_execute instead of execute_and_clear it was removed in https://github.com/rails/rails/commit/fd24e5bfc9540fc00764a59ddf39a993bbd63ba2 --- .../connection_adapters/cockroachdb_adapter.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/active_record/connection_adapters/cockroachdb_adapter.rb b/lib/active_record/connection_adapters/cockroachdb_adapter.rb index 027aa931..82944169 100644 --- a/lib/active_record/connection_adapters/cockroachdb_adapter.rb +++ b/lib/active_record/connection_adapters/cockroachdb_adapter.rb @@ -492,9 +492,8 @@ def load_additional_types(oids = nil) if @config[:use_follower_reads_for_type_introspection] initializer = OID::TypeMapInitializer.new(type_map) load_types_queries_with_aost(initializer, oids) do |query| - execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |records| - initializer.run(records) - end + records = internal_execute(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) + initializer.run(records) end else super @@ -550,9 +549,8 @@ def add_pg_decoders FROM pg_type as t AS OF SYSTEM TIME '-10s' WHERE t.typname IN (%s) SQL - coders = execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |result| - result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) } - end + result = internal_execute(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) + coders = result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) } map = PG::TypeMapByOid.new coders.each { |coder| map.add_coder(coder) }