From ae547dc139179720a814ae21f43f3e0aaad97c5c Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 16 Aug 2010 17:26:12 -0700 Subject: OR nodes are somewhat working --- lib/arel/nodes.rb | 3 +++ lib/arel/nodes/binary.rb | 24 ++++++++++++++++++++++++ lib/arel/nodes/equality.rb | 13 +------------ lib/arel/nodes/or.rb | 6 ++++++ lib/arel/visitors/to_sql.rb | 4 ++++ 5 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 lib/arel/nodes/binary.rb create mode 100644 lib/arel/nodes/or.rb (limited to 'lib/arel') diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index d1868adfa9..12759a462f 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -1,4 +1,7 @@ +require 'arel/nodes/binary' require 'arel/nodes/equality' +require 'arel/nodes/or' + require 'arel/nodes/in' require 'arel/nodes/sql_literal' require 'arel/nodes/select_core' diff --git a/lib/arel/nodes/binary.rb b/lib/arel/nodes/binary.rb new file mode 100644 index 0000000000..44204d91e0 --- /dev/null +++ b/lib/arel/nodes/binary.rb @@ -0,0 +1,24 @@ +module Arel + module Nodes + class Binary + attr_accessor :left, :right + + def initialize left, right + @left = left + @right = right + end + + def or right + Nodes::Or.new self, right + end + + # FIXME: this method should go away. I don't like people calling + # to_sql on non-head nodes. This forces us to walk the AST until we + # can find a node that has a "relation" member. + def to_sql + viz = Visitors::ToSql.new left.relation.engine + viz.accept self + end + end + end +end diff --git a/lib/arel/nodes/equality.rb b/lib/arel/nodes/equality.rb index d778380054..b8d8281434 100644 --- a/lib/arel/nodes/equality.rb +++ b/lib/arel/nodes/equality.rb @@ -1,17 +1,6 @@ module Arel module Nodes - class Equality - attr_accessor :left, :right - - def initialize left, right - @left = left - @right = right - end - - def to_sql - viz = Visitors::ToSql.new left.relation.engine - viz.accept self - end + class Equality < Arel::Nodes::Binary end end end diff --git a/lib/arel/nodes/or.rb b/lib/arel/nodes/or.rb new file mode 100644 index 0000000000..bdf7f6d9b3 --- /dev/null +++ b/lib/arel/nodes/or.rb @@ -0,0 +1,6 @@ +module Arel + module Nodes + class Or < Arel::Nodes::Binary + end + end +end diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index b0fed4936b..9dc7696ad8 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -60,6 +60,10 @@ module Arel "#{visit o.left} IN (#{o.right.map { |x| quote visit x }.join ', '})" end + def visit_Arel_Nodes_Or o + "#{visit o.left} OR #{visit o.right}" + end + def visit_Arel_Nodes_Equality o "#{visit o.left} = #{quote visit o.right}" end -- cgit v1.2.3