aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/nodes.rb8
-rw-r--r--lib/arel/nodes/binary.rb9
-rw-r--r--lib/arel/nodes/does_not_match.rb6
-rw-r--r--lib/arel/nodes/join.rb13
-rw-r--r--lib/arel/nodes/join_source.rb6
-rw-r--r--lib/arel/nodes/not_in.rb6
6 files changed, 12 insertions, 36 deletions
diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb
index ef1db0cfa2..83977c356a 100644
--- a/lib/arel/nodes.rb
+++ b/lib/arel/nodes.rb
@@ -1,17 +1,16 @@
require 'arel/nodes/node'
require 'arel/nodes/unary'
require 'arel/nodes/binary'
+
require 'arel/nodes/equality'
require 'arel/nodes/and'
+require 'arel/nodes/in'
+require 'arel/nodes/lock'
require 'arel/nodes/not'
-require 'arel/nodes/does_not_match'
require 'arel/nodes/join_source'
-require 'arel/nodes/in'
-require 'arel/nodes/not_in'
require 'arel/nodes/ordering'
-require 'arel/nodes/lock'
require 'arel/nodes/function'
require 'arel/nodes/count'
require 'arel/nodes/values'
@@ -30,7 +29,6 @@ require 'arel/nodes/update_statement'
require 'arel/nodes/delete_statement'
require 'arel/nodes/unqualified_column'
require 'arel/nodes/table_alias'
-require 'arel/nodes/join'
require 'arel/nodes/group'
require 'arel/nodes/grouping'
require 'arel/nodes/inner_join'
diff --git a/lib/arel/nodes/binary.rb b/lib/arel/nodes/binary.rb
index 43979f6f2e..1285af9447 100644
--- a/lib/arel/nodes/binary.rb
+++ b/lib/arel/nodes/binary.rb
@@ -7,6 +7,12 @@ module Arel
@left = left
@right = right
end
+
+ def initialize_copy other
+ super
+ @left = @left.clone if @left
+ @right = @right.clone if @right
+ end
end
%w{
@@ -20,6 +26,9 @@ module Arel
LessThan
LessThanOrEqual
Matches
+ DoesNotMatch
+ NotIn
+ Join
}.each do |name|
const_set(name, Class.new(Binary))
end
diff --git a/lib/arel/nodes/does_not_match.rb b/lib/arel/nodes/does_not_match.rb
deleted file mode 100644
index 33bdeab005..0000000000
--- a/lib/arel/nodes/does_not_match.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Arel
- module Nodes
- class DoesNotMatch < Arel::Nodes::Binary
- end
- end
-end
diff --git a/lib/arel/nodes/join.rb b/lib/arel/nodes/join.rb
deleted file mode 100644
index d3307fe0e0..0000000000
--- a/lib/arel/nodes/join.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Arel
- module Nodes
- class Join < Arel::Nodes::Binary
-
- alias :single_source :left
- alias :constraint :right
-
- def initialize single_source, constraint
- super
- end
- end
- end
-end
diff --git a/lib/arel/nodes/join_source.rb b/lib/arel/nodes/join_source.rb
index 7b739c19ad..c57ad0e930 100644
--- a/lib/arel/nodes/join_source.rb
+++ b/lib/arel/nodes/join_source.rb
@@ -9,12 +9,6 @@ module Arel
def initialize single_source, joinop = []
super
end
-
- def initialize_copy other
- super
- @left = @left.clone if @left
- @right = @right.clone if @right
- end
end
end
end
diff --git a/lib/arel/nodes/not_in.rb b/lib/arel/nodes/not_in.rb
deleted file mode 100644
index 6c01921a46..0000000000
--- a/lib/arel/nodes/not_in.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Arel
- module Nodes
- class NotIn < Arel::Nodes::Binary
- end
- end
-end