From 0ee2c81e486e2b7155db75c6eb75fbd918e34386 Mon Sep 17 00:00:00 2001 From: Jiri Pospisil Date: Thu, 12 Jun 2014 18:32:26 +0200 Subject: Make sure Arel::SelectManager is not mistaken for an attribute --- lib/arel/nodes.rb | 2 +- test/attributes/test_attribute.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index a68e327983..59cfc04dc2 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -78,7 +78,7 @@ module Arel def self.build_quoted other, attribute = nil case other - when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Nodes::SelectStatement, Arel::Table, Arel::Nodes::BindParam + when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Nodes::SelectStatement, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager other else case attribute diff --git a/test/attributes/test_attribute.rb b/test/attributes/test_attribute.rb index 145da98968..38ee189a46 100644 --- a/test/attributes/test_attribute.rb +++ b/test/attributes/test_attribute.rb @@ -74,6 +74,17 @@ module Arel SELECT "users"."id" FROM "users" WHERE "users"."id" > 10 } end + + it 'should handle comparing with a subquery' do + users = Table.new(:users) + + avg = users.project(users[:karma].average) + mgr = users.project(Arel.star).where(users[:karma].gt(avg)) + + mgr.to_sql.must_be_like %{ + SELECT * FROM "users" WHERE "users"."karma" > (SELECT AVG("users"."karma") AS avg_id FROM "users") + } + end end describe '#gt_any' do -- cgit v1.2.3 From 99d6646e8ad9499ee54c703d21e6c9c5fb233965 Mon Sep 17 00:00:00 2001 From: Jiri Pospisil Date: Thu, 12 Jun 2014 18:34:14 +0200 Subject: No need to check for SelectStatement as it's a descendant of Node --- lib/arel/nodes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index 59cfc04dc2..c6bde8c3cc 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -78,7 +78,7 @@ module Arel def self.build_quoted other, attribute = nil case other - when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Nodes::SelectStatement, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager + when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager other else case attribute -- cgit v1.2.3