arel_extensions 1.2.8 → 1.2.16

data/lib/arel_extensions/visitors/oracle.rb

@@ -1,7 +1,7 @@
 #require 'oracle_visitor'
 module ArelExtensions
   module Visitors
-    Arel::Visitors::Oracle.class_eval do
+    class Arel::Visitors::Oracle
 
       SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
       Arel::Visitors::Oracle::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
@@ -467,14 +467,12 @@ module ArelExtensions
           o.left.each_with_index do |row, idx| # values
           collector << " UNION ALL " if idx != 0
             collector << "(SELECT "
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.each_with_index { |value, i|
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
                 case value
                 when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
                   collector = visit value, collector
                 else
-                  attr = v.columns[i]
                   collector << quote(value, attr && column_for(attr)).to_s
                 end
                 collector << Arel::Visitors::Oracle::COMMA unless i == len
@@ -490,12 +488,13 @@ module ArelExtensions
           o.left.each_with_index do |row, idx|
             collector << " UNION ALL " if idx != 0
             collector << "(SELECT "
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
               case value
               when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
                 collector = visit value, collector
+              when Integer
+                collector << value.to_s
               else
                 collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
               end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -1,6 +1,6 @@
 module ArelExtensions
   module Visitors
-    Arel::Visitors::PostgreSQL.class_eval do
+    class Arel::Visitors::PostgreSQL
       Arel::Visitors::PostgreSQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'DOW', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       Arel::Visitors::PostgreSQL::DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',

data/lib/arel_extensions/visitors/sqlite.rb

@@ -1,6 +1,6 @@
 module ArelExtensions
   module Visitors
-    Arel::Visitors::SQLite.class_eval do
+    class Arel::Visitors::SQLite
       Arel::Visitors::SQLite::DATE_MAPPING = {'d' => '%d', 'm' => '%m', 'w' => '%W', 'y' => '%Y', 'wd' => '%w', 'M' => '%M', 'h' => '%H', 'mn' => '%M', 's' => '%S'}
       Arel::Visitors::SQLite::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
         '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b', # year, month
@@ -235,9 +235,8 @@ module ArelExtensions
         def visit_ArelExtensions_InsertManager_BulkValues o, collector
           o.left.each_with_index do |row, idx|
             collector << 'SELECT '
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
                 case value
                 when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
                   collector = visit value.as(attr.name), collector
@@ -258,12 +257,17 @@ module ArelExtensions
         def visit_ArelExtensions_InsertManager_BulkValues o, collector
           o.left.each_with_index do |row, idx|
             collector << 'SELECT '
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
                 case value
                 when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
                   collector = visit value.as(attr.name), collector
+                when Integer
+                  collector <<  value.to_s
+                  if idx == 0
+                    collector << " AS "
+                    collector << quote(attr.name)
+                  end
                 else
                   collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
                   if idx == 0
@@ -360,16 +364,6 @@ module ArelExtensions
         collector
       end
 
-
-      alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
-      def visit_Arel_Nodes_SelectStatement o, collector
-        if !collector.value.blank? && o.limit.blank?
-          o = o.dup
-          o.orders = []
-        end
-        old_visit_Arel_Nodes_SelectStatement(o,collector)
-      end
-
       alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
       def visit_Arel_Nodes_As o, collector
         if o.left.is_a?(Arel::Nodes::Binary)

data/lib/arel_extensions/visitors/to_sql.rb

@@ -1,6 +1,6 @@
 module ArelExtensions
   module Visitors
-    Arel::Visitors::ToSql.class_eval do
+    class Arel::Visitors::ToSql
       Arel::Visitors::ToSql::COMMA = ', ' unless defined?(Arel::Visitors::ToSql::COMMA)
 
       # Math Functions
@@ -428,16 +428,15 @@ module ArelExtensions
           row_nb = o.left.length
           o.left.each_with_index do |row, idx|
             collector << '('
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
-                case value
-                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
-                  collector = visit value, collector
-                else
-                  collector << quote(value, attr && column_for(attr)).to_s
-                end
-                collector << Arel::Visitors::ToSql::COMMA unless i == len
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value, collector
+              else
+                collector << quote(value, attr && column_for(attr)).to_s
+              end
+              collector << Arel::Visitors::ToSql::COMMA unless i == len
             }
             collector << (idx == row_nb-1 ? ')' : '), ')
           end
