arel 6.0.0.beta1 → 6.0.0.beta2

data/test/nodes/test_binary.rb

@@ -0,0 +1,26 @@
+require 'helper'
+require 'set'
+
+module Arel
+  module Nodes
+    describe 'Binary' do
+      describe '#hash' do
+        it 'generates a hash based on its value' do
+          eq = Equality.new('foo', 'bar')
+          eq2 = Equality.new('foo', 'bar')
+          eq3 = Equality.new('bar', 'baz')
+
+          assert_equal eq.hash, eq2.hash
+          refute_equal eq.hash, eq3.hash
+        end
+
+        it 'generates a hash specific to its class' do
+          eq = Equality.new('foo', 'bar')
+          neq = NotEqual.new('foo', 'bar')
+
+          refute_equal eq.hash, neq.hash
+        end
+      end
+    end
+  end
+end

data/test/nodes/test_extract.rb

@@ -15,6 +15,14 @@ describe Arel::Nodes::Extract do
         EXTRACT(DATE FROM "users"."timestamp") AS foo
       }
     end
+
+    it 'should not mutate the extract' do
+      table = Arel::Table.new :users
+      extract = table[:timestamp].extract('date')
+      before = extract.dup
+      extract.as('foo')
+      assert_equal extract, before
+    end
   end
 
   describe 'equality' do

data/test/test_select_manager.rb

@@ -307,13 +307,11 @@ module Arel
         table = Table.new :users
         @m1 = Arel::SelectManager.new Table.engine, table
         @m1.project Arel.star
-        @m1.where(table[:age].in(18..60))
+        @m1.where(table[:age].between(18..60))
 
         @m2 = Arel::SelectManager.new Table.engine, table
         @m2.project Arel.star
-        @m2.where(table[:age].in(40..99))
-
-
+        @m2.where(table[:age].between(40..99))
       end
 
       it 'should except two managers' do
@@ -1158,5 +1156,26 @@ module Arel
         manager.distinct(false).must_equal manager
       end
     end
+
+    describe 'distinct_on' do
+      it 'sets the quantifier' do
+        manager = Arel::SelectManager.new Table.engine
+        table = Table.new :users
+
+        manager.distinct_on(table['id'])
+        manager.ast.cores.last.set_quantifier.must_equal Arel::Nodes::DistinctOn.new(table['id'])
+
+        manager.distinct_on(false)
+        manager.ast.cores.last.set_quantifier.must_equal nil
+      end
+
+      it "chains" do
+        manager = Arel::SelectManager.new Table.engine
+        table = Table.new :users
+
+        manager.distinct_on(table['id']).must_equal manager
+        manager.distinct_on(false).must_equal manager
+      end
+    end
   end
 end

data/test/visitors/test_bind_visitor.rb

@@ -35,9 +35,6 @@ module Arel
 
       def test_visitor_yields_on_binds
         visitor = Class.new(Arel::Visitors::ToSql) {
-          def initialize omg
-          end
-
           include Arel::Visitors::BindVisitor
         }.new nil
 
@@ -49,9 +46,6 @@ module Arel
 
       def test_visitor_only_yields_on_binds
         visitor = Class.new(Arel::Visitors::ToSql) {
-          def initialize omg
-          end
-
           include Arel::Visitors::BindVisitor
         }.new(nil)
 

data/test/visitors/test_depth_first.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'set'
 
 module Arel
   module Visitors
@@ -171,6 +172,13 @@ module Arel
         assert_equal [:a, :b, node, list], @collector.calls
       end
 
+      def test_set
+        node = Nodes::Or.new(:a, :b)
+        set  = Set.new([node])
+        @visitor.accept set
+        assert_equal [:a, :b, node, set], @collector.calls
+      end
+
       def test_hash
         node = Nodes::Or.new(:a, :b)
         hash = { node => node }

data/test/visitors/test_informix.rb

@@ -11,21 +11,21 @@ module Arel
         @visitor.accept(node, Collectors::SQLString.new).value
       end
 
-      it 'uses LIMIT n to limit results' do
+      it 'uses FIRST n to limit results' do
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(1)
         sql = compile(stmt)
-        sql.must_be_like "SELECT LIMIT 1"
+        sql.must_be_like "SELECT FIRST 1"
       end
 
