aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-15 13:07:03 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-15 13:07:03 -0200
commit63970dc7db273551f977483109dde936c8a7554f (patch)
tree483506262d05bb4d0d59b2f39c375be6cb559ca6 /activerecord/lib/active_record/connection_adapters
parent823604ec1659109eedeb2db91de325d413c73452 (diff)
parentcfa4c640402f536da896b231506681fb3a96a0d4 (diff)
downloadrails-63970dc7db273551f977483109dde936c8a7554f.tar.gz
rails-63970dc7db273551f977483109dde936c8a7554f.tar.bz2
rails-63970dc7db273551f977483109dde936c8a7554f.zip
Merge branch 'revert-binds-3-2' into 3-2-stable
This has been resulting in some hard to track bugs and is introducing a possible breackage in a stable version. The issue it currently "fixes" should be handled in some other way. Closes #8743. Related to #7983.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb9
1 files changed, 4 insertions, 5 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 c49aed7069..2703c2ed70 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -4,7 +4,6 @@ module ActiveRecord
# Converts an arel AST to SQL
def to_sql(arel, binds = [])
if arel.respond_to?(:ast)
- binds = binds.dup
visitor.accept(arel.ast) do
quote(*binds.shift.reverse)
end
@@ -21,14 +20,14 @@ module ActiveRecord
# Returns a record hash with the column names as keys and column values
# as values.
- def select_one(arel, name = nil, binds = [])
- result = select_all(arel, name, binds)
+ def select_one(arel, name = nil)
+ result = select_all(arel, name)
result.first if result
end
# Returns a single value from a record
- def select_value(arel, name = nil, binds = [])
- if result = select_one(arel, name, binds)
+ def select_value(arel, name = nil)
+ if result = select_one(arel, name)
result.values.first
end
end