arel 2.0.4 → 2.0.5

data/History.txt

@@ -1,3 +1,21 @@
+== 2.0.5 11/30/2010
+
+* Enhancements
+
+  * Arel::Visitors::DepthFirst can walk your AST depth first
+  * Arel::Nodes::Node is enumerable, depth first
+
+* Bug fixes
+
+  * #lock will lock SELECT statements "FOR UPDATE" on mysql
+  * Nodes::Node#not factory method added for creating Nodes::Not nodes
+  * Added an As node
+
+* Deprecations
+
+  * Support for Subclasses of core classes will be removed in ARel version
+    2.2.0
+
 == 2.0.4
 
 * Bug fixes

data/Manifest.txt

@@ -17,6 +17,7 @@ lib/arel/expressions.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
@@ -43,6 +44,7 @@ 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
@@ -56,6 +58,7 @@ lib/arel/nodes/sql_literal.rb
 lib/arel/nodes/string_join.rb
 lib/arel/nodes/sum.rb
 lib/arel/nodes/table_alias.rb
+lib/arel/nodes/unary.rb
 lib/arel/nodes/unqualified_column.rb
 lib/arel/nodes/update_statement.rb
 lib/arel/nodes/values.rb
@@ -68,6 +71,7 @@ lib/arel/table.rb
 lib/arel/tree_manager.rb
 lib/arel/update_manager.rb
 lib/arel/visitors.rb
+lib/arel/visitors/depth_first.rb
 lib/arel/visitors/dot.rb
 lib/arel/visitors/join_sql.rb
 lib/arel/visitors/mysql.rb
@@ -80,10 +84,13 @@ lib/arel/visitors/visitor.rb
 lib/arel/visitors/where_sql.rb
 test/attributes/test_attribute.rb
 test/helper.rb
+test/nodes/test_as.rb
 test/nodes/test_count.rb
 test/nodes/test_delete_statement.rb
 test/nodes/test_equality.rb
 test/nodes/test_insert_statement.rb
+test/nodes/test_node.rb
+test/nodes/test_not.rb
 test/nodes/test_or.rb
 test/nodes/test_select_core.rb
 test/nodes/test_select_statement.rb
@@ -99,6 +106,7 @@ test/test_insert_manager.rb
 test/test_select_manager.rb
 test/test_table.rb
 test/test_update_manager.rb
+test/visitors/test_depth_first.rb
 test/visitors/test_join_sql.rb
 test/visitors/test_mysql.rb
 test/visitors/test_oracle.rb

data/Rakefile

@@ -2,6 +2,7 @@ require "rubygems"
 gem 'hoe', '>= 2.1.0'
 require 'hoe'
 
+Hoe.plugins.delete :rubyforge
 Hoe.plugin :minitest
 Hoe.plugin :gemspec # `gem install hoe-gemspec`
 Hoe.plugin :git     # `gem install hoe-git`

data/arel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.0.2.20101111111102"
+  s.version = "2.0.4.20101119081136"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = %q{2010-11-11}
+  s.date = %q{2010-11-19}
   s.description = %q{Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.}
   s.email = ["aaron@tenderlovemaking.com", "bryan@brynary.com", "miloops@gmail.com", "nick@example.org"]
   s.extra_rdoc_files = ["History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown"]

data/lib/arel.rb

@@ -21,6 +21,7 @@ require 'arel/update_manager'
 require 'arel/delete_manager'
 require 'arel/nodes'
 
+
 #### these are deprecated
 require 'arel/deprecated'
 require 'arel/sql/engine'
@@ -28,9 +29,11 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql
   end
+  ## Convenience Alias
+  Node = Arel::Nodes::Node
 end

data/lib/arel/nodes.rb

@@ -1,4 +1,5 @@
 require 'arel/nodes/node'
+require 'arel/nodes/unary'
 require 'arel/nodes/binary'
 require 'arel/nodes/equality'
 require 'arel/nodes/between'
