arel 2.0.6 → 2.0.7.beta.20110110114925

data/History.txt

@@ -1,3 +1,10 @@
+== 2.0.7 (unreleased)
+
+* Bug Fixes
+
+  * Limit members are visited
+  * Fixing MSSQL TOP support
+
 == 2.0.6 12/01/2010
 
 * Bug Fixes

data/Manifest.txt

@@ -39,6 +39,7 @@ lib/arel/nodes/insert_statement.rb
 lib/arel/nodes/join.rb
 lib/arel/nodes/less_than.rb
 lib/arel/nodes/less_than_or_equal.rb
+lib/arel/nodes/limit.rb
 lib/arel/nodes/lock.rb
 lib/arel/nodes/matches.rb
 lib/arel/nodes/max.rb
@@ -58,6 +59,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/top.rb
 lib/arel/nodes/unary.rb
 lib/arel/nodes/unqualified_column.rb
 lib/arel/nodes/update_statement.rb
@@ -74,6 +76,7 @@ lib/arel/visitors.rb
 lib/arel/visitors/depth_first.rb
 lib/arel/visitors/dot.rb
 lib/arel/visitors/join_sql.rb
+lib/arel/visitors/mssql.rb
 lib/arel/visitors/mysql.rb
 lib/arel/visitors/oracle.rb
 lib/arel/visitors/order_clauses.rb
@@ -107,7 +110,9 @@ test/test_select_manager.rb
 test/test_table.rb
 test/test_update_manager.rb
 test/visitors/test_depth_first.rb
+test/visitors/test_dot.rb
 test/visitors/test_join_sql.rb
+test/visitors/test_mssql.rb
 test/visitors/test_mysql.rb
 test/visitors/test_oracle.rb
 test/visitors/test_postgres.rb

data/arel.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.0.5.20101130111154"
+  s.version = "2.0.7.beta.20110110114925"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = %q{2010-11-30}
+  s.date = %q{2011-01-10}
   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"]
