arel 4.0.0 → 4.0.1

data/lib/arel/visitors/visitor.rb

@@ -7,16 +7,19 @@ module Arel
 
       private
 
-      DISPATCH = Hash.new do |hash, klass|
-        hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
+      DISPATCH = Hash.new do |hash, visitor_class|
+        hash[visitor_class] =
+          Hash.new do |hash, node_class|
+            hash[node_class] = "visit_#{(node_class.name || '').gsub('::', '_')}"
+          end
       end
 
       def dispatch
-        DISPATCH
+        DISPATCH[self.class]
       end
 
-      def visit object
-        send dispatch[object.class], object
+      def visit object, attribute = nil
+        send dispatch[object.class], object, attribute
       rescue NoMethodError => e
         raise e if respond_to?(dispatch[object.class], true)
         superklass = object.class.ancestors.find { |klass|

data/lib/arel/visitors/where_sql.rb

@@ -1,8 +1,8 @@
 module Arel
   module Visitors
     class WhereSql < Arel::Visitors::ToSql
-      def visit_Arel_Nodes_SelectCore o
-        "WHERE #{o.wheres.map { |x| visit x }.join ' AND ' }"
+      def visit_Arel_Nodes_SelectCore o, a
+        "WHERE #{o.wheres.map { |x| visit x, a }.join ' AND ' }"
       end
     end
   end

data/test/test_update_manager.rb

@@ -19,6 +19,7 @@ module Arel
     it 'handles limit properly' do
       table = Table.new(:users)
       um = Arel::UpdateManager.new Table.engine
+      um.key = 'id'
       um.take 10
       um.table table
       um.set [[table[:name], nil]]

data/test/visitors/test_dispatch_contamination.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+module Arel
+  module Visitors
+    describe 'avoiding contamination between visitor dispatch tables' do
+      before do
+        @connection = Table.engine.connection
+        @table = Table.new(:users)
+      end
+
+      it 'dispatches properly after failing upwards' do
+        node = Nodes::Union.new(Nodes::True.new, Nodes::False.new)
+        assert_equal "( TRUE UNION FALSE )", node.to_sql
+
+        node.first # from Nodes::Node's Enumerable mixin
+
+        assert_equal "( TRUE UNION FALSE )", node.to_sql
+      end
+    end
+  end
+end
+

data/test/visitors/test_oracle.rb

@@ -85,7 +85,8 @@ module Arel
 
           it 'creates a subquery when there is DISTINCT' do
             stmt = Nodes::SelectStatement.new
-            stmt.cores.first.projections << Nodes::SqlLiteral.new('DISTINCT id')
+            stmt.cores.first.set_quantifier = Arel::Nodes::Distinct.new
+            stmt.cores.first.projections << Nodes::SqlLiteral.new('id')
             stmt.limit = Arel::Nodes::Limit.new(10)
             sql = @visitor.accept stmt
             sql.must_be_like %{

data/test/visitors/test_to_sql.rb

@@ -18,7 +18,7 @@ module Arel
       it 'can define a dispatch method' do
         visited = false
         viz = Class.new(Arel::Visitors::Visitor) {
-          define_method(:hello) do |node|
+          define_method(:hello) do |node, attribute|
             visited = true
           end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 4.0.0
-  prerelease: 
+  version: 4.0.1
 platform: ruby
 authors:
 - Aaron Patterson
@@ -12,28 +11,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,32 +44,26 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
-description: ! 'Arel is a SQL AST manager for Ruby. It
-
+        version: '3.7'
+description: |-
+  Arel is a SQL AST manager for Ruby. It
 
   1. Simplifies the generation of complex SQL queries
-
   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.'
+  database compatibility and query generation.
 email:
 - aaron@tenderlovemaking.com
 - bryan@brynary.com
@@ -211,6 +200,7 @@ files:
 - test/test_update_manager.rb
 - test/visitors/test_bind_visitor.rb
 - test/visitors/test_depth_first.rb
+- test/visitors/test_dispatch_contamination.rb
 - test/visitors/test_dot.rb
 - test/visitors/test_ibm_db.rb
 - test/visitors/test_informix.rb
@@ -222,7 +212,9 @@ files:
 - test/visitors/test_sqlite.rb
 - test/visitors/test_to_sql.rb
 homepage: http://github.com/rails/arel
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -230,22 +222,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: arel
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Arel is a SQL AST manager for Ruby
 test_files:
 - test/attributes/test_attribute.rb
@@ -287,6 +277,7 @@ test_files:
 - test/test_update_manager.rb
 - test/visitors/test_bind_visitor.rb
 - test/visitors/test_depth_first.rb
+- test/visitors/test_dispatch_contamination.rb
 - test/visitors/test_dot.rb
 - test/visitors/test_ibm_db.rb
 - test/visitors/test_informix.rb