@@ -6,6 +7,8 @@ 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'

data/lib/arel/nodes/as.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class As < Arel::Nodes::Binary
+    end
+  end
+end

data/lib/arel/nodes/delete_statement.rb

@@ -1,16 +1,18 @@
 module Arel
   module Nodes
-    class DeleteStatement
-      attr_accessor :relation, :wheres
+    class DeleteStatement < Arel::Nodes::Binary
+      alias :relation :left
+      alias :relation= :left=
+      alias :wheres :right
+      alias :wheres= :right=
 
-      def initialize
-        @from   = nil
-        @wheres = []
+      def initialize relation = nil, wheres = []
+        super
       end
 
       def initialize_copy other
         super
-        @wheres = @wheres.clone
+        @right = @right.clone
       end
     end
   end

data/lib/arel/nodes/group.rb

@@ -1,11 +1,6 @@
 module Arel
   module Nodes
-    class Group
-      attr_accessor :expr
-
-      def initialize expr
-        @expr = expr
-      end
+    class Group < Arel::Nodes::Unary
     end
   end
 end

data/lib/arel/nodes/grouping.rb

@@ -1,11 +1,6 @@
 module Arel
   module Nodes
-    class Grouping < Arel::Nodes::Node
-      attr_accessor :expr
-
-      def initialize expression
-        @expr = expression
-      end
+    class Grouping < Arel::Nodes::Unary
     end
   end
 end

data/lib/arel/nodes/having.rb

@@ -1,11 +1,6 @@
 module Arel
   module Nodes
-    class Having
-      attr_accessor :expr
-
-      def initialize expr
-        @expr = expr
-      end
+    class Having < Arel::Nodes::Unary
     end
   end
 end

data/lib/arel/nodes/insert_statement.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class InsertStatement
+    class InsertStatement < Arel::Nodes::Node
       attr_accessor :relation, :columns, :values
 
       def initialize

data/lib/arel/nodes/join.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class Join
+    class Join < Arel::Nodes::Node
       attr_accessor :left, :right, :constraint
 
       def initialize left, right, constraint

data/lib/arel/nodes/lock.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class Lock
+    class Lock < Arel::Nodes::Node
     end
   end
 end

data/lib/arel/nodes/node.rb

@@ -3,6 +3,15 @@ module Arel
     ###
     # Abstract base class for all AST nodes
     class Node
+      include Enumerable
+
+      ###
+      # Factory method to create a Nodes::Not node that has the recipient of
+      # the caller as a child.
+      def not
+        Nodes::Not.new self
+      end
+
       ###
       # Factory method to create a Nodes::Grouping node that has an Nodes::Or
       # node as a child.
@@ -25,6 +34,13 @@ module Arel
         viz = Visitors.for engine
         viz.accept self
       end
+
+      # Iterate through AST, nodes will be yielded depth-first
+      def each &block
+        return enum_for(:each) unless block_given?
+
+        Visitors::DepthFirst.new(block).accept self
+      end
     end
   end
 end

data/lib/arel/nodes/not.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class Not < Arel::Nodes::Unary
+    end
+  end
+end

data/lib/arel/nodes/offset.rb

@@ -1,11 +1,7 @@
 module Arel
   module Nodes
-    class Offset
-      attr_accessor :value
-
-      def initialize value
-        @value = value
-      end
+    class Offset < Arel::Nodes::Unary
+      alias :value :expr
     end
   end
 end

data/lib/arel/nodes/on.rb

@@ -1,11 +1,6 @@
 module Arel
   module Nodes
-    class On
-      attr_accessor :expr
-
-      def initialize expr
-        @expr = expr
-      end
+    class On < Arel::Nodes::Unary
     end
   end
 end

data/lib/arel/nodes/ordering.rb

@@ -1,10 +1,11 @@
 module Arel
   module Nodes
