arel_extensions 1.2.25 → 2.0.0.rc3

data/test/visitors/test_bulk_insert_sqlite.rb

@@ -1,7 +1,8 @@
-require 'arelx_test_helper'
+require 'helper'
 
 module ArelExtensions
   module BulkInsertSQLlite
+
     describe 'the sqlite visitor can bulk insert' do
       before do
         @conn = FakeRecord::Base.new
@@ -10,11 +11,11 @@ module ArelExtensions
         Arel::Table.engine = @conn
         @cols = ['id', 'name', 'comments', 'created_at']
         @data = [
-          [23, 'nom1', "sdfdsfdsfsdf", '2016-01-01'],
-          [25, 'nom2', "sdfdsfdsfsdf", '2016-01-01']
+        	[23, 'nom1', "sdfdsfdsfsdf", '2016-01-01'],
+        	[25, 'nom2', "sdfdsfdsfsdf", '2016-01-01']
         ]
       end
-
+      
       def compile node
         if Arel::VERSION.to_i > 5
           @visitor.accept(node, Arel::Collectors::SQLString.new).value
@@ -26,10 +27,10 @@ module ArelExtensions
       it "should import large set of data" do
         insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(@conn).into(@table)
         insert_manager.bulk_insert(@cols, @data)
-        _(compile(insert_manager.ast))
-          .must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at")
-                         SELECT 23 AS 'id', 'nom1' AS 'name', 'sdfdsfdsfsdf' AS 'comments', '2016-01-01' AS 'created_at' UNION ALL SELECT 25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01']
+        sql = compile(insert_manager.ast)
+    	  sql.must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at") SELECT 23 AS 'id', 'nom1' AS 'name', 'sdfdsfdsfsdf' AS 'comments', '2016-01-01' AS 'created_at' UNION ALL SELECT 25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01']
       end
-    end
+
+	  end
   end
-end
+end

data/test/visitors/test_bulk_insert_to_sql.rb

@@ -1,4 +1,4 @@
-require 'arelx_test_helper'
+require 'helper'
 
 module ArelExtensions
   module BulkInsertToSql
@@ -10,8 +10,8 @@ module ArelExtensions
         @table = Arel::Table.new(:users)
         @cols = ['id', 'name', 'comments', 'created_at']
         @data = [
-          [23, 'nom1', "sdfdsfdsfsdf", '2016-01-01'],
-          [25, 'nom2', "sdfdsfdsfsdf", '2016-01-01']
+        	[23, 'nom1', "sdfdsfdsfsdf", '2016-01-01'],
+        	[25, 'nom2', "sdfdsfdsfsdf", '2016-01-01']
         ]
       end
 
@@ -26,10 +26,12 @@ module ArelExtensions
 
       it "should import large set of data using ToSql" do
         insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(@conn).into(@table)
-        insert_manager.bulk_insert(@cols, @data)
-        _(compile(insert_manager.ast))
-          .must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at") VALUES (23, 'nom1', 'sdfdsfdsfsdf', '2016-01-01'), (25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01')]
+      	insert_manager.bulk_insert(@cols, @data)
+      	sql = compile(insert_manager.ast)
+    	  sql.must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at") VALUES (23, 'nom1', 'sdfdsfdsfsdf', '2016-01-01'), (25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01')]
       end
-    end
+
+
+	end
   end
-end
+end

data/test/visitors/test_oracle.rb

@@ -1,4 +1,4 @@
-require 'arelx_test_helper'
+require 'helper'
 
 module ArelExtensions
   module VisitorOracle
@@ -23,87 +23,87 @@ module ArelExtensions
       # Comparators
 
       it "should accept comparators on integers" do