-  s.files = [".autotest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "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", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "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", "lib/arel/nodes/in.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join.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", "lib/arel/nodes/select_statement.rb", "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", "lib/arel/predications.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "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", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "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", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/support/fake_record.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "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", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
+  s.files = [".autotest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "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", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "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", "lib/arel/nodes/in.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join.rb", "lib/arel/nodes/less_than.rb", "lib/arel/nodes/less_than_or_equal.rb", "lib/arel/nodes/limit.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", "lib/arel/nodes/select_statement.rb", "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/top.rb", "lib/arel/nodes/unary.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/predications.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "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/mssql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "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", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/support/fake_record.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "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_dot.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
   s.homepage = %q{http://github.com/rails/arel}
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{arel}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Arel is a Relational Algebra for Ruby}
-  s.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", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "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", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
+  s.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", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "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_dot.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -27,17 +27,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<minitest>, [">= 2.0.0"])
       s.add_development_dependency(%q<hoe>, [">= 2.1.0"])
       s.add_development_dependency(%q<minitest>, [">= 1.6.0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
+      s.add_development_dependency(%q<hoe>, [">= 2.8.0"])
     else
       s.add_dependency(%q<minitest>, [">= 2.0.0"])
       s.add_dependency(%q<hoe>, [">= 2.1.0"])
       s.add_dependency(%q<minitest>, [">= 1.6.0"])
-      s.add_dependency(%q<hoe>, [">= 2.6.2"])
+      s.add_dependency(%q<hoe>, [">= 2.8.0"])
     end
   else
     s.add_dependency(%q<minitest>, [">= 2.0.0"])
     s.add_dependency(%q<hoe>, [">= 2.1.0"])
     s.add_dependency(%q<minitest>, [">= 1.6.0"])
-    s.add_dependency(%q<hoe>, [">= 2.6.2"])
+    s.add_dependency(%q<hoe>, [">= 2.8.0"])
   end
 end

data/lib/arel.rb

@@ -29,7 +29,7 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '2.0.6'
+  VERSION = '2.0.7.beta'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/crud.rb

@@ -13,7 +13,7 @@ module Arel
       end
       um.table relation
       um.set values
-      um.take @ast.limit
+      um.take @ast.limit.expr if @ast.limit
       um.order(*@ast.orders)
       um.wheres = @ctx.wheres
 

data/lib/arel/delete_manager.rb

@@ -3,6 +3,7 @@ module Arel
     def initialize engine
       super
       @ast = Nodes::DeleteStatement.new
+      @ctx = @ast
     end
 
     def from relation
@@ -10,11 +11,6 @@ module Arel
       self
     end
 
-    def where expression
-      @ast.wheres << expression
-      self
-    end
-
     def wheres= list
       @ast.wheres = list
     end

data/lib/arel/nodes.rb

@@ -24,6 +24,8 @@ 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'

data/lib/arel/nodes/limit.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class Limit < Arel::Nodes::Unary
+    end
+  end
+end
+

data/lib/arel/nodes/node.rb

@@ -7,7 +7,7 @@ module Arel
       # Factory method to create a Nodes::Not node that has the recipient of
       # the caller as a child.
       def not
-        Nodes::Not.new self
+        Nodes::Not.new Nodes::Grouping.new self
       end
 
       ###

data/lib/arel/nodes/select_core.rb

@@ -1,10 +1,11 @@
 module Arel
   module Nodes
     class SelectCore < Arel::Nodes::Node
-      attr_accessor :froms, :projections, :wheres, :groups
+      attr_accessor :top, :froms, :projections, :wheres, :groups
       attr_accessor :having
 
       def initialize
+        @top         = nil
         @froms       = nil
         @projections = []
         @wheres      = []

data/lib/arel/nodes/top.rb

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

data/lib/arel/predications.rb

@@ -31,7 +31,7 @@ module Arel
     def in other
       case other
       when Arel::SelectManager
-        Nodes::In.new self, other.to_a.map { |x| x.id }
+        Arel::Nodes::In.new(self, other.ast)
       when Range
         if other.exclude_end?
           left  = Nodes::GreaterThanOrEqual.new(self, other.begin)
@@ -56,7 +56,7 @@ module Arel
     def not_in other
       case other
       when Arel::SelectManager
-        Nodes::NotIn.new self, other.to_a.map { |x| x.id }
+        Arel::Nodes::NotIn.new(self, other.ast)
       when Range
         if other.exclude_end?
           left  = Nodes::LessThan.new(self, other.begin)

data/lib/arel/select_manager.rb

@@ -10,7 +10,7 @@ module Arel
     end
 
     def taken
-      @ast.limit
+      @ast.limit && @ast.limit.expr
     end
 
     def constraints
@@ -107,11 +107,6 @@ module Arel
       self
     end
 
-    def where expr
-      @ctx.wheres << expr
-      self
-    end
-
     def order *expr
       # FIXME: We SHOULD NOT be converting these to SqlLiteral automatically
       @ast.orders.concat expr.map { |x|
@@ -136,7 +131,8 @@ module Arel
     end
 
     def take limit
-      @ast.limit = limit
+      @ast.limit = Nodes::Limit.new(limit)
+      @ctx.top   = Nodes::Top.new(limit)
       self
     end
 

data/lib/arel/tree_manager.rb

@@ -9,6 +9,7 @@ module Arel
     def initialize engine
       @engine  = engine
       @visitor = Visitors.visitor_for @engine
+      @ctx     = nil
     end
 
     def to_dot
@@ -23,5 +24,13 @@ module Arel
       super
       @ast = @ast.clone
     end
+
+    def where expr
+      if Arel::TreeManager === expr
+        expr = expr.ast
+      end
+      @ctx.wheres << expr
+      self
+    end
   end
 end

data/lib/arel/update_manager.rb

@@ -3,10 +3,11 @@ module Arel
     def initialize engine
       super
       @ast = Nodes::UpdateStatement.new
+      @ctx = @ast
     end
 
     def take limit
-      @ast.limit = limit
+      @ast.limit = Nodes::Limit.new(limit) if limit
       self
     end
 

data/lib/arel/visitors.rb

@@ -4,6 +4,7 @@ require 'arel/visitors/to_sql'
 require 'arel/visitors/sqlite'
 require 'arel/visitors/postgresql'
 require 'arel/visitors/mysql'
+require 'arel/visitors/mssql'
 require 'arel/visitors/oracle'
 require 'arel/visitors/join_sql'
 require 'arel/visitors/where_sql'
@@ -16,6 +17,8 @@ module Arel
       'postgresql'      => Arel::Visitors::PostgreSQL,
       'mysql'           => Arel::Visitors::MySQL,
       'mysql2'          => Arel::Visitors::MySQL,
+      'mssql'           => Arel::Visitors::MSSQL,
+      'sqlserver'       => Arel::Visitors::MSSQL,
       'oracle_enhanced' => Arel::Visitors::Oracle,
       'sqlite'          => Arel::Visitors::SQLite,
       'sqlite3'         => Arel::Visitors::SQLite,

data/lib/arel/visitors/depth_first.rb

@@ -18,9 +18,11 @@ module Arel
       alias :visit_Arel_Nodes_Group             :unary
       alias :visit_Arel_Nodes_Grouping          :unary
       alias :visit_Arel_Nodes_Having            :unary
+      alias :visit_Arel_Nodes_Limit             :unary
       alias :visit_Arel_Nodes_Not               :unary
       alias :visit_Arel_Nodes_Offset            :unary
       alias :visit_Arel_Nodes_On                :unary
+      alias :visit_Arel_Nodes_Top               :unary
       alias :visit_Arel_Nodes_UnqualifiedColumn :unary
 
       def function o

data/lib/arel/visitors/dot.rb

@@ -28,10 +28,6 @@ module Arel
       end
 
       private
-      def visit_Arel_Nodes_Grouping o
-        visit_edge o, "expr"
-      end
-
       def visit_Arel_Nodes_Ordering o
         visit_edge o, "expr"
         visit_edge o, "direction"
@@ -55,10 +51,6 @@ module Arel
         visit_edge o, "distinct"
       end
 
-      def visit_Arel_Nodes_On o
-        visit_edge o, "expr"
-      end
-
       def visit_Arel_Nodes_Values o
         visit_edge o, "expressions"
       end
@@ -80,13 +72,18 @@ module Arel
         visit_edge o, "wheres"
       end
 
-      def visit_Arel_Nodes_UnqualifiedColumn o
-        visit_edge o, "attribute"
-      end
-
-      def visit_Arel_Nodes_Offset o
-        visit_edge o, "value"
+      def unary o
+        visit_edge 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_Limit             :unary
+      alias :visit_Arel_Nodes_Not               :unary
+      alias :visit_Arel_Nodes_Offset            :unary
+      alias :visit_Arel_Nodes_On                :unary
+      alias :visit_Arel_Nodes_Top               :unary
+      alias :visit_Arel_Nodes_UnqualifiedColumn :unary
 
       def visit_Arel_Nodes_InsertStatement o
         visit_edge o, "relation"

data/lib/arel/visitors/mssql.rb

@@ -0,0 +1,16 @@
+module Arel
+  module Visitors
+    class MSSQL < Arel::Visitors::ToSql
+      private
+
+      def visit_Arel_Nodes_Limit o
+        ""
+      end
+
+      def visit_Arel_Nodes_Top o
+        "TOP #{visit o.expr}"
+      end
+
+    end
+  end
+end

data/lib/arel/visitors/mysql.rb

@@ -10,7 +10,7 @@ module Arel
       # :'(
       # http://dev.mysql.com/doc/refman/5.0/en/select.html#id3482214
       def visit_Arel_Nodes_SelectStatement o
-        o.limit = 18446744073709551615 if o.offset && !o.limit
+        o.limit = Arel::Nodes::Limit.new(18446744073709551615) if o.offset && !o.limit
         super
       end
 
@@ -25,7 +25,7 @@ module Arel
           ("SET #{o.values.map { |value| visit value }.join ', '}" unless o.values.empty?),
           ("WHERE #{o.wheres.map { |x| visit x }.join ' AND '}" unless o.wheres.empty?),
           ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
-          ("LIMIT #{o.limit}" if o.limit),
+          (visit(o.limit) if o.limit),
         ].compact.join ' '
       end
 

data/lib/arel/visitors/oracle.rb

@@ -10,17 +10,15 @@ module Arel
         # then can use simple ROWNUM in WHERE clause
         if o.limit && o.orders.empty? && !o.offset && o.cores.first.projections.first !~ /^DISTINCT /
           o.cores.last.wheres.push Nodes::LessThanOrEqual.new(
-            Nodes::SqlLiteral.new('ROWNUM'), o.limit
+            Nodes::SqlLiteral.new('ROWNUM'), o.limit.expr
           )
-          o.limit = nil
           return super
         end
 
         if o.limit && o.offset
           o        = o.dup
-          limit    = o.limit.to_i
+          limit    = o.limit.expr.to_i
           offset   = o.offset
-          o.limit  = nil
           o.offset = nil
           sql = super(o)
           return <<-eosql
@@ -35,9 +33,8 @@ module Arel
 
         if o.limit
           o       = o.dup
-          limit   = o.limit
-          o.limit = nil
-          return "SELECT * FROM (#{super(o)}) WHERE ROWNUM <= #{limit}"
+          limit   = o.limit.expr
+          return "SELECT * FROM (#{super(o)}) WHERE ROWNUM <= #{visit limit}"
         end
 
         if o.offset
@@ -57,6 +54,9 @@ module Arel
         super
       end
 
+      def visit_Arel_Nodes_Limit o
+      end
+
       def visit_Arel_Nodes_Offset o
         "raw_rnum_ > #{visit o.value}"
       end

data/lib/arel/visitors/postgresql.rb

@@ -17,7 +17,7 @@ module Arel
           [
             "SELECT * FROM (#{sql}) AS id_list",
             "ORDER BY #{aliased_orders(o.orders).join(', ')}",
-            ("LIMIT #{o.limit}" if o.limit),
+            (visit(o.limit) if o.limit),
             (visit(o.offset) if o.offset),
           ].compact.join ' '
         else

data/lib/arel/visitors/sqlite.rb

@@ -3,7 +3,7 @@ module Arel
     class SQLite < Arel::Visitors::ToSql
       private
       def visit_Arel_Nodes_SelectStatement o
-        o.limit = -1 if o.offset && !o.limit
+        o.limit = Arel::Nodes::Limit.new(-1) if o.offset && !o.limit
         super
       end
     end

data/lib/arel/visitors/to_sql.rb

@@ -76,7 +76,7 @@ module Arel
         [
           o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
           ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
-          ("LIMIT #{o.limit}" if o.limit),
+          (visit(o.limit) if o.limit),
           (visit(o.offset) if o.offset),
           (visit(o.lock) if o.lock),
         ].compact.join ' '
@@ -84,7 +84,9 @@ module Arel
 
       def visit_Arel_Nodes_SelectCore o
         [
-          "SELECT #{o.projections.map { |x| visit x }.join ', '}",
+          "SELECT",
+          (visit(o.top) if o.top),
+          "#{o.projections.map { |x| visit x }.join ', '}",
           ("FROM #{visit o.froms}" if o.froms),
           ("WHERE #{o.wheres.map { |x| visit x }.join ' AND ' }" unless o.wheres.empty?),
           ("GROUP BY #{o.groups.map { |x| visit x }.join ', ' }" unless o.groups.empty?),
@@ -100,6 +102,15 @@ module Arel
         "OFFSET #{visit o.expr}"
       end
 
+      def visit_Arel_Nodes_Limit o
+        "LIMIT #{visit o.expr}"
+      end
+
+      # FIXME: this does nothing on most databases, but does on MSSQL
+      def visit_Arel_Nodes_Top o
+        ""
+      end
+
       # FIXME: this does nothing on SQLLite3, but should do things on other
       # databases.
       def visit_Arel_Nodes_Lock o
@@ -192,7 +203,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_Not o
-        "NOT #{visit o.expr}"
+        "NOT (#{visit o.expr})"
       end
 
       def visit_Arel_Table o
@@ -204,17 +215,11 @@ module Arel
       end
 
       def visit_Arel_Nodes_In o
-        right = o.right
-        "#{visit o.left} IN (#{
-          right.empty? ? 'NULL' : right.map { |x| visit x }.join(', ')
-        })"
+      "#{visit o.left} IN (#{visit o.right})"
       end
 
       def visit_Arel_Nodes_NotIn o
-        right = o.right
-        "#{visit o.left} NOT IN (#{
-          right.empty? ? 'NULL' : right.map { |x| visit x }.join(', ')
-        })"
+      "#{visit o.left} NOT IN (#{visit o.right})"
       end
 
       def visit_Arel_Nodes_And o
