aboutsummaryrefslogtreecommitdiffstats
path: root/lib/active_relation
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-12 20:34:18 -0800
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-12 20:34:18 -0800
commit0cba6cde9958969933da79626d00464f7d07b22f (patch)
tree52ed24a8752e8c49ed629b7f6ee8bfd5ebe7bfab /lib/active_relation
parent19a63d1acfc9b7668bc19fa2796d4e11a2180cef (diff)
downloadrails-0cba6cde9958969933da79626d00464f7d07b22f.tar.gz
rails-0cba6cde9958969933da79626d00464f7d07b22f.tar.bz2
rails-0cba6cde9958969933da79626d00464f7d07b22f.zip
bug with aggregation to_Sql
Diffstat (limited to 'lib/active_relation')
-rw-r--r--lib/active_relation/extensions/base.rb1
-rw-r--r--lib/active_relation/primitives/aggregation.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/active_relation/extensions/base.rb b/lib/active_relation/extensions/base.rb
index 8fe00146d2..0115586b00 100644
--- a/lib/active_relation/extensions/base.rb
+++ b/lib/active_relation/extensions/base.rb
@@ -21,7 +21,6 @@ class ActiveRecord::Base
end
# all of the below disables normal AR behavior. It's rather destructive and purely for demonstration purposes (see scratch_spec).
-
class ActiveRecord::Associations::BelongsToAssociation
def instantiate(record, joins = [])
@target = proxy_reflection.klass.instantiate(record, joins)
diff --git a/lib/active_relation/primitives/aggregation.rb b/lib/active_relation/primitives/aggregation.rb
index 20fdcf46c5..a3c7747165 100644
--- a/lib/active_relation/primitives/aggregation.rb
+++ b/lib/active_relation/primitives/aggregation.rb
@@ -10,7 +10,7 @@ module ActiveRelation
end
def to_sql(options = {})
- "#{function_sql}(@attribute.to_sql)"
+ "#{function_sql}(#{@attribute.to_sql})"
end
def ==(other)