arel 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bffeca2f74de102b93f79a39be17415ef98399f
-  data.tar.gz: ebd8a4b403109325f511a917ade3a8ea79a86292
+  metadata.gz: f4264ab4b4e747b29ec7a97c5d54f79f95ef15db
+  data.tar.gz: 9122058016114dc381291e8d66d62fcd1327bdb6
 SHA512:
-  metadata.gz: 8c2e5369682dc3fd3ed0d0ebc8336ce5a4d0ad8f0436ccbc49c5c741cad6c7601fd13d36906319260ddc184270f2bfd6712d3024d1bf144c1fcb5378327caf64
-  data.tar.gz: 69c8070216e4a9ed581a0ff084710c20d5152051d8be144a4e51351fa6c8215373c692301c847fee61eec88c8aa764914ec919208b635a8388368031e6f2c3c9
+  metadata.gz: 24d225c695b37c2a1923ff2460ab13a0711fb2659f1440ca3ef898e6bd6cb7cd65ee6001af10d013b4c6d6e7cd41aa983ef48011df036f1db76e868fc2b04695
+  data.tar.gz: d836640d595a871b8bcb23410ae28412604f51c396ffc3da56017c38af2503bcac1ebe898807a77ab3377390eba48fafb4396856b2d22ed16377f26aa19f07c6

data/.travis.yml

@@ -1,12 +1,10 @@
 script: "rake test"
 rvm:
-  - 1.8.7
-  - rbx-18mode
   - rbx-19mode
   - jruby
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0
 notifications:
   email: false
   irc:

data/Gemfile

@@ -5,7 +5,7 @@
 source :gemcutter
 
 
-gem "minitest", "~>4.3.3", :group => [:development, :test]
+gem "minitest", "~>4.6.2", :group => [:development, :test]
 gem "hoe", "~>3.3.1", :group => [:development, :test]
 
 # vim: syntax=ruby

data/arel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "arel"
-  s.version = "4.0.0.beta1.20130225132415"
+  s.version = "4.0.0.beta2.20130314230643"
 
   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 = "2013-02-25"
+  s.date = "2013-03-15"
   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"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "arel"
-  s.rubygems_version = "2.0.0"
+  s.rubygems_version = "2.0.2"
   s.summary = "Arel is a SQL AST manager for Ruby"
   s.test_files = ["test/attributes/test_attribute.rb", "test/nodes/test_and.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_distinct.rb", "test/nodes/test_equality.rb", "test/nodes/test_extract.rb", "test/nodes/test_false.rb", "test/nodes/test_grouping.rb", "test/nodes/test_infix_operation.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_named_function.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_over.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_table_alias.rb", "test/nodes/test_true.rb", "test/nodes/test_update_statement.rb", "test/nodes/test_window.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_factory_methods.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_bind_visitor.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_informix.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"]
 

data/lib/arel.rb

@@ -32,7 +32,7 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '4.0.0.beta1'
+  VERSION = '4.0.0.beta2'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/predications.rb

@@ -29,7 +29,15 @@ module Arel
       when Arel::SelectManager
         Arel::Nodes::In.new(self, other.ast)
       when Range
-        if other.exclude_end?
+        if other.begin == -Float::INFINITY && other.end == Float::INFINITY
+          Nodes::NotIn.new self, []
+        elsif other.end == Float::INFINITY
+          Nodes::GreaterThanOrEqual.new(self, other.begin)
+        elsif other.begin == -Float::INFINITY && other.exclude_end?
+          Nodes::LessThan.new(self, other.end)
+        elsif other.begin == -Float::INFINITY
+          Nodes::LessThanOrEqual.new(self, other.end)
+        elsif other.exclude_end?
           left  = Nodes::GreaterThanOrEqual.new(self, other.begin)
           right = Nodes::LessThan.new(self, other.end)
           Nodes::And.new [left, right]
@@ -54,7 +62,15 @@ module Arel
       when Arel::SelectManager
         Arel::Nodes::NotIn.new(self, other.ast)
       when Range
-        if other.exclude_end?
+        if other.begin == -Float::INFINITY && other.end == Float::INFINITY
+          Nodes::In.new self, []
+        elsif other.end == Float::INFINITY
+          Nodes::LessThan.new(self, other.begin)
+        elsif other.begin == -Float::INFINITY && other.exclude_end?
+          Nodes::GreaterThanOrEqual.new(self, other.end)
+        elsif other.begin == -Float::INFINITY
+          Nodes::GreaterThan.new(self, other.end)
+        elsif other.exclude_end?
           left  = Nodes::LessThan.new(self, other.begin)
           right = Nodes::GreaterThanOrEqual.new(self, other.end)
           Nodes::Or.new left, right

data/lib/arel/visitors/to_sql.rb

@@ -147,11 +147,11 @@ key on UpdateManager using UpdateManager#key=
 
         return nil unless table_exists? table
 
-        column_cache[table][name]
+        column_cache(table)[name]
       end
 
-      def column_cache
-        @schema_cache.columns_hash
+      def column_cache(table)
+        @schema_cache.columns_hash(table)
       end
 
       def visit_Arel_Nodes_Values o

data/test/support/fake_record.rb

@@ -3,7 +3,7 @@ module FakeRecord
   end
 
   class Connection
-    attr_reader :tables, :columns_hash
+    attr_reader :tables
     attr_accessor :visitor
 
     def initialize(visitor = nil)
@@ -31,6 +31,10 @@ module FakeRecord
       @visitor = visitor
     end
 
+    def columns_hash table_name
+      @columns_hash[table_name]
+    end
+
     def primary_key name
       @primary_keys[name.to_s]
     end

data/test/visitors/test_to_sql.rb

@@ -230,6 +230,23 @@ module Arel
           }
         end
 
+        it 'can handle ranges bounded by infinity' do
+          node = @attr.in 1..Float::INFINITY
+          @visitor.accept(node).must_be_like %{
+            "users"."id" >= 1
+          }
+          node = @attr.in(-Float::INFINITY..3)
+          @visitor.accept(node).must_be_like %{
+            "users"."id" <= 3
+          }
+          node = @attr.in(-Float::INFINITY...3)
+          @visitor.accept(node).must_be_like %{
+            "users"."id" < 3
+          }
+          node = @attr.in(-Float::INFINITY..Float::INFINITY)
+          @visitor.accept(node).must_be_like %{1=1}
+        end
+
         it 'can handle subqueries' do
           table = Table.new(:users)
           subquery = table.project(:id).where(table[:name].eq('Aaron'))
@@ -316,6 +333,23 @@ module Arel
           }
         end
 
+        it 'can handle ranges bounded by infinity' do
+          node = @attr.not_in 1..Float::INFINITY
+          @visitor.accept(node).must_be_like %{
+            "users"."id" < 1
+          }
+          node = @attr.not_in(-Float::INFINITY..3)
+          @visitor.accept(node).must_be_like %{
+            "users"."id" > 3
+          }
+          node = @attr.not_in(-Float::INFINITY...3)
+          @visitor.accept(node).must_be_like %{
+            "users"."id" >= 3
+          }
+          node = @attr.not_in(-Float::INFINITY..Float::INFINITY)
+          @visitor.accept(node).must_be_like %{1=0}
+        end
+
         it 'can handle subqueries' do
           table = Table.new(:users)
           subquery = table.project(:id).where(table[:name].eq('Aaron'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: arel
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Arel is a SQL AST manager for Ruby