@@ -291,6 +296,10 @@ module Arel
       alias :visit_ActiveSupport_StringInquirer :visit_String
       alias :visit_Class :visit_String
 
+      def visit_Array o
+        o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
+      end
+
       def quote value, column = nil
         @connection.quote value, column
       end

data/lib/arel/visitors/visitor.rb

@@ -13,8 +13,8 @@ module Arel
 
       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
+      rescue NoMethodError => e
+        raise e if respond_to?(DISPATCH[object.class], true)
         superklass = object.class.ancestors.find { |klass|
           respond_to?(DISPATCH[klass], true)
         }

data/test/test_update_manager.rb

@@ -8,6 +8,15 @@ module Arel
       end
     end
 
+    it 'handles limit properly' do
+      table = Table.new(:users)
+      um = Arel::UpdateManager.new Table.engine
+      um.take 10
+      um.table table
+      um.set [[table[:name], nil]]
+      assert_match(/LIMIT 10/, um.to_sql)
+    end
+
     describe 'set' do
       it "updates with null" do
         table = Table.new(:users)

data/test/visitors/test_depth_first.rb

@@ -30,6 +30,8 @@ module Arel
         Arel::Nodes::Offset,
         Arel::Nodes::Having,
         Arel::Nodes::UnqualifiedColumn,
