arel 5.0.1.20140414130214 → 6.0.0.beta1

data/lib/arel/visitors/visitor.rb

@@ -18,8 +18,8 @@ module Arel
         DISPATCH[self.class]
       end
 
-      def visit object, attribute = nil
-        send dispatch[object.class], object, attribute
+      def visit object
+        send dispatch[object.class], object
       rescue NoMethodError => e
         raise e if respond_to?(dispatch[object.class], true)
         superklass = object.class.ancestors.find { |klass|

data/lib/arel/visitors/where_sql.rb

@@ -1,8 +1,9 @@
 module Arel
   module Visitors
     class WhereSql < Arel::Visitors::ToSql
-      def visit_Arel_Nodes_SelectCore o, a
-        "WHERE #{o.wheres.map { |x| visit x, a }.join ' AND ' }"
+      def visit_Arel_Nodes_SelectCore o, collector
+        collector << "WHERE "
+        inject_join o.wheres, collector, ' AND '
       end
     end
   end

data/test/attributes/test_attribute.rb

@@ -74,6 +74,17 @@ module Arel
             SELECT "users"."id" FROM "users" WHERE "users"."id" > 10
           }
         end
+
+        it 'should handle comparing with a subquery' do
+          users = Table.new(:users)
+
+          avg = users.project(users[:karma].average)
+          mgr = users.project(Arel.star).where(users[:karma].gt(avg))
+
+          mgr.to_sql.must_be_like %{
+            SELECT * FROM "users" WHERE "users"."karma" > (SELECT AVG("users"."karma") AS avg_id FROM "users")
+          }
+        end
       end
 
       describe '#gt_any' do
@@ -329,7 +340,7 @@ module Arel
           attribute = Attribute.new nil, nil
           equality = attribute.eq 1
           equality.left.must_equal attribute
-          equality.right.must_equal 1
+          equality.right.val.must_equal 1
           equality.must_be_kind_of Nodes::Equality
         end
 
@@ -550,8 +561,6 @@ module Arel
       end
 
       describe '#not_in' do
-        it 'can be constructed with a list' do
-        end
 
         it 'should return a NotIn node' do
           attribute = Attribute.new nil, nil

data/test/collectors/test_bind_collector.rb

@@ -0,0 +1,70 @@
+require 'helper'
+require 'arel/collectors/bind'
+
+module Arel
+  module Collectors
+    class TestBindCollector < Arel::Test
+      def setup
+        @conn = FakeRecord::Base.new
+        @visitor = Visitors::ToSql.new @conn.connection
+        super
+      end
+
+      def collect node
+        @visitor.accept(node, Collectors::Bind.new)
+      end
+
+      def compile node
+        collect(node).value
+      end
+
+      def ast_with_binds bv
+        table = Table.new(:users)
+        manager = Arel::SelectManager.new Table.engine, table
+        manager.where(table[:age].eq(bv))
+        manager.where(table[:name].eq(bv))
+        manager.ast
+      end
+
+      def test_leaves_binds
+        node = Nodes::BindParam.new 'omg'
+        list = compile node
+        assert_equal node, list.first
+        assert_equal node.class, list.first.class
+      end
+
+      def test_adds_strings
+        bv = Nodes::BindParam.new('?')
+        list = compile ast_with_binds bv
+        assert_operator list.length, :>, 0
+        assert_equal bv, list.grep(Nodes::BindParam).first
+        assert_equal bv.class, list.grep(Nodes::BindParam).first.class
+      end
+
+      def test_substitute_binds
+        bv = Nodes::BindParam.new('?')
+        collector = collect ast_with_binds bv
+
+        values = collector.value
+
+        offsets = values.map.with_index { |v,i|
+          [v,i]
+        }.find_all { |(v,_)| Nodes::BindParam === v }.map(&:last)
+
+        list = collector.substitute_binds ["hello", "world"]
+        assert_equal "hello", list[offsets[0]]
+        assert_equal "world", list[offsets[1]]
+
+        assert_equal 'SELECT FROM "users" WHERE "users"."age" = hello AND "users"."name" = world', list.join
+      end
+
+      def test_compile
+        bv = Nodes::BindParam.new('?')
+        collector = collect ast_with_binds bv
+
+        sql = collector.compile ["hello", "world"]
+        assert_equal 'SELECT FROM "users" WHERE "users"."age" = hello AND "users"."name" = world', sql
+      end
+    end
+  end
+end