-    class Ordering < Arel::Nodes::Node
-      attr_accessor :expr, :direction
+    class Ordering < Arel::Nodes::Binary
+      alias :expr :left
+      alias :direction :right
 
-      def initialize expression, direction = :asc
-        @expr, @direction = expression, direction
+      def initialize expr, direction = :asc
+        super
       end
 
       def ascending?

data/lib/arel/nodes/select_core.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class SelectCore
+    class SelectCore < Arel::Nodes::Node
       attr_accessor :froms, :projections, :wheres, :groups
       attr_accessor :having
 

data/lib/arel/nodes/select_statement.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class SelectStatement
+    class SelectStatement < Arel::Nodes::Node
       attr_reader :cores
       attr_accessor :limit, :orders, :lock, :offset
 

data/lib/arel/nodes/table_alias.rb

@@ -1,20 +1,12 @@
 module Arel
   module Nodes
-    class TableAlias
-      attr_reader :name, :relation, :columns
+    class TableAlias < Arel::Nodes::Binary
+      alias :name :left
+      alias :relation :right
       alias :table_alias :name
 
-      def initialize name, relation
-        @name     = name
-        @relation = relation
-        @columns  = relation.columns.map { |column|
-          column.dup.tap { |col| col.relation = self }
-        }
-      end
-
       def [] name
-        name = name.to_sym
-        columns.find { |column| column.name == name }
+        Attribute.new self, name
       end
     end
   end

data/lib/arel/nodes/unary.rb

@@ -0,0 +1,11 @@
+module Arel
+  module Nodes
+    class Unary < Arel::Nodes::Node
+      attr_accessor :expr
+
+      def initialize expr
+        @expr = expr
+      end
+    end
+  end
+end

data/lib/arel/nodes/unqualified_column.rb

@@ -1,18 +1,15 @@
 module Arel
   module Nodes
-    class UnqualifiedColumn
-      attr_accessor :attribute
-
-      def initialize attribute
-        @attribute = attribute
-      end
+    class UnqualifiedColumn < Arel::Nodes::Unary
+      alias :attribute :expr
+      alias :attribute= :expr=
 
       def column
-        @attribute.column
+        @expr.column
       end
 
       def name
-        @attribute.name
+        @expr.name
       end
     end
   end

data/lib/arel/nodes/update_statement.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class UpdateStatement
+    class UpdateStatement < Arel::Nodes::Node
       attr_accessor :relation, :wheres, :values, :orders, :limit
 
       def initialize

data/lib/arel/nodes/values.rb

@@ -1,11 +1,13 @@
 module Arel
   module Nodes
-    class Values
-      attr_accessor :expressions, :columns
+    class Values < Arel::Nodes::Binary
+      alias :expressions :left
+      alias :expressions= :left=
+      alias :columns :right
+      alias :columns= :right=
 
       def initialize exprs, columns = []
-        @expressions = exprs
-        @columns = columns
+        super
       end
     end
   end

data/lib/arel/predications.rb

@@ -1,5 +1,9 @@
 module Arel
   module Predications
+    def as other
+      Nodes::As.new self, other
+    end
+
     def not_eq other
       Nodes::NotEqual.new self, other
     end
@@ -174,4 +178,4 @@ module Arel
       }
     end
   end
-end
+end

data/lib/arel/table.rb

@@ -34,8 +34,8 @@ module Arel
       end
     end
 
-    def alias
-      Nodes::TableAlias.new("#{name}_2", self).tap do |node|
+    def alias name = "#{self.name}_2"
+      Nodes::TableAlias.new(name, self).tap do |node|
         @aliases << node
       end
     end

data/lib/arel/visitors.rb

@@ -1,4 +1,5 @@
 require 'arel/visitors/visitor'
+require 'arel/visitors/depth_first'
 require 'arel/visitors/to_sql'
 require 'arel/visitors/sqlite'
 require 'arel/visitors/postgresql'

