1 files changed, 25 insertions, 37 deletions
diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb
index db2f22750a..c43134bb50 100644
--- a/lib/arel/nodes.rb
+++ b/lib/arel/nodes.rb
@@ -1,49 +1,37 @@
+# node
 require 'arel/nodes/node'
+require 'arel/nodes/lock'
+require 'arel/nodes/select_statement'
+require 'arel/nodes/select_core'
+require 'arel/nodes/insert_statement'
+require 'arel/nodes/update_statement'
+
+# unary
 require 'arel/nodes/unary'
+require 'arel/nodes/unqualified_column'
+
+# binary
 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/in' # Why is this subclassed from equality?
+require 'arel/nodes/join_source'
+require 'arel/nodes/ordering'
+require 'arel/nodes/delete_statement'
+require 'arel/nodes/table_alias'
+
+# nary
 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/in'
-require 'arel/nodes/not_in'
-require 'arel/nodes/ordering'
-require 'arel/nodes/lock'
+# function
+# FIXME: Function + Alias can be rewritten as a Function and Alias node.
+# We should make Function a Unary node and deprecate the use of "aliaz"
 require 'arel/nodes/function'
 require 'arel/nodes/count'
 require 'arel/nodes/values'
-require 'arel/nodes/offset'
-require 'arel/nodes/limit'
-require 'arel/nodes/top'
-require 'arel/nodes/sum'
-require 'arel/nodes/exists'
-require 'arel/nodes/max'
-require 'arel/nodes/min'
-require 'arel/nodes/avg'
-require 'arel/nodes/having'
-require 'arel/nodes/sql_literal'
-require 'arel/nodes/select_core'
-require 'arel/nodes/select_statement'
-require 'arel/nodes/insert_statement'
-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'
+
+# joins
 require 'arel/nodes/inner_join'
 require 'arel/nodes/outer_join'
 require 'arel/nodes/string_join'
-require 'arel/nodes/on'
+
+require 'arel/nodes/sql_literal'