From a7507d845a3b560895bbb0df3ce94fa033caa141 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 14 Dec 2010 18:13:06 -0800 Subject: removing more nodes! --- Manifest.txt | 10 ---------- lib/arel/nodes.rb | 11 +---------- lib/arel/nodes/and.rb | 2 +- lib/arel/nodes/binary.rb | 15 +++++++++++++++ lib/arel/nodes/greater_than.rb | 6 ------ lib/arel/nodes/greater_than_or_equal.rb | 6 ------ lib/arel/nodes/less_than.rb | 6 ------ lib/arel/nodes/less_than_or_equal.rb | 6 ------ lib/arel/nodes/matches.rb | 6 ------ 9 files changed, 17 insertions(+), 51 deletions(-) delete mode 100644 lib/arel/nodes/greater_than.rb delete mode 100644 lib/arel/nodes/greater_than_or_equal.rb delete mode 100644 lib/arel/nodes/less_than.rb delete mode 100644 lib/arel/nodes/less_than_or_equal.rb delete mode 100644 lib/arel/nodes/matches.rb diff --git a/Manifest.txt b/Manifest.txt index 3735d85481..7d9010e783 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -18,10 +18,7 @@ lib/arel/factory_methods.rb lib/arel/insert_manager.rb lib/arel/nodes.rb lib/arel/nodes/and.rb -lib/arel/nodes/as.rb -lib/arel/nodes/assignment.rb lib/arel/nodes/avg.rb -lib/arel/nodes/between.rb lib/arel/nodes/binary.rb lib/arel/nodes/count.rb lib/arel/nodes/delete_statement.rb @@ -29,8 +26,6 @@ lib/arel/nodes/does_not_match.rb lib/arel/nodes/equality.rb lib/arel/nodes/exists.rb lib/arel/nodes/function.rb -lib/arel/nodes/greater_than.rb -lib/arel/nodes/greater_than_or_equal.rb lib/arel/nodes/group.rb lib/arel/nodes/grouping.rb lib/arel/nodes/having.rb @@ -39,19 +34,14 @@ lib/arel/nodes/inner_join.rb lib/arel/nodes/insert_statement.rb lib/arel/nodes/join.rb lib/arel/nodes/join_source.rb -lib/arel/nodes/less_than.rb -lib/arel/nodes/less_than_or_equal.rb lib/arel/nodes/lock.rb -lib/arel/nodes/matches.rb lib/arel/nodes/max.rb lib/arel/nodes/min.rb lib/arel/nodes/node.rb lib/arel/nodes/not.rb -lib/arel/nodes/not_equal.rb lib/arel/nodes/not_in.rb lib/arel/nodes/offset.rb lib/arel/nodes/on.rb -lib/arel/nodes/or.rb lib/arel/nodes/ordering.rb lib/arel/nodes/outer_join.rb lib/arel/nodes/select_core.rb diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index 4cc93d7de4..ef1db0cfa2 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -2,18 +2,9 @@ require 'arel/nodes/node' require 'arel/nodes/unary' require 'arel/nodes/binary' require 'arel/nodes/equality' -require 'arel/nodes/between' -require 'arel/nodes/not_equal' -require 'arel/nodes/assignment' -require 'arel/nodes/or' require 'arel/nodes/and' -require 'arel/nodes/as' + require 'arel/nodes/not' -require 'arel/nodes/greater_than' -require 'arel/nodes/greater_than_or_equal' -require 'arel/nodes/less_than' -require 'arel/nodes/less_than_or_equal' -require 'arel/nodes/matches' require 'arel/nodes/does_not_match' require 'arel/nodes/join_source' diff --git a/lib/arel/nodes/and.rb b/lib/arel/nodes/and.rb index b087a10930..b4443c3d27 100644 --- a/lib/arel/nodes/and.rb +++ b/lib/arel/nodes/and.rb @@ -1,6 +1,6 @@ module Arel module Nodes - class And < Arel::Nodes::Binary + class And < Arel::Nodes::Node attr_reader :children def initialize children, right = nil diff --git a/lib/arel/nodes/binary.rb b/lib/arel/nodes/binary.rb index cfa75909c5..43979f6f2e 100644 --- a/lib/arel/nodes/binary.rb +++ b/lib/arel/nodes/binary.rb @@ -8,5 +8,20 @@ module Arel @right = right end end + + %w{ + Between + NotEqual + Assignment + Or + As + GreaterThan + GreaterThanOrEqual + LessThan + LessThanOrEqual + Matches + }.each do |name| + const_set(name, Class.new(Binary)) + end end end diff --git a/lib/arel/nodes/greater_than.rb b/lib/arel/nodes/greater_than.rb deleted file mode 100644 index 2e03cc2e18..0000000000 --- a/lib/arel/nodes/greater_than.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Arel - module Nodes - class GreaterThan < Arel::Nodes::Binary - end - end -end diff --git a/lib/arel/nodes/greater_than_or_equal.rb b/lib/arel/nodes/greater_than_or_equal.rb deleted file mode 100644 index a8cfaab04e..0000000000 --- a/lib/arel/nodes/greater_than_or_equal.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Arel - module Nodes - class GreaterThanOrEqual < Arel::Nodes::Binary - end - end -end diff --git a/lib/arel/nodes/less_than.rb b/lib/arel/nodes/less_than.rb deleted file mode 100644 index cfaf716c42..0000000000 --- a/lib/arel/nodes/less_than.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Arel - module Nodes - class LessThan < Arel::Nodes::Binary - end - end -end diff --git a/lib/arel/nodes/less_than_or_equal.rb b/lib/arel/nodes/less_than_or_equal.rb deleted file mode 100644 index 55449d12f1..0000000000 --- a/lib/arel/nodes/less_than_or_equal.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Arel - module Nodes - class LessThanOrEqual < Arel::Nodes::Binary - end - end -end diff --git a/lib/arel/nodes/matches.rb b/lib/arel/nodes/matches.rb deleted file mode 100644 index 5ef8ac8302..0000000000 --- a/lib/arel/nodes/matches.rb +++ /dev/null @@ -1,6 +0,0 @@ -module Arel - module Nodes - class Matches < Arel::Nodes::Binary - end - end -end -- cgit v1.2.3