data/lib/arel/visitors/depth_first.rb

@@ -0,0 +1,152 @@
+module Arel
+  module Visitors
+    class DepthFirst < Arel::Visitors::Visitor
+      def initialize block = nil
+        @block = block || Proc.new
+      end
+
+      private
+
+      def visit o
+        super
+        @block.call o
+      end
+
+      def unary o
+        visit o.expr
+      end
+      alias :visit_Arel_Nodes_Group             :unary
+      alias :visit_Arel_Nodes_Grouping          :unary
+      alias :visit_Arel_Nodes_Having            :unary
+      alias :visit_Arel_Nodes_Not               :unary
+      alias :visit_Arel_Nodes_Offset            :unary
+      alias :visit_Arel_Nodes_On                :unary
+      alias :visit_Arel_Nodes_UnqualifiedColumn :unary
+
+      def function o
+        visit o.expressions
+        visit o.alias
+      end
+      alias :visit_Arel_Nodes_Avg    :function
+      alias :visit_Arel_Nodes_Exists :function
+      alias :visit_Arel_Nodes_Max    :function
+      alias :visit_Arel_Nodes_Min    :function
+      alias :visit_Arel_Nodes_Sum    :function
+
+      def visit_Arel_Nodes_Count o
+        visit o.expressions
+        visit o.alias
+        visit o.distinct
+      end
+
+      def join o
+        visit o.left
+        visit o.right
+        visit o.constraint
+      end
+      alias :visit_Arel_Nodes_InnerJoin :join
+      alias :visit_Arel_Nodes_OuterJoin :join
+
+      def binary o
+        visit o.left
+        visit o.right
+      end
+      alias :visit_Arel_Nodes_And                :binary
+      alias :visit_Arel_Nodes_As                 :binary
+      alias :visit_Arel_Nodes_Assignment         :binary
+      alias :visit_Arel_Nodes_Between            :binary
+      alias :visit_Arel_Nodes_DeleteStatement    :binary
+      alias :visit_Arel_Nodes_DoesNotMatch       :binary
+      alias :visit_Arel_Nodes_Equality           :binary
+      alias :visit_Arel_Nodes_GreaterThan        :binary
+      alias :visit_Arel_Nodes_GreaterThanOrEqual :binary
+      alias :visit_Arel_Nodes_In                 :binary
+      alias :visit_Arel_Nodes_LessThan           :binary
+      alias :visit_Arel_Nodes_LessThanOrEqual    :binary
+      alias :visit_Arel_Nodes_Matches            :binary
+      alias :visit_Arel_Nodes_NotEqual           :binary
+      alias :visit_Arel_Nodes_NotIn              :binary
+      alias :visit_Arel_Nodes_Or                 :binary
+      alias :visit_Arel_Nodes_Ordering           :binary
+      alias :visit_Arel_Nodes_StringJoin         :binary
+      alias :visit_Arel_Nodes_TableAlias         :binary
+      alias :visit_Arel_Nodes_Values             :binary
+
+      def visit_Arel_Attribute o
+        visit o.relation
+        visit o.name
+      end
+      alias :visit_Arel_Attributes_Integer :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Float :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_String :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Time :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Boolean :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Attribute :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Decimal :visit_Arel_Attribute
+
+      def visit_Arel_Table o
+        visit o.name
+      end
+
+      def terminal o
+      end
+      alias :visit_ActiveSupport_Multibyte_Chars :terminal
+      alias :visit_ActiveSupport_StringInquirer  :terminal
+      alias :visit_Arel_Nodes_Lock               :terminal
+      alias :visit_Arel_Nodes_Node               :terminal
+      alias :visit_Arel_Nodes_SqlLiteral         :terminal
+      alias :visit_Arel_SqlLiteral               :terminal
+      alias :visit_BigDecimal                    :terminal
+      alias :visit_Bignum                        :terminal
+      alias :visit_Class                         :terminal
+      alias :visit_Date                          :terminal
+      alias :visit_DateTime                      :terminal
+      alias :visit_FalseClass                    :terminal
+      alias :visit_Fixnum                        :terminal
+      alias :visit_Float                         :terminal
+      alias :visit_NilClass                      :terminal
+      alias :visit_String                        :terminal
+      alias :visit_Symbol                        :terminal
+      alias :visit_Time                          :terminal
+      alias :visit_TrueClass                     :terminal
+
+      def visit_Arel_Nodes_InsertStatement o
+        visit o.relation
+        visit o.columns
+        visit o.values
+      end
+
+      def visit_Arel_Nodes_SelectCore o
+        visit o.projections
+        visit o.froms
+        visit o.wheres
+        visit o.groups
+        visit o.having
+      end
+
+      def visit_Arel_Nodes_SelectStatement o
+        visit o.cores
+        visit o.orders
+        visit o.limit
+        visit o.lock
+        visit o.offset
+      end
+
+      def visit_Arel_Nodes_UpdateStatement o
+        visit o.relation
+        visit o.values
+        visit o.wheres
+        visit o.orders
+        visit o.limit
+      end
+
+      def visit_Array o
+        o.each { |i| visit i }
+      end
+
+      def visit_Hash o
+        o.each { |k,v| visit(k); visit(v) }
+      end
+    end
+  end
+end

