Skip to content

Commit f902999

Browse files
committed
Make TrilogyAdapter #each_hash and #error_number private
They were never meant to be public.
1 parent f69bbcb commit f902999

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

activerecord/lib/active_record/connection_adapters/trilogy_adapter.rb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -230,28 +230,28 @@ def execute(sql, name = nil, allow_retry: false)
230230
raw_execute(sql, name, allow_retry: allow_retry)
231231
end
232232

233-
def each_hash(result)
234-
return to_enum(:each_hash, result) unless block_given?
235-
236-
keys = result.fields.map(&:to_sym)
237-
result.rows.each do |row|
238-
hash = {}
239-
idx = 0
240-
row.each do |value|
241-
hash[keys[idx]] = value
242-
idx += 1
233+
private
234+
def each_hash(result)
235+
return to_enum(:each_hash, result) unless block_given?
236+
237+
keys = result.fields.map(&:to_sym)
238+
result.rows.each do |row|
239+
hash = {}
240+
idx = 0
241+
row.each do |value|
242+
hash[keys[idx]] = value
243+
idx += 1
244+
end
245+
yield hash
243246
end
244-
yield hash
245-
end
246247

247-
nil
248-
end
248+
nil
249+
end
249250

250-
def error_number(exception)
251-
exception.error_code if exception.respond_to?(:error_code)
252-
end
251+
def error_number(exception)
252+
exception.error_code if exception.respond_to?(:error_code)
253+
end
253254

254-
private
255255
def connection
256256
@raw_connection
257257
end

activerecord/test/cases/adapters/trilogy/trilogy_adapter_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class TrilogyAdapterTest < ActiveRecord::TrilogyTestCase
319319
exception = Minitest::Mock.new
320320
exception.expect :error_code, 123
321321

322-
assert_equal 123, @conn.error_number(exception)
322+
assert_equal 123, @conn.send(:error_number, exception)
323323
end
324324

325325
def assert_raises_with_message(exception, message, &block)

0 commit comments

Comments
 (0)