Skip to content

fix: use internal_execute instead of execute_and_clear #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2025
Merged

fix: use internal_execute instead of execute_and_clear #377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/active_record/connection_adapters/cockroachdb_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) }
Expand Down