data/test/collectors/test_sql_string.rb

@@ -0,0 +1,38 @@
+require 'helper'
+require 'arel/collectors/bind'
+
+module Arel
+  module Collectors
+    class TestSqlString < Arel::Test
+      def setup
+        @conn = FakeRecord::Base.new
+        @visitor = Visitors::ToSql.new @conn.connection
+        super
+      end
+
+      def collect node
+        @visitor.accept(node, Collectors::SQLString.new)
+      end
+
+      def compile node
+        collect(node).value
+      end
+
+      def ast_with_binds bv
+        table = Table.new(:users)
+        manager = Arel::SelectManager.new Table.engine, table
+        manager.where(table[:age].eq(bv))
+        manager.where(table[:name].eq(bv))
+        manager.ast
+      end
+
+      def test_compile
+        bv = Nodes::BindParam.new('?')
+        collector = collect ast_with_binds bv
+
+        sql = collector.compile ["hello", "world"]
+        assert_equal 'SELECT FROM "users" WHERE "users"."age" = ? AND "users"."name" = ?', sql
+      end
+    end
+  end
+end

data/test/helper.rb

@@ -4,10 +4,19 @@ require 'fileutils'
 require 'arel'
 
 require 'support/fake_record'
-Arel::Table.engine = Arel::Sql::Engine.new(FakeRecord::Base.new)
+Arel::Table.engine = FakeRecord::Base.new
 
 class Object
   def must_be_like other
     gsub(/\s+/, ' ').strip.must_equal other.gsub(/\s+/, ' ').strip
   end
 end
+
+module Arel
+  class Test < MiniTest::Test
+    def assert_like expected, actual
+      assert_equal expected.gsub(/\s+/, ' ').strip,
+                   actual.gsub(/\s+/, ' ').strip
+    end
+  end
+end

data/test/nodes/test_bin.rb

@@ -10,13 +10,13 @@ module Arel
       def test_default_to_sql
         viz  = Arel::Visitors::ToSql.new Table.engine.connection_pool
         node = Arel::Nodes::Bin.new(Arel.sql('zomg'))
-        assert_equal 'zomg', viz.accept(node)
+        assert_equal 'zomg', viz.accept(node, Collectors::SQLString.new).value
       end
 
       def test_mysql_to_sql
         viz  = Arel::Visitors::MySQL.new Table.engine.connection_pool
         node = Arel::Nodes::Bin.new(Arel.sql('zomg'))
-        assert_equal 'BINARY zomg', viz.accept(node)
+        assert_equal 'BINARY zomg', viz.accept(node, Collectors::SQLString.new).value
       end
 
       def test_equality_with_same_ivars

data/test/nodes/test_count.rb

@@ -1,12 +1,6 @@
 require 'helper'
 
 describe Arel::Nodes::Count do
-  describe 'backwards compatibility' do
-    it 'must be an expression' do
-      Arel::Nodes::Count.new('foo').must_be_kind_of Arel::Expression
-    end
-  end
-
   describe "as" do
     it 'should alias the count' do
       table = Arel::Table.new :users

data/test/nodes/test_equality.rb

@@ -43,7 +43,7 @@ module Arel
             attr = Table.new(:users)[:id]
             test = attr.eq(10)
             test.to_sql engine
-            engine.connection.quote_count.must_equal 2
+            engine.connection.quote_count.must_equal 3
           end
         end
       end

data/test/nodes/test_grouping.rb

@@ -4,7 +4,7 @@ module Arel
   module Nodes
     describe 'Grouping' do
       it 'should create Equality nodes' do
-        grouping = Grouping.new('foo')
+        grouping = Grouping.new(Nodes.build_quoted('foo'))
         grouping.eq('foo').to_sql.must_be_like %q{('foo') = 'foo'}
       end
 

data/test/nodes/test_infix_operation.rb

@@ -18,7 +18,7 @@ module Arel
         assert_equal 'zomg', aliaz.right
       end
 
-      def test_opertaion_ordering
+      def test_operation_ordering
         operation = InfixOperation.new :+, 1, 2
         ordering = operation.desc
         assert_kind_of Descending, ordering