+        Arel::Nodes::Top,
+        Arel::Nodes::Limit,
       ].each do |klass|
         define_method("test_#{klass.name.gsub('::', '_')}") do
           op = klass.new(:a)

data/test/visitors/test_dot.rb

@@ -0,0 +1,29 @@
+require 'helper'
+
+module Arel
+  module Visitors
+    class TestDot < MiniTest::Unit::TestCase
+      def setup
+        @visitor = Visitors::Dot.new
+      end
+
+      # unary ops
+      [
+        Arel::Nodes::Not,
+        Arel::Nodes::Group,
+        Arel::Nodes::On,
+        Arel::Nodes::Grouping,
+        Arel::Nodes::Offset,
+        Arel::Nodes::Having,
+        Arel::Nodes::UnqualifiedColumn,
+        Arel::Nodes::Top,
+        Arel::Nodes::Limit,
+      ].each do |klass|
+        define_method("test_#{klass.name.gsub('::', '_')}") do
+          op = klass.new(:a)
+          @visitor.accept op
+        end
+      end
+    end
+  end
+end

data/test/visitors/test_mssql.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+module Arel
+  module Visitors
+    describe 'the mssql visitor' do
+      before do
+        @visitor = MSSQL.new Table.engine
+      end
+
+      it 'uses TOP to limit results' do
+        stmt = Nodes::SelectStatement.new
+        stmt.cores.last.top = Nodes::Top.new(1)
+        sql = @visitor.accept(stmt)
+        sql.must_be_like "SELECT TOP 1"
+      end
+    end
+  end
+end

