Merge pull request #25522 from kamipo/fix_select_rows_method_signature_for_consistency

Fix `select_rows` method signature for consistency

1 files changed, 14 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
index 9a2017b443..705e6063dc 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
@@ -7,18 +7,14 @@ module ActiveRecord
           PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", binds))
         end
 
-        def select_value(arel, name = nil, binds = [])
-          arel, binds = binds_from_relation arel, binds
-          sql = to_sql(arel, binds)
-          execute_and_clear(sql, name, binds) do |result|
+        def select_value(arel, name = nil, binds = []) # :nodoc:
+          select_result(arel, name, binds) do |result|
             result.getvalue(0, 0) if result.ntuples > 0 && result.nfields > 0
           end
         end
 
-        def select_values(arel, name = nil, binds = [])
-          arel, binds = binds_from_relation arel, binds
-          sql = to_sql(arel, binds)
-          execute_and_clear(sql, name, binds) do |result|
+        def select_values(arel, name = nil, binds = []) # :nodoc:
+          select_result(arel, name, binds) do |result|
             if result.nfields > 0
               result.column_values(0)
             else
@@ -29,8 +25,8 @@ module ActiveRecord
 
         # Executes a SELECT query and returns an array of rows. Each row is an
         # array of field values.
-        def select_rows(sql, name = nil, binds = [])
-          execute_and_clear(sql, name, binds) do |result|
+        def select_rows(arel, name = nil, binds = []) # :nodoc:
+          select_result(arel, name, binds) do |result|
             result.values
           end
         end
@@ -179,6 +175,14 @@ module ActiveRecord
           def suppress_composite_primary_key(pk)
             pk unless pk.is_a?(Array)
           end
+
+          def select_result(arel, name, binds)
+            arel, binds = binds_from_relation(arel, binds)
+            sql = to_sql(arel, binds)
+            execute_and_clear(sql, name, binds) do |result|
+              yield result
+            end
+          end
       end
     end
   end