data/test/nodes/test_select_core.rb

@@ -11,20 +11,20 @@ module Arel
 
         dolly = core.clone
 
-        dolly.froms.must_equal core.froms
-        dolly.projections.must_equal core.projections
-        dolly.wheres.must_equal core.wheres
+        assert_equal core.froms, dolly.froms
+        assert_equal core.projections, dolly.projections
+        assert_equal core.wheres, dolly.wheres
 
-        dolly.froms.wont_be_same_as core.froms
-        dolly.projections.wont_be_same_as core.projections
-        dolly.wheres.wont_be_same_as core.wheres
+        refute_same core.froms, dolly.froms
+        refute_same core.projections, dolly.projections
+        refute_same core.wheres, dolly.wheres
       end
 
       def test_set_quantifier
         core = Arel::Nodes::SelectCore.new
         core.set_quantifier = Arel::Nodes::Distinct.new
         viz = Arel::Visitors::ToSql.new Table.engine.connection_pool
-        assert_match 'DISTINCT', viz.accept(core)
+        assert_match 'DISTINCT', viz.accept(core, Collectors::SQLString.new).value
       end
 
       def test_equality_with_same_ivars

data/test/nodes/test_sql_literal.rb

@@ -5,7 +5,11 @@ module Arel
   module Nodes
     describe 'sql literal' do
       before do
-        @visitor = Visitors::ToSql.new Table.engine.connection_pool
+        @visitor = Visitors::ToSql.new Table.engine.connection
+      end
+
+      def compile node
+        @visitor.accept(node, Collectors::SQLString.new).value
       end
 
       describe 'sql' do
@@ -18,19 +22,19 @@ module Arel
       describe 'count' do
         it 'makes a count node' do
           node = SqlLiteral.new('*').count
-          @visitor.accept(node).must_be_like %{ COUNT(*) }
+          compile(node).must_be_like %{ COUNT(*) }
         end
 
         it 'makes a distinct node' do
           node = SqlLiteral.new('*').count true
-          @visitor.accept(node).must_be_like %{ COUNT(DISTINCT *) }
+          compile(node).must_be_like %{ COUNT(DISTINCT *) }
         end
       end
 
       describe 'equality' do
         it 'makes an equality node' do
           node = SqlLiteral.new('foo').eq(1)
-          @visitor.accept(node).must_be_like %{ foo = 1 }
+          compile(node).must_be_like %{ foo = 1 }
         end
 
         it 'is equal with equal contents' do
@@ -47,14 +51,14 @@ module Arel
       describe 'grouped "or" equality' do
         it 'makes a grouping node with an or node' do
           node = SqlLiteral.new('foo').eq_any([1,2])
-          @visitor.accept(node).must_be_like %{ (foo = 1 OR foo = 2) }
+          compile(node).must_be_like %{ (foo = 1 OR foo = 2) }
         end
       end
 
       describe 'grouped "and" equality' do
         it 'makes a grouping node with an or node' do
           node = SqlLiteral.new('foo').eq_all([1,2])
-          @visitor.accept(node).must_be_like %{ (foo = 1 AND foo = 2) }
+          compile(node).must_be_like %{ (foo = 1 AND foo = 2) }
         end
       end
 

data/test/nodes/test_window.rb

@@ -7,9 +7,11 @@ module Arel
         it 'is equal with equal ivars' do
           window1 = Window.new
           window1.orders = [1, 2]
+          window1.partitions = [1]
           window1.frame 3
           window2 = Window.new
           window2.orders = [1, 2]
+          window2.partitions = [1]
           window2.frame 3
           array = [window1, window2]
           assert_equal 1, array.uniq.size
@@ -18,9 +20,11 @@ module Arel
         it 'is not equal with different ivars' do
           window1 = Window.new
           window1.orders = [1, 2]
+          window1.partitions = [1]
           window1.frame 3
           window2 = Window.new
           window2.orders = [1, 2]
+          window1.partitions = [1]
           window2.frame 4
           array = [window1, window2]
           assert_equal 2, array.uniq.size
@@ -33,9 +37,11 @@ module Arel
         it 'is equal with equal ivars' do
           window1 = NamedWindow.new 'foo'
           window1.orders = [1, 2]
