aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-05-05 17:13:10 +0930
committerMatthew Draper <matthew@trebex.net>2015-05-05 17:13:10 +0930
commit2e9e90ded19c17303b41766f1374813ae8b956a9 (patch)
treeada043551b4ea09d35b9000d06c44bf71f8c31bd
parent4fa935124bc6fa2452de9e03e28c4b4dd24fdd08 (diff)
parent7bfc6ea1ef6963eeff39d1cdd4852a822371b528 (diff)
downloadrails-2e9e90ded19c17303b41766f1374813ae8b956a9.tar.gz
rails-2e9e90ded19c17303b41766f1374813ae8b956a9.tar.bz2
rails-2e9e90ded19c17303b41766f1374813ae8b956a9.zip
Merge pull request #20024 from kamipo/use_select_rows_instead_of_select_one_in_select_values
Use `select_rows` instead of `select_one` in `select_value`
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index 42c794c828..431fe25501 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -40,8 +40,9 @@ module ActiveRecord
# Returns a single value from a record
def select_value(arel, name = nil, binds = [])
- if result = select_one(arel, name, binds)
- result.values.first
+ arel, binds = binds_from_relation arel, binds
+ if result = select_rows(to_sql(arel, binds), name, binds).first
+ result.first
end
end