data/lib/arel/visitors/mysql.rb

@@ -2,6 +2,10 @@ module Arel
   module Visitors
     class MySQL < Arel::Visitors::ToSql
       private
+      def visit_Arel_Nodes_Lock o
+        "FOR UPDATE"
+      end
+
       ###
       # :'(
       # http://dev.mysql.com/doc/refman/5.0/en/select.html#id3482214

data/lib/arel/visitors/to_sql.rb

@@ -97,7 +97,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_Offset o
-        "OFFSET #{visit o.value}"
+        "OFFSET #{visit o.expr}"
       end
 
       # FIXME: this does nothing on SQLLite3, but should do things on other
@@ -191,6 +191,10 @@ module Arel
         "ON #{visit o.expr}"
       end
 
+      def visit_Arel_Nodes_Not o
+        "NOT #{visit o.expr}"
+      end
+
       def visit_Arel_Table o
         if o.table_alias
           "#{quote_table_name o.name} #{quote_table_name o.table_alias}"
@@ -246,6 +250,10 @@ module Arel
         end
       end
 
+      def visit_Arel_Nodes_As o
+        "#{visit o.left} AS #{visit o.right}"
+      end
+
       def visit_Arel_Nodes_UnqualifiedColumn o
         "#{quote_column_name o.name}"
       end

data/lib/arel/visitors/visitor.rb

@@ -8,11 +8,18 @@ module Arel
       private
 
       DISPATCH = Hash.new do |hash, klass|
-        hash[klass] = "visit_#{klass.name.gsub('::', '_')}"
+        hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
       end
 
       def visit object
         send DISPATCH[object.class], object
+      rescue NoMethodError
+        warn "visiting #{object.class} via superclass, this will be removed in arel 2.2.0" if $VERBOSE
+        superklass = object.class.ancestors.find { |klass|
+          respond_to?(DISPATCH[klass], true)
+        }
+        DISPATCH[object.class] = DISPATCH[superklass]
+        retry
       end
     end
   end

data/test/nodes/test_as.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+module Arel
+  module Nodes
+    describe 'As' do
+      describe '#as' do
+        it 'makes an AS node' do
+          attr = Table.new(:users)[:id]
+          as = attr.as(Arel.sql('foo'))
+          assert_equal attr, as.left
+          assert_equal 'foo', as.right
+        end
+      end
+    end
+  end
+end