data/test/visitors/test_mysql.rb

@@ -17,6 +17,12 @@ module Arel
         sql.must_be_like "SELECT FROM DUAL LIMIT 18446744073709551615 OFFSET 1"
       end
 
+      it "should escape LIMIT" do
+        sc = Arel::Nodes::UpdateStatement.new
+        sc.limit = Nodes::Limit.new("omg")
+        assert_equal("UPDATE NULL LIMIT 'omg'", @visitor.accept(sc))
+      end
+
       it 'uses DUAL for empty from' do
         stmt = Nodes::SelectStatement.new
         sql = @visitor.accept(stmt)

data/test/visitors/test_oracle.rb

@@ -59,7 +59,7 @@ module Arel
         describe 'limit' do
           it 'adds a rownum clause' do
             stmt = Nodes::SelectStatement.new
-            stmt.limit = 10
+            stmt.limit = Nodes::Limit.new(10)
             sql = @visitor.accept stmt
             sql.must_be_like %{ SELECT WHERE ROWNUM <= 10 }
           end
@@ -67,7 +67,7 @@ module Arel
           it 'is idempotent' do
             stmt = Nodes::SelectStatement.new
             stmt.orders << Nodes::SqlLiteral.new('foo')
-            stmt.limit = 10
+            stmt.limit = Nodes::Limit.new(10)
             sql = @visitor.accept stmt
             sql2 = @visitor.accept stmt
             sql.must_equal sql2