+          window1.partitions = [1]
           window1.frame 3
           window2 = NamedWindow.new 'foo'
           window2.orders = [1, 2]
+          window2.partitions = [1]
           window2.frame 3
           array = [window1, window2]
           assert_equal 1, array.uniq.size
@@ -44,9 +50,11 @@ module Arel
         it 'is not equal with different ivars' do
           window1 = NamedWindow.new 'foo'
           window1.orders = [1, 2]
+          window1.partitions = [1]
           window1.frame 3
           window2 = NamedWindow.new 'bar'
           window2.orders = [1, 2]
+          window2.partitions = [1]
           window2.frame 3
           array = [window1, window2]
           assert_equal 2, array.uniq.size
@@ -68,6 +76,4 @@ module Arel
       end
     end
   end
-end
-
-
+end

data/test/support/fake_record.rb

@@ -60,12 +60,20 @@ module FakeRecord
     end
 
     def quote thing, column = nil
-      if column && column.type == :integer
-        return 'NULL' if thing.nil?
-        return thing.to_i
+      if column && !thing.nil?
+        case column.type
+        when :integer
+          thing = thing.to_i
+        when :string
+          thing = thing.to_s
+        end
       end
 
       case thing
+      when DateTime
+        "'#{thing.strftime("%Y-%m-%d %H:%M:%S")}'"
+      when Date
+        "'#{thing.strftime("%Y-%m-%d")}'"
       when true
         "'t'"
       when false
@@ -75,7 +83,7 @@ module FakeRecord
       when Numeric
         thing
       else
-        "'#{thing}'"
+        "'#{thing.to_s.gsub("'", "\\\\'")}'"
       end
     end
   end
@@ -107,6 +115,10 @@ module FakeRecord
     def schema_cache
       connection
     end
+
+    def quote thing, column = nil
+      connection.quote thing, column
+    end
   end
 
   class Base

data/test/test_factory_methods.rb

@@ -37,7 +37,7 @@ module Arel
         lower = @factory.lower :one
         assert_instance_of Nodes::NamedFunction, lower
         assert_equal 'LOWER', lower.name
-        assert_equal [:one], lower.expressions
+        assert_equal [:one], lower.expressions.map(&:expr)
       end
     end
   end

data/test/test_insert_manager.rb

@@ -20,9 +20,10 @@ module Arel
 
       it 'allows sql literals' do
         manager        = Arel::InsertManager.new Table.engine
+        manager.into Table.new(:users)
         manager.values = manager.create_values [Arel.sql('*')], %w{ a }
         manager.to_sql.must_be_like %{
-          INSERT INTO NULL VALUES (*)
+          INSERT INTO \"users\" VALUES (*)
         }
       end
 
@@ -77,14 +78,19 @@ module Arel
         }
       end
 
-      it 'takes an empty list' do
+      it 'noop for empty list' do
+        table = Table.new(:users)
         manager = Arel::InsertManager.new Table.engine
+        manager.insert [[table[:id], 1]]
         manager.insert []
+        manager.to_sql.must_be_like %{
+          INSERT INTO "users" ("id") VALUES (1)
+        }
       end
     end
 
     describe 'into' do
-      it 'takes an engine' do
+      it 'takes a Table and chains' do
         manager = Arel::InsertManager.new Table.engine
         manager.into(Table.new(:users)).must_equal manager
       end
@@ -125,7 +131,7 @@ module Arel
     end
 
     describe "combo" do
-      it "puts shit together" do
+      it "combines columns and values list in order" do
         table   = Table.new :users
         manager = Arel::InsertManager.new Table.engine
         manager.into table
@@ -138,5 +144,28 @@ module Arel
         }
       end
     end
+
+    describe "select" do
+
+      it "accepts a select query in place of a VALUES clause" do
+        table   = Table.new :users
+
+        manager = Arel::InsertManager.new Table.engine
+        manager.into table
+
+        select = Arel::SelectManager.new Table.engine
+        select.project Arel.sql('1')
+        select.project Arel.sql('"aaron"')
+
+        manager.select select
+        manager.columns << table[:id]
+        manager.columns << table[:name]
+        manager.to_sql.must_be_like %{
+          INSERT INTO "users" ("id", "name") (SELECT 1, "aaron")
+        }
+      end
+
+    end
+
   end
 end