data/test/nodes/test_node.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+module Arel
+  class TestNode < MiniTest::Unit::TestCase
+    def test_all_nodes_are_nodes
+      Nodes.constants.map { |k|
+        Nodes.const_get(k)
+      }.grep(Class).each do |klass|
+        next if Nodes::SqlLiteral == klass
+        assert klass.ancestors.include?(Nodes::Node), klass.name
+      end
+    end
+
+    def test_each
+      list = []
+      node = Nodes::Node.new
+      node.each { |n| list << n }
+      assert_equal [node], list
+    end
+
+    def test_generator
+      list = []
+      node = Nodes::Node.new
+      node.each.each { |n| list << n }
+      assert_equal [node], list
+    end
+
+    def test_enumerable
+      node = Nodes::Node.new
+      assert_kind_of Enumerable, node
+    end
+  end
+end

data/test/nodes/test_not.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+module Arel
+  module Nodes
+    describe 'not' do
+      describe '#not' do
+        it 'makes a NOT node' do
+          attr = Table.new(:users)[:id]
+          left  = attr.eq(10)
+          right = attr.eq(11)
+          node  = left.or right
+          node.expr.left.must_equal left
+          node.expr.right.must_equal right
+
+          node.or(right).not
+        end
+      end
+    end
+  end
+end

data/test/visitors/test_depth_first.rb