@@ -76,7 +76,7 @@ module Arel
           it 'creates a subquery when there is order_by' do
             stmt = Nodes::SelectStatement.new
             stmt.orders << Nodes::SqlLiteral.new('foo')
-            stmt.limit = 10
+            stmt.limit = Nodes::Limit.new(10)
             sql = @visitor.accept stmt
             sql.must_be_like %{
               SELECT * FROM (SELECT ORDER BY foo) WHERE ROWNUM <= 10
@@ -86,7 +86,7 @@ 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.limit = 10
+            stmt.limit = Arel::Nodes::Limit.new(10)
             sql = @visitor.accept stmt
             sql.must_be_like %{
               SELECT * FROM (SELECT DISTINCT id) WHERE ROWNUM <= 10
@@ -95,7 +95,7 @@ module Arel
 
           it 'creates a different subquery when there is an offset' do
             stmt = Nodes::SelectStatement.new
-            stmt.limit = 10
+            stmt.limit = Nodes::Limit.new(10)
             stmt.offset = Nodes::Offset.new(10)
             sql = @visitor.accept stmt
             sql.must_be_like %{
@@ -110,7 +110,7 @@ module Arel
 
           it 'is idempotent with different subquery' do
             stmt = Nodes::SelectStatement.new
-            stmt.limit = 10
+            stmt.limit = Nodes::Limit.new(10)
             stmt.offset = Nodes::Offset.new(10)
             sql = @visitor.accept stmt
             sql2 = @visitor.accept stmt

data/test/visitors/test_postgres.rb

@@ -12,6 +12,16 @@ module Arel
           FOR UPDATE
         }
       end
+
+      it "should escape LIMIT" do
+        sc = Arel::Nodes::SelectStatement.new
+        sc.limit = Nodes::Limit.new("omg")
+        sc.cores.first.projections << 'DISTINCT ON'
+        sc.orders << "xyz"
+        sql =  @visitor.accept(sc)
+        assert_match(/LIMIT 'omg'/, sql)
+        assert_equal 1, sql.scan(/LIMIT/).length, 'should have one limit'
+      end
     end
   end
 end

data/test/visitors/test_to_sql.rb

@@ -30,6 +30,12 @@ module Arel
         @visitor.accept(DateTime).must_equal "'DateTime'"
       end
 
+      it "should escape LIMIT" do
+        sc = Arel::Nodes::SelectStatement.new
+        sc.limit = Arel::Nodes::Limit.new("omg")
+        assert_match(/LIMIT 'omg'/, @visitor.accept(sc))
+      end
+
       it "should visit_DateTime" do
         @visitor.accept DateTime.now
       end
@@ -40,7 +46,13 @@ module Arel
 
       it "should visit_Not" do
         sql = @visitor.accept Nodes::Not.new(Arel.sql("foo"))
-        sql.must_be_like "NOT foo"
+        sql.must_be_like "NOT (foo)"
+      end
+
+      it "should apply Not to the whole expression" do
+        node = Nodes::And.new @attr.eq(10), @attr.eq(11)
+        sql = @visitor.accept Nodes::Not.new(node)
+        sql.must_be_like %{NOT ("users"."id" = 10 AND "users"."id" = 11)}
       end
 
       it "should visit_As" do
@@ -131,6 +143,15 @@ module Arel
           }
         end
 
+        it 'can handle subqueries' do
+          table = Table.new(:users)
+          subquery = table.project(:id).where(table[:name].eq('Aaron'))
+          node = @attr.in subquery
+          @visitor.accept(node).must_be_like %{
+            "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" = 'Aaron')
+          }
+        end
+
         it 'uses the same column for escaping values' do
         @attr = Table.new(:users)[:name]
           visitor = Class.new(ToSql) do