-        _(compile(@table[:id] == 42)).must_match %{"users"."id" = 42}
-        _(compile(@table[:id] == @table[:id])).must_be_like %{"users"."id" = "users"."id"}
-        _(compile(@table[:id] != 42)).must_match %{"users"."id" != 42}
-        _(compile(@table[:id] > 42)).must_match %{"users"."id" > 42}
-        _(compile(@table[:id] >= 42)).must_match %{"users"."id" >= 42}
-        _(compile(@table[:id] >= @table[:id])).must_be_like %{"users"."id" >= "users"."id"}
-        _(compile(@table[:id] < 42)).must_match %{"users"."id" < 42}
-        _(compile(@table[:id] <= 42)).must_match %{"users"."id" <= 42}
-        _(compile((@table[:id] <= 42).as('new_name'))).must_match %{("users"."id" <= 42) AS new_name}
+        compile(@table[:id] == 42).must_match %{"users"."id" = 42}
+        compile(@table[:id] == @table[:id]).must_be_like %{"users"."id" = "users"."id"}
+        compile(@table[:id] != 42).must_match %{"users"."id" != 42}
+        compile(@table[:id] > 42).must_match %{"users"."id" > 42}
+        compile(@table[:id] >= 42).must_match %{"users"."id" >= 42}
+        compile(@table[:id] >= @table[:id]).must_be_like %{"users"."id" >= "users"."id"}
+        compile(@table[:id] < 42).must_match %{"users"."id" < 42}
+        compile(@table[:id] <= 42).must_match %{"users"."id" <= 42}
+        compile((@table[:id] <= 42).as('new_name')).must_match %{("users"."id" <= 42) AS new_name}
       end
 
       it "should accept comparators on dates" do
         c = @table[:created_at]
         u = @table[:updated_at]
-        _(compile(c > @date)).must_be_like %{"users"."created_at" > '2016-03-31'}
-        _(compile(u >= @date)).must_be_like %{"users"."updated_at" >= '2016-03-31'}
-        _(compile(c < u)).must_be_like %{"users"."created_at" < "users"."updated_at"}
+        compile(c > @date).must_be_like %{"users"."created_at" > '2016-03-31'}
+        compile(u >= @date).must_be_like %{"users"."updated_at" >= '2016-03-31'}
+        compile(c < u).must_be_like %{"users"."created_at" < "users"."updated_at"}
       end
 
       it "should accept comparators on strings" do
         c = @table[:name]
-        _(compile(c == 'test')).must_be_like %{"users"."name" = 'test'}
-        _(compile(c != 'test')).must_be_like %{"users"."name" != 'test'}
-        _(compile(c > 'test')).must_be_like %{"users"."name" > 'test'}
-        _(compile((c >= 'test').as('new_name'))).must_be_like %{("users"."name" >= 'test') AS new_name}
-        _(compile(c <= @table[:comments])).must_be_like %{"users"."name" <= "users"."comments"}
-        _(compile(c =~ /\Atest\Z/)).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
-        _(compile(c =~ /\Atest\z/)).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
-        _(compile(c =~ '^test$')).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
-        _(compile(c !~ /\Ate\Dst\Z/)).must_be_like %{NOT REGEXP_LIKE("users"."name", '^te[^0-9]st$')}
-        _(compile(c.imatches('%test%'))).must_be_like %{LOWER("users"."name") LIKE LOWER('%test%')}
-        _(compile(c.imatches_any(['%test%', 't2']))).must_be_like %{((LOWER("users"."name") LIKE LOWER('%test%')) OR (LOWER("users"."name") LIKE LOWER('t2')))}
-        _(compile(c.idoes_not_match('%test%'))).must_be_like %{LOWER("users"."name") NOT LIKE LOWER('%test%')}
+        compile(c == 'test').must_be_like %{"users"."name" = 'test'}
+        compile(c != 'test').must_be_like %{"users"."name" != 'test'}
+        compile(c > 'test').must_be_like %{"users"."name" > 'test'}
+        compile((c >= 'test').as('new_name')).must_be_like %{("users"."name" >= 'test') AS new_name}
+        compile(c <= @table[:comments]).must_be_like %{"users"."name" <= "users"."comments"}
+        compile(c =~ /\Atest\Z/).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
+        compile(c =~ '^test$').must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
+        compile(c !~ /\Ate\Dst\Z/).must_be_like %{NOT REGEXP_LIKE("users"."name", '^te[^0-9]st$')}
+        compile(c.imatches('%test%')).must_be_like %{LOWER("users"."name") LIKE LOWER('%test%')}
+        compile(c.imatches_any(['%test%', 't2'])).must_be_like %{((LOWER("users"."name") LIKE LOWER('%test%')) OR (LOWER("users"."name") LIKE LOWER('t2')))}
+        compile(c.idoes_not_match('%test%')).must_be_like %{LOWER("users"."name") NOT LIKE LOWER('%test%')}
       end
 
       # Maths
       # DateDiff
       it "should diff date col and date" do