@@ -449,16 +448,17 @@ module ArelExtensions
           row_nb = o.left.length
           o.left.each_with_index do |row, idx|
             collector << '('
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
-                case value
-                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
-                  collector = visit value, collector
-                else
-                  collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
-                end
-                collector << Arel::Visitors::ToSql::COMMA unless i == len
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value, collector
+              when Integer
+                collector << value.to_s
+              else
+                collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
+              end
+              collector << Arel::Visitors::ToSql::COMMA unless i == len
             }
             collector << (idx == row_nb-1 ? ')' : '), ')
           end
@@ -543,53 +543,66 @@ module ArelExtensions
         collector
       end
 
+      # Boolean logic.
+
       alias_method :old_visit_Arel_Nodes_And, :visit_Arel_Nodes_And
       def visit_Arel_Nodes_And o, collector
-        collector << '('
         case o.children.length
         when 0
-          collector << '1=1' # but this should not happen
+          collector << '1 = 1' # but this should not happen
         when 1
           collector = visit o.children[0], collector
         else
+          collector << '('
           o.children.each_with_index { |arg, i|
             if i != 0
               collector << ') AND ('
             end
             collector = visit arg, collector
           }
+          collector << ')'
         end
-        collector << ')'
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Or o, collector
-        collector << '('
+      alias_method :old_visit_Arel_Nodes_Or, :visit_Arel_Nodes_Or
+      def visit_Arel_Nodes_Or o, collector
         case o.children.length
         when 0
-          collector << '0=1' # but this should not happen
+          collector << '1 = 0' # but this should not happen
         when 1
           collector = visit o.children[0], collector
         else
+            collector << '('
             o.children.each_with_index { |arg, i|
               if i != 0
                 collector << ') OR ('
               end
               collector = visit arg, collector
             }
+            collector << ')'
         end
-        collector << ')'
         collector
       end
 
-      alias_method :old_visit_Arel_Nodes_Or, :visit_Arel_Nodes_Or
-      def visit_Arel_Nodes_Or o, collector
-        collector << '('
-        collector = visit o.left, collector
-        collector << ') OR ('
-        collector = visit o.right, collector
-        collector << ')'
-        collector
+      def json_value(o,v)
+        case o.type_of_node(v)
+        when :string
+          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + v.replace('\\','\\\\').replace('"','\"') + '"')
+        when :date
+          s = v.format('%Y-%m-%d')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :datetime
+          s = v.format('%Y-%m-%dT%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :time
+          s = v.format('%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :nil
+          Arel::Nodes.build_quoted("null")
+        else
+          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce("null")
+        end
       end
 
       def visit_ArelExtensions_Nodes_Json o,collector
@@ -600,11 +613,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += json_value(o,v)
           end
           res += ']'
           collector = visit res, collector
@@ -614,12 +623,8 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            res += json_value(o,v)
           end
           res += '}'
           collector = visit res, collector
@@ -631,7 +636,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGroup o, collector
         if o.as_array
-          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ',o.orders) : o.dict.group_concat(', ')) + ']'
+          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ', order: Array(o.orders)) : o.dict.group_concat(', ')).coalesce('') + ']'
           collector = visit res, collector
         else
           res = Arel::Nodes.build_quoted('{')
@@ -640,13 +645,9 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              kv = kv + '"' + v + '"'
-            else
-              kv += v
-            end
-            res = res + kv.group_concat(', ',orders)
+            kv = Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            kv += json_value(o,v)
+            res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
           res = res + '}'
           collector = visit res, collector

data/test/arelx_test_helper.rb