@@ -0,0 +1,203 @@
+require 'helper'
+
+module Arel
+  module Visitors
+    class TestDepthFirst < MiniTest::Unit::TestCase
+      Collector = Struct.new(:calls) do
+        def call object
+          calls << object
+        end
+      end
+
+      def setup
+        @collector = Collector.new []
+        @visitor = Visitors::DepthFirst.new @collector
+      end
+
+      # unary ops
+      [
+        Arel::Nodes::Not,
+        Arel::Nodes::Group,
+        Arel::Nodes::On,
+        Arel::Nodes::Grouping,
+        Arel::Nodes::Offset,
+        Arel::Nodes::Having,
+        Arel::Nodes::UnqualifiedColumn,
+      ].each do |klass|
+        define_method("test_#{klass.name.gsub('::', '_')}") do
+          op = klass.new(:a)
+          @visitor.accept op
+          assert_equal [:a, op], @collector.calls
+        end
+      end
+
+      # functions
+      [
+        Arel::Nodes::Exists,
+        Arel::Nodes::Avg,
+        Arel::Nodes::Min,
+        Arel::Nodes::Max,
+        Arel::Nodes::Sum,
+      ].each do |klass|
+        define_method("test_#{klass.name.gsub('::', '_')}") do
+          func = klass.new(:a, :b)
+          @visitor.accept func
+          assert_equal [:a, :b, func], @collector.calls
+        end
+      end
+
+      def test_lock
+        lock = Nodes::Lock.new
+        @visitor.accept lock
+        assert_equal [lock], @collector.calls
+      end
+
+      def test_count
+        count = Nodes::Count.new :a, :b, :c
+        @visitor.accept count
+        assert_equal [:a, :c, :b, count], @collector.calls
+      end
+
+      def test_inner_join
+        join = Nodes::InnerJoin.new :a, :b, :c
+        @visitor.accept join
+        assert_equal [:a, :b, :c, join], @collector.calls
+      end
+
+      def test_outer_join
+        join = Nodes::OuterJoin.new :a, :b, :c
+        @visitor.accept join
+        assert_equal [:a, :b, :c, join], @collector.calls
+      end
+
+      [
+        Arel::Nodes::And,
+        Arel::Nodes::Assignment,
+        Arel::Nodes::Between,
+        Arel::Nodes::DoesNotMatch,
+        Arel::Nodes::Equality,
+        Arel::Nodes::GreaterThan,
+        Arel::Nodes::GreaterThanOrEqual,
+        Arel::Nodes::In,
+        Arel::Nodes::LessThan,
+        Arel::Nodes::LessThanOrEqual,
+        Arel::Nodes::Matches,
+        Arel::Nodes::NotEqual,
+        Arel::Nodes::NotIn,
+        Arel::Nodes::Or,
+        Arel::Nodes::StringJoin,
+        Arel::Nodes::TableAlias,
+        Arel::Nodes::Values,
+        Arel::Nodes::As,
+        Arel::Nodes::DeleteStatement,
+        Arel::Nodes::Ordering,
+      ].each do |klass|
+        define_method("test_#{klass.name.gsub('::', '_')}") do
+          binary = klass.new(:a, :b)
+          @visitor.accept binary
+          assert_equal [:a, :b, binary], @collector.calls
+        end
+      end
+
+      [
+        Arel::Attributes::Integer,
+        Arel::Attributes::Float,
+        Arel::Attributes::String,
+        Arel::Attributes::Time,
+        Arel::Attributes::Boolean,
+        Arel::Attributes::Attribute
+      ].each do |klass|
+        define_method("test_#{klass.name.gsub('::', '_')}") do
+          binary = klass.new(:a, :b)
+          @visitor.accept binary
+          assert_equal [:a, :b, binary], @collector.calls
+        end
+      end
+
+      def test_table
+        relation = Arel::Table.new(:users)
+        @visitor.accept relation
+        assert_equal ['users', relation], @collector.calls
+      end
+
+      def test_array
+        node = Nodes::Or.new(:a, :b)
+        list = [node]
+        @visitor.accept list
+        assert_equal [:a, :b, node, list], @collector.calls
+      end
+
+      def test_hash
+        node = Nodes::Or.new(:a, :b)
+        hash = { node => node }
+        @visitor.accept hash
+        assert_equal [:a, :b, node, :a, :b, node, hash], @collector.calls
+      end
+
+      def test_update_statement
+        stmt = Nodes::UpdateStatement.new
+        stmt.relation = :a
+        stmt.values << :b
+        stmt.wheres << :c
+        stmt.orders << :d
+        stmt.limit = :e
+
+        @visitor.accept stmt
+        assert_equal [:a, :b, stmt.values, :c, stmt.wheres, :d, stmt.orders,
+          :e, stmt], @collector.calls
+      end
+
+      def test_select_core
+        core = Nodes::SelectCore.new
+        core.projections << :a
+        core.froms = :b
+        core.wheres << :c
+        core.groups << :d
+        core.having = :e
+
+        @visitor.accept core
+        assert_equal [
+          :a, core.projections,
+          :b,
+          :c, core.wheres,
+          :d, core.groups,
+          :e,
+          core], @collector.calls
+      end
+
+      def test_select_statement
+        ss = Nodes::SelectStatement.new
+        ss.cores.replace [:a]
+        ss.orders << :b
+        ss.limit = :c
+        ss.lock = :d
+        ss.offset = :e
+
+        @visitor.accept ss
+        assert_equal [
+          :a, ss.cores,
+          :b, ss.orders,
+          :c,
+          :d,
+          :e,
+          ss], @collector.calls
+      end
+
+      def test_insert_statement
+        stmt = Nodes::InsertStatement.new
+        stmt.relation = :a
+        stmt.columns << :b
+        stmt.values = :c
+
+        @visitor.accept stmt
+        assert_equal [:a, :b, stmt.columns, :c, stmt], @collector.calls
+      end
+
+      def test_node
+        node = Nodes::Node.new
+        @visitor.accept node
+        assert_equal [node], @collector.calls
+      end
+    end
+  end
+end

data/test/visitors/test_mysql.rb

@@ -22,6 +22,13 @@ module Arel
         sql = @visitor.accept(stmt)
         sql.must_be_like "SELECT FROM DUAL"
       end
+
+      it 'uses FOR UPDATE when locking' do
+        stmt = Nodes::SelectStatement.new
+        stmt.lock = Nodes::Lock.new
+        sql = @visitor.accept(stmt)
+        sql.must_be_like "SELECT FROM DUAL FOR UPDATE"
+      end
     end
   end
 end