-        _(compile(@table[:created_at] - Date.new(2016, 3, 31))).must_match %{"users"."created_at" - TO_DATE('2016-03-31')}
+        compile(@table[:created_at] - Date.new(2016, 3, 31)).must_match %{"users"."created_at" - TO_DATE('2016-03-31')}
       end
 
       it "should diff date col and datetime col" do
-        _(compile(@table[:created_at] - @table[:updated_at])).must_match %{"users"."created_at" - "users"."updated_at"}
+        compile(@table[:created_at] - @table[:updated_at]).must_match %{"users"."created_at" - "users"."updated_at"}
       end
 
       it "should diff date col and datetime col with AS" do
         sql = compile((@table[:updated_at] - @table[:created_at]).as('new_name'))
-        #        sql.must_be_like %{(TO_DATE("users"."updated_at") - "users"."created_at") * 86400 AS new_name}
-        _(sql).must_be_like %{("users"."updated_at" - "users"."created_at") * (CASE WHEN (TRUNC("users"."updated_at", 'DDD') = "users"."updated_at") THEN 1 ELSE 86400 END) AS new_name}
+#        sql.must_be_like %{(TO_DATE("users"."updated_at") - "users"."created_at") * 86400 AS new_name}
+        sql.must_be_like %{("users"."updated_at" - "users"."created_at") * (CASE WHEN (TRUNC("users"."updated_at", 'DDD') = "users"."updated_at") THEN 1 ELSE 86400 END) AS new_name}
       end
 
       it "should diff between time values" do
         d2 = Time.new(2015,6,1)
         d1 = DateTime.new(2015,6,2)
-        _(compile(ArelExtensions::Nodes::DateDiff.new([d1,d2])))
-          .must_match("TO_DATE('2015-06-02') - TO_DATE('2015-06-01')")
+        sql = compile(ArelExtensions::Nodes::DateDiff.new([d1,d2]))
+        sql.must_match("TO_DATE('2015-06-02') - TO_DATE('2015-06-01')")
       end
 
       it "should diff between time values and time col" do
         d1 = DateTime.new(2015,6,2)
-        _(compile(ArelExtensions::Nodes::DateDiff.new([d1, @table[:updated_at]])))
-          .must_match %{TO_DATE('2015-06-02') - "users"."updated_at"}
+        sql = compile(ArelExtensions::Nodes::DateDiff.new([d1, @table[:updated_at]]))
+        sql.must_match %{TO_DATE('2015-06-02') - "users"."updated_at"}
       end
 
       it "should accept operators on dates with numbers" do
         c = @table[:created_at]
-        _(compile(c - 42)).must_be_like %{DATE_SUB("users"."created_at", 42)}
-        _(compile(c - @table[:id])).must_be_like %{DATE_SUB("users"."created_at", "users"."id")}
+        compile(c - 42).must_be_like %{DATE_SUB("users"."created_at", 42)}
+        compile(c - @table[:id]).must_be_like %{DATE_SUB("users"."created_at", "users"."id")}
       end
 
       # Maths on sums
       it "should accept math operators on anything" do
         c = @table[:name]
-        _((c == 'test').to_sql).must_be_like %{"users"."name" = 'test'}
-        _((c != 'test').to_sql).must_be_like %{"users"."name" != 'test'}
-        _((c > 'test').to_sql).must_be_like %{"users"."name" > 'test'}
-        _(compile((c >= 'test').as('new_name'))).must_be_like %{("users"."name" >= 'test') AS new_name}
-        _(compile(c <= @table[:comments])).must_be_like %{"users"."name" <= "users"."comments"}
-        _(compile(c =~ /\Atest\Z/)).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
-        _(compile(c !~ /\Ate\Dst\Z/)).must_be_like %{NOT REGEXP_LIKE("users"."name", '^te[^0-9]st$')}
+        (c == 'test').to_sql.must_be_like %{"users"."name" = 'test'}
+        (c != 'test').to_sql.must_be_like %{"users"."name" != 'test'}
+        (c > 'test').to_sql.must_be_like %{"users"."name" > 'test'}
+        compile((c >= 'test').as('new_name')).must_be_like %{("users"."name" >= 'test') AS new_name}
+        compile(c <= @table[:comments]).must_be_like %{"users"."name" <= "users"."comments"}
+        compile(c =~ /\Atest\Z/).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
+        compile(c !~ /\Ate\Dst\Z/).must_be_like %{NOT REGEXP_LIKE("users"."name", '^te[^0-9]st$')}
       end
+
     end
   end
 end