-      it 'uses LIMIT n in updates with a limit' do
+      it 'uses FIRST n in updates with a limit' do
         table = Table.new(:users)
         stmt = Nodes::UpdateStatement.new
         stmt.relation = table
         stmt.limit = Nodes::Limit.new(Nodes.build_quoted(1))
         stmt.key = table[:id]
         sql = compile(stmt)
-        sql.must_be_like "UPDATE \"users\" WHERE \"users\".\"id\" IN (SELECT LIMIT 1 \"users\".\"id\" FROM \"users\")"
+        sql.must_be_like "UPDATE \"users\" WHERE \"users\".\"id\" IN (SELECT FIRST 1 \"users\".\"id\" FROM \"users\")"
       end
 
       it 'uses SKIP n to jump results' do
@@ -35,12 +35,12 @@ module Arel
         sql.must_be_like "SELECT SKIP 10"
       end
 
-      it 'uses SKIP before LIMIT' do
+      it 'uses SKIP before FIRST' do
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(1)
         stmt.offset = Nodes::Offset.new(1)
         sql = compile(stmt)
-        sql.must_be_like "SELECT SKIP 1 LIMIT 1"
+        sql.must_be_like "SELECT SKIP 1 FIRST 1"
       end
 
       it 'uses INNER JOIN to perform joins' do

data/test/visitors/test_oracle.rb

@@ -87,6 +87,16 @@ module Arel
             }
           end
 
+          it 'creates a subquery when there is group by' do
+            stmt = Nodes::SelectStatement.new
+            stmt.cores.first.groups << Nodes::SqlLiteral.new('foo')
+            stmt.limit = Nodes::Limit.new(10)
+            sql = compile stmt
+            sql.must_be_like %{
+              SELECT * FROM (SELECT GROUP BY foo ) WHERE ROWNUM <= 10
+            }
+          end
+
           it 'creates a subquery when there is DISTINCT' do
             stmt = Nodes::SelectStatement.new
             stmt.cores.first.set_quantifier = Arel::Nodes::Distinct.new

data/test/visitors/test_to_sql.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'set'
 
 module Arel
   module Visitors
@@ -28,7 +29,7 @@ module Arel
           end
 
           def dispatch
-            { Arel::Table => 'hello' }
+            { Arel::Table.name => 'hello' }
           end
         }.new
 
@@ -131,6 +132,13 @@ module Arel
         end
       end
 
+      describe 'Nodes::Grouping' do
+        it 'wraps nested groupings in brackets only once' do
+          sql = compile Nodes::Grouping.new(Nodes::Grouping.new(Nodes.build_quoted('foo')))
+          sql.must_equal "('foo')"
+        end
+      end
+
       describe 'Nodes::NotEqual' do
         it 'should handle false' do
           val = Nodes.build_quoted(false, @table[:active])
@@ -221,6 +229,10 @@ module Arel
         compile(Nodes.build_quoted({:a => 1}))
       end
 
+      it "should visit_Set" do
+        compile Nodes.build_quoted(Set.new([1, 2]))
+      end
+
       it "should visit_BigDecimal" do
         compile Nodes.build_quoted(BigDecimal.new('2.14'))
       end
@@ -300,6 +312,13 @@ module Arel
           }
         end
 
+        it "can handle ESCAPE" do
+          node = @table[:name].matches('foo!%', '!')
+          compile(node).must_be_like %{
+            "users"."name" LIKE 'foo!%' ESCAPE '!'
+          }
+        end
+
         it 'can handle subqueries' do
           subquery = @table.project(:id).where(@table[:name].matches('foo%'))
           node = @attr.in subquery
@@ -317,6 +336,13 @@ module Arel
           }
         end
 
+        it "can handle ESCAPE" do
+          node = @table[:name].does_not_match('foo!%', '!')
+          compile(node).must_be_like %{
+            "users"."name" NOT LIKE 'foo!%' ESCAPE '!'
+          }
+        end
+
         it 'can handle subqueries' do
           subquery = @table.project(:id).where(@table[:name].does_not_match('foo%'))
           node = @attr.in subquery
@@ -349,33 +375,33 @@ module Arel
         end
 
         it 'can handle two dot ranges' do
-          node = @attr.in 1..3
+          node = @attr.between 1..3
           compile(node).must_be_like %{
             "users"."id" BETWEEN 1 AND 3
           }
         end
 
         it 'can handle three dot ranges' do
-          node = @attr.in 1...3
+          node = @attr.between 1...3
           compile(node).must_be_like %{
             "users"."id" >= 1 AND "users"."id" < 3
           }
         end
 
         it 'can handle ranges bounded by infinity' do