data/test/visitors/test_to_sql.rb

@@ -21,6 +21,11 @@ module Arel
         end
       end
 
+      it "should visit string subclass" do
+        @visitor.accept(Class.new(String).new(":'("))
+        @visitor.accept(Class.new(Class.new(String)).new(":'("))
+      end
+
       it "should visit_Class" do
         @visitor.accept(DateTime).must_equal "'DateTime'"
       end
@@ -33,6 +38,17 @@ module Arel
         @visitor.accept 2.14
       end
 
+      it "should visit_Not" do
+        sql = @visitor.accept Nodes::Not.new(Arel.sql("foo"))
+        sql.must_be_like "NOT foo"
+      end
+
+      it "should visit_As" do
+        as = Nodes::As.new(Arel.sql("foo"), Arel.sql("bar"))
+        sql = @visitor.accept as
+        sql.must_be_like "foo AS bar"
+      end
+
       it "should visit_Bignum" do
         @visitor.accept 8787878092
       end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -17,22 +18,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
-        - 4
-        version: 2.0.4
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,6 +45,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
@@ -58,6 +61,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 6
@@ -73,6 +77,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
@@ -115,6 +120,7 @@ files:
 - 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
@@ -141,6 +147,7 @@ files:
 - 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
@@ -154,6 +161,7 @@ files:
 - lib/arel/nodes/string_join.rb
 - lib/arel/nodes/sum.rb
 - lib/arel/nodes/table_alias.rb
+- lib/arel/nodes/unary.rb
 - lib/arel/nodes/unqualified_column.rb
 - lib/arel/nodes/update_statement.rb
 - lib/arel/nodes/values.rb
@@ -166,6 +174,7 @@ files:
 - lib/arel/tree_manager.rb
 - lib/arel/update_manager.rb
 - lib/arel/visitors.rb
+- lib/arel/visitors/depth_first.rb
 - lib/arel/visitors/dot.rb
 - lib/arel/visitors/join_sql.rb
 - lib/arel/visitors/mysql.rb
@@ -178,10 +187,13 @@ files:
 - lib/arel/visitors/where_sql.rb
 - test/attributes/test_attribute.rb
 - test/helper.rb
+- test/nodes/test_as.rb
 - test/nodes/test_count.rb
 - test/nodes/test_delete_statement.rb
 - test/nodes/test_equality.rb
 - test/nodes/test_insert_statement.rb
+- test/nodes/test_node.rb
+- test/nodes/test_not.rb
 - test/nodes/test_or.rb
 - test/nodes/test_select_core.rb
 - test/nodes/test_select_statement.rb
@@ -197,6 +209,7 @@ files:
 - test/test_select_manager.rb
 - test/test_table.rb
 - test/test_update_manager.rb
+- test/visitors/test_depth_first.rb
 - test/visitors/test_join_sql.rb
 - test/visitors/test_mysql.rb
 - test/visitors/test_oracle.rb
@@ -218,6 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -226,6 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -238,10 +253,13 @@ specification_version: 3
 summary: Arel is a Relational Algebra for Ruby
 test_files: 
 - test/attributes/test_attribute.rb
+- test/nodes/test_as.rb
 - test/nodes/test_count.rb
 - test/nodes/test_delete_statement.rb
 - test/nodes/test_equality.rb
 - test/nodes/test_insert_statement.rb
+- test/nodes/test_node.rb
+- test/nodes/test_not.rb
 - test/nodes/test_or.rb
 - test/nodes/test_select_core.rb
 - test/nodes/test_select_statement.rb
@@ -256,6 +274,7 @@ test_files:
 - test/test_select_manager.rb
 - test/test_table.rb
 - test/test_update_manager.rb
+- test/visitors/test_depth_first.rb
 - test/visitors/test_join_sql.rb
 - test/visitors/test_mysql.rb
 - test/visitors/test_oracle.rb