@@ -177,6 +198,15 @@ module Arel
           }
         end
 
+        it 'can handle subqueries' do
+          table = Table.new(:users)
+          subquery = table.project(:id).where(table[:name].eq('Aaron'))
+          node = @attr.not_in subquery
+          @visitor.accept(node).must_be_like %{
+            "users"."id" NOT IN (SELECT id FROM "users" WHERE "users"."name" = 'Aaron')
+          }
+        end
+
         it 'uses the same column for escaping values' do
         @attr = Table.new(:users)[:name]
           visitor = Class.new(ToSql) do

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 40220158689793
+  prerelease: true
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  - beta
+  - 20110110114925
+  version: 2.0.7.beta.20110110114925
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -08:00
+date: 2011-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,12 +79,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 47
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id004
 description: 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.
@@ -142,6 +144,7 @@ files:
 - lib/arel/nodes/join.rb
 - lib/arel/nodes/less_than.rb
 - lib/arel/nodes/less_than_or_equal.rb
+- lib/arel/nodes/limit.rb
 - lib/arel/nodes/lock.rb
 - lib/arel/nodes/matches.rb
 - lib/arel/nodes/max.rb
@@ -161,6 +164,7 @@ files:
 - lib/arel/nodes/string_join.rb
 - lib/arel/nodes/sum.rb
 - lib/arel/nodes/table_alias.rb
+- lib/arel/nodes/top.rb
 - lib/arel/nodes/unary.rb
 - lib/arel/nodes/unqualified_column.rb
 - lib/arel/nodes/update_statement.rb
@@ -177,6 +181,7 @@ files:
 - lib/arel/visitors/depth_first.rb
 - lib/arel/visitors/dot.rb
 - lib/arel/visitors/join_sql.rb
+- lib/arel/visitors/mssql.rb
 - lib/arel/visitors/mysql.rb
 - lib/arel/visitors/oracle.rb
 - lib/arel/visitors/order_clauses.rb
@@ -210,7 +215,9 @@ files:
 - test/test_table.rb
 - test/test_update_manager.rb
 - test/visitors/test_depth_first.rb
+- test/visitors/test_dot.rb
 - test/visitors/test_join_sql.rb
+- test/visitors/test_mssql.rb
 - test/visitors/test_mysql.rb
 - test/visitors/test_oracle.rb
 - test/visitors/test_postgres.rb
@@ -238,12 +245,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: arel
@@ -275,7 +284,9 @@ test_files:
 - test/test_table.rb
 - test/test_update_manager.rb
 - test/visitors/test_depth_first.rb
+- test/visitors/test_dot.rb
 - test/visitors/test_join_sql.rb
+- test/visitors/test_mssql.rb
 - test/visitors/test_mysql.rb
 - test/visitors/test_oracle.rb
 - test/visitors/test_postgres.rb