arel 2.0.3 → 2.0.4

data/History.txt

@@ -1,3 +1,9 @@
+== 2.0.4
+
+* Bug fixes
+
+  * Speed improvements for Range queries.  Thanks Rolf Timmermans!
+
 == 2.0.3
 
 * Bug fixes

data/Rakefile

@@ -4,6 +4,7 @@ require 'hoe'
 
 Hoe.plugin :minitest
 Hoe.plugin :gemspec # `gem install hoe-gemspec`
+Hoe.plugin :git     # `gem install hoe-git`
 
 Hoe.spec 'arel' do
   developer('Aaron Patterson', 'aaron@tenderlovemaking.com')

data/lib/arel.rb

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

data/lib/arel/predications.rb

@@ -30,11 +30,11 @@ module Arel
         Nodes::In.new self, other.to_a.map { |x| x.id }
       when Range
         if other.exclude_end?
-          left  = Nodes::GreaterThanOrEqual.new(self, other.min)
-          right = Nodes::LessThan.new(self, other.max + 1)
+          left  = Nodes::GreaterThanOrEqual.new(self, other.begin)
+          right = Nodes::LessThan.new(self, other.end)
           Nodes::And.new left, right
         else
-          Nodes::Between.new(self, Nodes::And.new(other.min, other.max))
+          Nodes::Between.new(self, Nodes::And.new(other.begin, other.end))
         end
       else
         Nodes::In.new self, other
@@ -55,12 +55,12 @@ module Arel
         Nodes::NotIn.new self, other.to_a.map { |x| x.id }
       when Range
         if other.exclude_end?
-          left  = Nodes::LessThan.new(self, other.min)
-          right = Nodes::GreaterThanOrEqual.new(self, other.max)
+          left  = Nodes::LessThan.new(self, other.begin)
+          right = Nodes::GreaterThanOrEqual.new(self, other.end)
           Nodes::Or.new left, right
         else
-          left  = Nodes::LessThan.new(self, other.min)
-          right = Nodes::GreaterThan.new(self, other.max)
+          left  = Nodes::LessThan.new(self, other.begin)
+          right = Nodes::GreaterThan.new(self, other.end)
           Nodes::Or.new left, right
         end
       else

data/lib/arel/table.rb

@@ -8,7 +8,7 @@ module Arel
     attr_accessor :name, :engine, :aliases, :table_alias
 
     def initialize name, engine = Table.engine
-      @name    = name
+      @name    = name.to_s
       @engine  = engine
       @columns = nil
       @aliases = []
@@ -22,7 +22,7 @@ module Arel
         # Sometime AR sends an :as parameter to table, to let the table know
         # that it is an Alias.  We may want to override new, and return a
         # TableAlias node?
-        @table_alias = engine[:as] unless engine[:as].to_s == name.to_s
+        @table_alias = engine[:as] unless engine[:as].to_s == @name
       end
     end
 

data/test/test_table.rb

@@ -156,7 +156,7 @@ module Arel
     end
 
     it "should have a name" do
-      @relation.name.must_equal :users
+      @relation.name.must_equal 'users'
     end
 
     it "should have an engine" do
@@ -179,4 +179,15 @@ module Arel
       end
     end
   end
+
+  describe Table do
+    describe 'when checking the existence of a table' do
+      it 'should be present in the table cache despite the class of its name' do
+        [ 'users', :users ].each do |name|
+          relation = Table.new name
+          Table.table_cache(relation.engine).key?(relation.name).must_equal true
+        end
+      end
+    end
+  end
 end

data/test/visitors/test_to_sql.rb

@@ -132,6 +132,52 @@ module Arel
         end
       end
 
+      describe "Nodes::NotIn" do
+        it "should know how to visit" do
+          node = @attr.not_in [1, 2, 3]
+          @visitor.accept(node).must_be_like %{
+            "users"."id" NOT IN (1, 2, 3)
+          }
+        end
+
+        it "should turn empty right to NULL" do
+          node = @attr.not_in []
+          @visitor.accept(node).must_be_like %{
+            "users"."id" NOT IN (NULL)
+          }
+        end
+
+        it 'can handle two dot ranges' do
+          node = @attr.not_in 1..3
+          @visitor.accept(node).must_be_like %{
+            "users"."id" < 1 OR "users"."id" > 3
+          }
+        end
+
+        it 'can handle three dot ranges' do
+          node = @attr.not_in 1...3
+          @visitor.accept(node).must_be_like %{
+            "users"."id" < 1 OR "users"."id" >= 3
+          }
+        end
+
+        it 'uses the same column for escaping values' do
+        @attr = Table.new(:users)[:name]
+          visitor = Class.new(ToSql) do
+            attr_accessor :expected
+
+            def quote value, column = nil
+              raise unless column == expected
+              super
+            end
+          end
+          in_node = Nodes::NotIn.new @attr, %w{ a b c }
+          visitor = visitor.new(Table.engine)
+          visitor.expected = @attr.column
+          visitor.accept(in_node).must_equal %("users"."name" NOT IN ('a', 'b', 'c'))
+        end
+      end
+
       describe 'Equality' do
         it "should escape strings" do
           test = Table.new(:users)[:name].eq 'Aaron Patterson'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: false
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +28,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -37,71 +35,51 @@ dependencies:
         version: 2.0.4
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31098209
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        version: 2.0.0.beta
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 1
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 6
         - 0
         version: 1.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
         - 6
         - 2
         version: 2.6.2
   type: :development
-  version_requirements: *id005
+  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.
 email: 
 - aaron@tenderlovemaking.com
@@ -240,7 +218,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -249,7 +226,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"