-          node = @attr.in 1..Float::INFINITY
+          node = @attr.between 1..Float::INFINITY
           compile(node).must_be_like %{
             "users"."id" >= 1
           }
-          node = @attr.in(-Float::INFINITY..3)
+          node = @attr.between(-Float::INFINITY..3)
           compile(node).must_be_like %{
             "users"."id" <= 3
           }
-          node = @attr.in(-Float::INFINITY...3)
+          node = @attr.between(-Float::INFINITY...3)
           compile(node).must_be_like %{
             "users"."id" < 3
           }
-          node = @attr.in(-Float::INFINITY..Float::INFINITY)
+          node = @attr.between(-Float::INFINITY..Float::INFINITY)
           compile(node).must_be_like %{1=1}
         end
 
@@ -453,33 +479,33 @@ module Arel
         end
 
         it 'can handle two dot ranges' do
-          node = @attr.not_in 1..3
-          compile(node).must_be_like %{
-            "users"."id" < 1 OR "users"."id" > 3
-          }
+          node = @attr.not_between 1..3
+          compile(node).must_equal(
+            %{("users"."id" < 1 OR "users"."id" > 3)}
+          )
         end
 
         it 'can handle three dot ranges' do
-          node = @attr.not_in 1...3
-          compile(node).must_be_like %{
-            "users"."id" < 1 OR "users"."id" >= 3
-          }
+          node = @attr.not_between 1...3
+          compile(node).must_equal(
+            %{("users"."id" < 1 OR "users"."id" >= 3)}
+          )
         end
 
         it 'can handle ranges bounded by infinity' do
-          node = @attr.not_in 1..Float::INFINITY
+          node = @attr.not_between 1..Float::INFINITY
           compile(node).must_be_like %{
             "users"."id" < 1
           }
-          node = @attr.not_in(-Float::INFINITY..3)
+          node = @attr.not_between(-Float::INFINITY..3)
           compile(node).must_be_like %{
             "users"."id" > 3
           }
-          node = @attr.not_in(-Float::INFINITY...3)
+          node = @attr.not_between(-Float::INFINITY...3)
           compile(node).must_be_like %{
             "users"."id" >= 3
           }
-          node = @attr.not_in(-Float::INFINITY..Float::INFINITY)
+          node = @attr.not_between(-Float::INFINITY..Float::INFINITY)
           compile(node).must_be_like %{1=0}
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.0.beta2
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,50 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
 description: |-
   Arel Really Exasperates Logicians
 
@@ -70,22 +56,18 @@ email:
 - aaron@tenderlovemaking.com
 - bryan@brynary.com
 - miloops@gmail.com
-- nick@example.org
 executables: []
 extensions: []
 extra_rdoc_files:
 - History.txt
 - MIT-LICENSE.txt
-- Manifest.txt
 - README.markdown
 files:
-- ".autotest"
-- ".gemtest"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - History.txt
 - MIT-LICENSE.txt
-- Manifest.txt
 - README.markdown
 - Rakefile
 - arel.gemspec
@@ -121,6 +103,7 @@ files:
 - lib/arel/nodes/inner_join.rb
 - lib/arel/nodes/insert_statement.rb
 - lib/arel/nodes/join_source.rb
+- lib/arel/nodes/matches.rb
 - lib/arel/nodes/named_function.rb
 - lib/arel/nodes/node.rb
 - lib/arel/nodes/outer_join.rb
@@ -170,6 +153,7 @@ files:
 - test/nodes/test_as.rb
 - test/nodes/test_ascending.rb
 - test/nodes/test_bin.rb
+- test/nodes/test_binary.rb
 - test/nodes/test_count.rb
 - test/nodes/test_delete_statement.rb
 - test/nodes/test_descending.rb
@@ -214,80 +198,30 @@ files:
 - test/visitors/test_postgres.rb
 - test/visitors/test_sqlite.rb
 - test/visitors/test_to_sql.rb
-homepage: http://github.com/rails/arel
+homepage: https://github.com/rails/arel
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby
-test_files:
-- test/attributes/test_attribute.rb
-- test/collectors/test_bind_collector.rb
-- test/collectors/test_sql_string.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_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_dispatch_contamination.rb
-- test/visitors/test_dot.rb
-- test/visitors/test_ibm_db.rb
-- test/visitors/test_informix.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
+test_files: []