@@ -0,0 +1,28 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'fileutils'
+require 'arel'
+require 'active_record'
+
+require 'support/fake_record'
+
+require 'arel_extensions'
+Arel::Table.engine = FakeRecord::Base.new
+
+$arel_silence_type_casting_deprecation = true
+
+module Minitest::Assertions
+  #
+  #  Fails unless +expected and +actual are the same string, modulo extraneous spaces.
+  #
+  def assert_like(expected, actual, msg = nil)
+    msg ||= "Expected #{expected.inspect} and #{actual.inspect} to be alike"
+    assert_equal expected.gsub(/\s+/, ' ').strip, actual.gsub(/\s+/, ' ').strip
+  end
+end
+
+module Minitest::Expectations
+
+  infect_an_assertion :assert_like, :must_be_like
+
+end

data/test/support/fake_record.rb

@@ -65,6 +65,10 @@ module FakeRecord
       self
     end
 
+    def in_clause_length
+      10000
+    end
+
     def quote thing, column = nil
       if column && !thing.nil?
         case column.type

data/test/test_comparators.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 
 module ArelExtensions
   module Nodes
@@ -20,26 +20,27 @@ module ArelExtensions
       end
 
       it "< is equal lt" do
-        compile(@table[:id] < 10).must_be_like('"users"."id" < 10')
+        _(compile(@table[:id] < 10)).must_be_like('"users"."id" < 10')
       end
 
       it "<= is equal lteq" do
-        compile(@table[:id] <= 10).must_be_like('"users"."id" <= 10')
+        _(compile(@table[:id] <= 10)).must_be_like('"users"."id" <= 10')
       end
 
       it "> is equal gt" do
-        compile(@table[:id] > 10).must_be_like('"users"."id" > 10')
+        _(compile(@table[:id] > 10)).must_be_like('"users"."id" > 10')
       end
 
       it "< is equal gteq" do
-        compile(@table[:id] >= 10).must_be_like('"users"."id" >= 10')
+        _(compile(@table[:id] >= 10)).must_be_like('"users"."id" >= 10')
       end
 
       it "should compare with dates" do
-        compile(@table[:created_at] >= Date.new(2016, 3, 31)).must_be_like %{"users"."created_at" >= '2016-03-31'}
+        _(compile(@table[:created_at] >= Date.new(2016, 3, 31)))
+          .must_be_like %{"users"."created_at" >= '2016-03-31'}
       end
 
     end
 
   end
-end
+end

data/test/visitors/test_bulk_insert_oracle.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 
 module ArelExtensions
   module BulkInsertOracle
@@ -25,8 +25,9 @@ module ArelExtensions
       it "should import large set of data in Oracle" 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)
-        sql = compile(insert_manager.ast)
-        sql.must_be_like %Q[INSERT INTO "users" ("name", "comments", "created_at") ((SELECT 'nom1', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL) UNION ALL (SELECT 'nom2', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL))]
+        _(compile(insert_manager.ast))
+          .must_be_like %Q[INSERT INTO "users" ("name", "comments", "created_at")
+                        ((SELECT 'nom1', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL) UNION ALL (SELECT 'nom2', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL))]
       end
 
     end

data/test/visitors/test_bulk_insert_sqlite.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 
 module ArelExtensions
   module BulkInsertSQLlite
@@ -27,8 +27,9 @@ 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)
-        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']
+        _(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']
       end
 
     end

data/test/visitors/test_bulk_insert_to_sql.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 
 module ArelExtensions
   module BulkInsertToSql
@@ -27,8 +27,8 @@ 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)
-        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')]
+        _(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')]
       end
     end
   end

data/test/visitors/test_oracle.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 
 module ArelExtensions
   module VisitorOracle
@@ -23,86 +23,86 @@ 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 =~ /\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 %{("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)
-        sql = compile(ArelExtensions::Nodes::DateDiff.new([d1,d2]))
-        sql.must_match("TO_DATE('2015-06-02') - TO_DATE('2015-06-01')")
+        _(compile(ArelExtensions::Nodes::DateDiff.new([d1,d2])))
+          .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)
-        sql = compile(ArelExtensions::Nodes::DateDiff.new([d1, @table[:updated_at]]))
-        sql.must_match %{TO_DATE('2015-06-02') - "users"."updated_at"}
+        _(compile(ArelExtensions::Nodes::DateDiff.new([d1, @table[:updated_at]])))
+          .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