arel 3.0.0 → 3.0.1

data/arel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "arel"
-  s.version = "3.0.0.20120112113618"
+  s.version = "3.0.1.20120220180444"
 
   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 = "2012-01-12"
+  s.date = "2012-02-21"
   s.description = "Arel is a SQL AST manager for Ruby. It\n\n1. Simplifies the generation of complex SQL queries\n2. Adapts to various RDBMS systems\n\nIt is intended to be a framework framework; that is, you can build your own ORM\nwith it, focusing on innovative object and collection modeling as opposed to\ndatabase 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"]
@@ -23,14 +23,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_development_dependency(%q<minitest>, ["~> 2.11"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<hoe>, ["~> 2.13"])
     else
-      s.add_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_dependency(%q<minitest>, ["~> 2.11"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<hoe>, ["~> 2.13"])
     end
   else
-    s.add_dependency(%q<hoe>, ["~> 2.12"])
+    s.add_dependency(%q<minitest>, ["~> 2.11"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<hoe>, ["~> 2.13"])
   end
 end

data/lib/arel.rb

@@ -33,7 +33,7 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/nodes/node.rb

@@ -39,7 +39,7 @@ module Arel
       def each &block
         return enum_for(:each) unless block_given?
 
-        Visitors::DepthFirst.new(block).accept self
+        ::Arel::Visitors::DepthFirst.new(block).accept self
       end
     end
   end

data/lib/arel/nodes/sql_literal.rb

@@ -6,5 +6,8 @@ module Arel
       include Arel::AliasPredication
       include Arel::OrderPredications
     end
+
+    class BindParam < SqlLiteral
+    end
   end
 end

data/lib/arel/visitors/depth_first.rb

@@ -109,6 +109,7 @@ module Arel
       alias :visit_Arel_Nodes_Lock               :terminal
       alias :visit_Arel_Nodes_Node               :terminal
       alias :visit_Arel_Nodes_SqlLiteral         :terminal
+      alias :visit_Arel_Nodes_BindParam          :terminal
       alias :visit_Arel_SqlLiteral               :terminal
       alias :visit_BigDecimal                    :terminal
       alias :visit_Bignum                        :terminal

data/lib/arel/visitors/dot.rb

@@ -65,6 +65,7 @@ module Arel
         visit_edge o, "expr"
       end
       alias :visit_Arel_Nodes_Group             :unary
+      alias :visit_Arel_Nodes_BindParam         :unary
       alias :visit_Arel_Nodes_Grouping          :unary
       alias :visit_Arel_Nodes_Having            :unary
       alias :visit_Arel_Nodes_Limit             :unary

data/lib/arel/visitors/oracle.rb

@@ -25,9 +25,8 @@ module Arel
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
                 FROM (#{sql}) raw_sql_
-                WHERE rownum <= #{offset.expr.to_i + limit}
               )
-              WHERE #{visit offset}
+              WHERE raw_rnum_ between #{offset.expr.to_i + 1 } and #{offset.expr.to_i + limit}
           eosql
         end
 

data/lib/arel/visitors/to_sql.rb

@@ -374,6 +374,7 @@ key on UpdateManager using UpdateManager#key=
 
       def literal o; o end
 
+      alias :visit_Arel_Nodes_BindParam  :literal
       alias :visit_Arel_Nodes_SqlLiteral :literal
       alias :visit_Arel_SqlLiteral       :literal # This is deprecated
       alias :visit_Bignum                :literal

data/test/nodes/test_node.rb

@@ -11,6 +11,7 @@ module Arel
         Nodes.const_get(k)
       }.grep(Class).each do |klass|
         next if Nodes::SqlLiteral == klass
+        next if Nodes::BindParam == klass
         next if klass.name =~ /^Arel::Nodes::Test/
         assert klass.ancestors.include?(Nodes::Node), klass.name
       end

data/test/visitors/test_oracle.rb

@@ -102,9 +102,8 @@ module Arel
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
                 FROM (SELECT) raw_sql_
-                WHERE rownum <= 20
               )
-              WHERE raw_rnum_ > 10
+              WHERE raw_rnum_ between 11 and 20
             }
           end
 

data/test/visitors/test_to_sql.rb

@@ -9,6 +9,12 @@ module Arel
         @attr = @table[:id]
       end
 
+      it 'works with BindParams' do
+        node = Nodes::BindParam.new 'omg'
+        sql = @visitor.accept node
+        sql.must_be_like 'omg'
+      end
+
       it 'can define a dispatch method' do
         visited = false
         viz = Class.new(Arel::Visitors::Visitor) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &70284393537020 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &70143007281780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70284393537020
+  version_requirements: *70143007281780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70284393837600 !ruby/object:Gem::Requirement
+  requirement: &70143007268400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,7 +35,18 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70284393837600
+  version_requirements: *70143007268400
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &70143007266480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :development
+  prerelease: false
+  version_requirements: *70143007266480
 description: ! 'Arel is a SQL AST manager for Ruby. It