arel_extensions 1.4.0 → 2.0.0.rc3

data/test/with_ar/all_agnostic_test.rb

@@ -1,23 +1,21 @@
-require 'arelx_test_helper'
+require 'helper'
 require 'date'
 
 module ArelExtensions
-  module WithAr
+  module WthAr
+
     class ListTest < Minitest::Test
+      require 'minitest/pride'
       def connect_db
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
-        if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx') || (RUBY_PLATFORM == 'java')) # not supported
-          @env_db = (RUBY_PLATFORM == 'java' ? 'jdbc-sqlite' : 'sqlite')
-          skip "Platform not supported (DB: #{ENV['DB']}, RUBY_ENGINE: #{RUBY_ENGINE}, RUBY_PLATFORM: #{RUBY_PLATFORM})"
+        if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
+          @env_db = (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
+          skip "Platform not supported"
         else
           @env_db = ENV['DB']
         end
         ActiveRecord::Base.establish_connection(@env_db.try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ActiveRecord::VERSION::MAJOR >= 7
-          ActiveRecord.default_timezone = :utc
-        else
-          ActiveRecord::Base.default_timezone = :utc
-        end
+        ActiveRecord::Base.default_timezone = :utc
         @cnx = ActiveRecord::Base.connection
         $sqlite = @cnx.adapter_name =~ /sqlite/i
         $load_extension_disabled ||= false
@@ -32,14 +30,14 @@ module ArelExtensions
           t.column :name, :string
           t.column :comments, :text
           t.column :created_at, :date
-          t.column :updated_at, :datetime, precision: nil
+          t.column :updated_at, :datetime
           t.column :duration, :time
           t.column :other, :string
-          t.column :score, :decimal, precision: 20, scale: 10
+          t.column :score, :decimal, :precision => 20, :scale => 10
         end
         @cnx.drop_table(:product_tests) rescue nil
         @cnx.create_table :product_tests do |t|
-          t.column :price, :decimal, precision: 20, scale: 10
+          t.column :price, :decimal, :precision => 20, :scale => 10
         end
       end
 
@@ -54,26 +52,23 @@ module ArelExtensions
         d = Date.new(2016, 5, 23)
         connect_db
         setup_db
-        u = User.create age: 5, name: 'Lucas', created_at: d, score: 20.16, updated_at: Time.utc(2014, 3, 3, 12, 42, 0)
-        @lucas = User.where(id: u.id)
-        u = User.create age: 15, name: 'Sophie', created_at: d, score: 20.16
-        @sophie = User.where(id: u.id)
-        u = User.create age: 20, name: 'Camille', created_at: d, score: -20.16, comments: ''
-        @camille = User.where(id: u.id)
-        u = User.create age: 21, name: 'Arthur', created_at: d, score: 65.62, comments: 'arrêté'
-        @arthur = User.where(id: u.id)
-        u = User.create age: 23, name: 'Myung', created_at: d, score: 20.16, comments: ' '
-        @myung = User.where(id: u.id)
-        u = User.create age: 25, name: 'Laure', created_at: d, score: 20.16, duration: Time.utc(2001, 1, 1, 12, 42, 21), updated_at: Time.utc(2014, 3, 3, 12, 42, 0)
-        @laure = User.where(id: u.id)
-        u = User.create age: nil, name: 'Test', created_at: d, score: 1.62, other: 'toto'
-        @test = User.where(id: u.id)
-        u = User.create age: -42, name: 'Negatif', comments: '1,22,3,42,2', created_at: d, updated_at: d.to_time, score: 0.17
-        @neg = User.where(id: u.id)
-        u = User.create age: 15, name: 'Justin', created_at: d, score: 11.0
-        @justin = User.where(id: u.id)
-        u = User.create age: nil, name: 'nilly', created_at: nil, score: nil
-        @nilly = User.where(id: u.id)
+        u = User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16, :updated_at => Time.utc(2014, 3, 3, 12, 42, 0)
+        @lucas = User.where(:id => u.id)
+        u = User.create :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
+        @sophie = User.where(:id => u.id)
+        u = User.create :age => 20, :name => "Camille", :created_at => d, :score => -20.16, :comments => ''
+        @camille = User.where(:id => u.id)
+        u = User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62, :comments => 'arrêté'
+        @arthur = User.where(:id => u.id)
+        u = User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16, :comments => ' '
+        @myung = User.where(:id => u.id)
+        u = User.create :age => 25, :name => "Laure", :created_at => d, :score => 20.16, :duration => Time.utc(2001, 1, 1, 12, 42, 21),:updated_at => Time.utc(2014, 3, 3, 12, 42, 0)
+        @laure = User.where(:id => u.id)
+        u = User.create :age => nil, :name => "Test", :created_at => d, :score => 1.62, :other => 'toto'
+        @test = User.where(:id => u.id)
+        u = User.create :age => -42, :name => "Negatif", :comments => '1,22,3,42,2', :created_at => d, :updated_at => d.to_time, :score => 0.17
+        @neg = User.where(:id => u.id)
+
 
         @age = User.arel_table[:age]
         @name = User.arel_table[:name]
@@ -99,7 +94,7 @@ module ArelExtensions
         scope.select(node.as('res')).to_a.first.res
       end
 
-      # manage the difference between adapters that handle or not json type
+      #manage the difference between adapters that handle or not json type
       def parse_json(h)
         if @env_db != 'postgresql'
           JSON.parse("{\"res\":#{h}}")['res']
@@ -108,14 +103,6 @@ module ArelExtensions
         end
       end
 
-      # Connection and column info
-      def test_column_of
-        assert_nil Arel.column_of('chupa', 'maflavla'), 'Non-existent table and column should return nil'
-        assert_nil Arel.column_of('chupa', 'updated_at'), 'Non-existent table but existent column should return nil'
-        assert_nil Arel.column_of('user_tests', 'maflavla'), 'Existent table but non-existent column should return nil'
-        assert_equal 'updated_at', Arel.column_of('user_tests', 'updated_at').name, 'An existing column name should be returned'
-      end
-
       # Math Functions
       def test_classical_arel
         assert_in_epsilon 42.16, t(@laure, @score + 22), 0.01
@@ -129,28 +116,25 @@ module ArelExtensions
       end
 
       def test_ceil
-        #        skip "Sqlite version can't load extension for ceil" if $sqlite && $load_extension_disabled
+#        skip "Sqlite version can't load extension for ceil" if $sqlite && $load_extension_disabled
         assert_equal 2, t(@test, @score.ceil) # 1.62
         assert_equal(-20, t(@camille, @score.ceil)) # -20.16
         assert_equal(-20, t(@camille, (@score - 0.5).ceil)) # -20.16
         assert_equal 63, t(@arthur, @age.ceil + 42)
-        assert_equal 11, t(@justin, @score.ceil) # 11.0
       end
 
       def test_floor
-        #        skip "Sqlite version can't load extension for floor" if $sqlite && $load_extension_disabled
+#        skip "Sqlite version can't load extension for floor" if $sqlite && $load_extension_disabled
         assert_equal 0, t(@neg, @score.floor)
         assert_equal 1, t(@test, @score.floor) # 1.62
         assert_equal(-9, t(@test, (@score - 10).floor)) # 1.62
         assert_equal 42, t(@arthur, @score.floor - 23)
-        assert_equal 11, t(@justin, @score.floor) # 11.0
-        assert_equal(-21, t(@camille, @score.floor)) #  # -20.16
       end
 
       def test_rand
         assert 42 != User.select(Arel.rand.as('res')).first.res
         assert 0 <= User.select(Arel.rand.abs.as('res')).first.res
-        assert_equal 10, User.order(Arel.rand).limit(50).count
+        assert_equal 8, User.order(Arel.rand).limit(50).count
       end
 
       def test_round
@@ -162,91 +146,35 @@ module ArelExtensions
 
       def test_sum
         if @env_db == 'mssql'
-          skip 'SQL Server forces order?' # TODO
-          assert_equal 83, User.select((@age.sum + 1).as('res'), User.arel_table[:id].sum).take(50).reorder(@age).first.res
-          assert_equal 164, User.reorder(nil).select((@age.sum + @age.sum).as('res'), User.arel_table[:id].sum).take(50).first.res
-          assert_equal 246, User.reorder(nil).select(((@age * 3).sum).as('res'), User.arel_table[:id].sum).take(50).first.res
-          assert_equal 4234, User.reorder(nil).select(((@age * @age).sum).as('res'), User.arel_table[:id].sum).take(50).first.res
+          skip "SQL Server forces order?" # TODO
+          assert_equal 68, User.select((@age.sum + 1).as("res"), User.arel_table[:id].sum).take(50).reorder(@age).first.res
+          assert_equal 134, User.reorder(nil).select((@age.sum + @age.sum).as("res"), User.arel_table[:id].sum).take(50).first.res
+          assert_equal 201, User.reorder(nil).select(((@age * 3).sum).as("res"), User.arel_table[:id].sum).take(50).first.res
+          assert_equal 4009, User.reorder(nil).select(((@age * @age).sum).as("res"), User.arel_table[:id].sum).take(50).first.res
         else
-          assert_equal 83, User.select((@age.sum + 1).as('res')).take(50).first.res
-          assert_equal 164, User.select((@age.sum + @age.sum).as('res')).take(50).first.res
-          assert_equal 246, User.select((@age * 3).sum.as('res')).take(50).first.res
-          assert_equal 4234, User.select(((@age * @age).sum).as('res')).take(50).first.res
+          assert_equal 68, User.select((@age.sum + 1).as("res")).take(50).first.res
+          assert_equal 134, User.select((@age.sum + @age.sum).as("res")).take(50).first.res
+          assert_equal 201, User.select(((@age * 3).sum).as("res")).take(50).first.res
+          assert_equal 4009, User.select(((@age * @age).sum).as("res")).take(50).first.res
         end
       end
 
-      def test_aggregation_with_ar_calculation
-        # Since Arel10 (Rails6.1), some unwanted behaviors on aggregated calculation were present.
-        # This should works no matter which version of rails is used
-        assert User.group(:score).average(:id).values.all?{|e| !e.nil?}
-
-        # Since Rails 7, a patch to calculations.rb has tirggered a double
-        # quoting of the alias name. See https://github.com/rails/rails/commit/7e6e9091e55c3357b0162d44b6ab955ed0c718d5
-        # Before the patch that fixed this the following error would occur:
-        #   ActiveRecord::StatementInvalid: PG::SyntaxError: ERROR:  zero-length delimited identifier at or near """"
-        assert User.group(:score).count(:id).values.all?{|e| !e.nil?}
-      end
-
-      def test_rollup
-        skip "sqlite not supported" if $sqlite
-        at = User.arel_table
-        # single
-        q = User.select(at[:name], at[:age].sum).group(Arel::Nodes::RollUp.new([at[:name]]))
-        assert q.to_a.length > 0
-
-        # multi
-        q = User.select(at[:name], at[:score], at[:age].sum).group(Arel::Nodes::RollUp.new([at[:score], at[:name]]))
-        assert q.to_a.length > 0
-
-        # hybrid
-        q = User.select(at[:name], at[:score], at[:age].sum).group(at[:score], Arel::Nodes::RollUp.new([at[:name]]))
-        assert q.to_a.length > 0
-
-        ## Using Arel.rollup which is less verbose than the original way
-
-        # simple
-        q = User.select(at[:name], at[:age].sum).group(Arel.rollup(at[:name]))
-        assert q.to_a.length > 0
-
-        # multi
-        q = User.select(at[:name], at[:score], at[:age].sum).group(Arel.rollup([at[:score], at[:name]]))
-        assert q.to_a.length > 0
-
-        # hybrid
-        q = User.select(at[:name], at[:score], at[:age].sum).group(at[:score], Arel.rollup([at[:name]]))
-        assert q.to_a.length > 0
-
-        ## Using at[:col].rollup which is handy for single column rollups
-
-        # simple
-        q = User.select(at[:name], at[:age].sum).group(at[:name].rollup)
-        assert q.to_a.length > 0
-
-        q = User.select(at[:name], at[:score], at[:age].sum).group(at[:name].rollup, at[:score].rollup)
-        assert q.to_a.length > 0
-
-        # hybrid
-        q = User.select(at[:name], at[:score], at[:age].sum).group(at[:name], at[:score].rollup)
-        assert q.to_a.length > 0
-      end
-
       # String Functions
       def test_concat
         assert_equal 'Camille Camille', t(@camille, @name + ' ' + @name)
         assert_equal 'Laure 2', t(@laure, @name + ' ' + 2)
-        assert_equal 'Test Laure', t(@laure, Arel.quoted('Test ') + @name)
-
-        skip 'No group_concat in SqlServer before 2017' if @env_db == 'mssql'
-        assert_equal 'Lucas Sophie', t(User.where(name: %w[Lucas Sophie]), @name.group_concat(' '))
-        assert_equal 'Lucas,Sophie', t(User.where(name: %w[Lucas Sophie]), @name.group_concat(','))
-        assert_equal 'Lucas,Sophie', t(User.where(name: %w[Lucas Sophie]), @name.group_concat)
-
-        skip 'No order in group_concat in SqlLite' if $sqlite
-        assert_equal 'Arthur,Lucas,Sophie', t(User.where(name: %w[Lucas Sophie Arthur]), @name.group_concat(',', @name.asc))
-        assert_equal 'Sophie,Lucas,Arthur', t(User.where(name: %w[Lucas Sophie Arthur]), @name.group_concat(',', @name.desc))
-        assert_equal 'Lucas,Sophie,Arthur', t(User.where(name: %w[Lucas Sophie Arthur]), @name.group_concat(',', [@score.asc, @name.asc]))
-        assert_equal 'Lucas,Sophie,Arthur', t(User.where(name: %w[Lucas Sophie Arthur]), @name.group_concat(',', @score.asc, @name.asc))
-        assert_equal 'Lucas,Sophie,Arthur', t(User.where(name: %w[Lucas Sophie Arthur]), @name.group_concat(',', order: [@score.asc, @name.asc]))
+        assert_equal 'Test Laure', t(@laure, Arel::Nodes.build_quoted('Test ') + @name)
+
+        skip "No group_concat in SqlServer before 2017" if @env_db == 'mssql'
+        assert_equal "Lucas Sophie", t(User.where(:name => ['Lucas', 'Sophie']), @name.group_concat(' '))
+        assert_equal "Lucas,Sophie", t(User.where(:name => ['Lucas', 'Sophie']), @name.group_concat(','))
+        assert_equal "Lucas,Sophie", t(User.where(:name => ['Lucas', 'Sophie']), @name.group_concat)
+
+        skip "No order in group_concat in SqlLite" if $sqlite
+        assert_equal "Arthur,Lucas,Sophie", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',@name.asc))
+        assert_equal "Sophie,Lucas,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',@name.desc))
+        assert_equal "Lucas,Sophie,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',[@score.asc,@name.asc]))
+        assert_equal "Lucas,Sophie,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',@score.asc,@name.asc))
       end
 
       def test_length
@@ -257,15 +185,15 @@ module ArelExtensions
 
       def test_md5
         skip "Sqlite can't do md5" if $sqlite
-        assert_equal 'e2cf99ca82a7e829d2a4ac85c48154d0', t(@camille, @name.md5)
-        assert_equal 'c3d41bf5efb468a1bcce53bd53726c85', t(@lucas, @name.md5)
+        assert_equal "e2cf99ca82a7e829d2a4ac85c48154d0", t(@camille, @name.md5)
+        assert_equal "c3d41bf5efb468a1bcce53bd53726c85", t(@lucas, @name.md5)
       end
 
       def test_locate
         skip "Sqlite version can't load extension for locate" if $sqlite && $load_extension_disabled
-        assert_equal 1, t(@camille, @name.locate('C'))
-        assert_equal 0, t(@lucas, @name.locate('z'))
-        assert_equal 5, t(@lucas, @name.locate('s'))
+        assert_equal 1, t(@camille, @name.locate("C"))
+        assert_equal 0, t(@lucas, @name.locate("z"))
+        assert_equal 5, t(@lucas, @name.locate("s"))
       end
 
       def test_substring
@@ -275,7 +203,7 @@ module ArelExtensions
         else
           assert_equal('', t(@lucas, @name.substring(42)))
         end
-        assert_equal 'Lu', t(@lucas, @name.substring(1, 2))
+        assert_equal 'Lu', t(@lucas, @name.substring(1,2))
 
         assert_equal 'C', t(@camille, @name[0, 1])
         assert_equal 'C', t(@camille, @name[0])
@@ -284,32 +212,32 @@ module ArelExtensions
         else
           assert_equal('', t(@lucas, @name[42]))
         end
-        assert_equal 'Lu', t(@lucas, @name[0, 2])
+        assert_equal 'Lu', t(@lucas, @name[0,2])
         assert_equal 'Lu', t(@lucas, @name[0..1])
 
-        # substring should accept string function
+        #substring should accept string function
         assert_equal 'Ce', t(@camille, @name.substring(1, 1).concat('e'))
-        assert_equal 'Ce', t(@camille, @name.substring(1, 1) + 'e')
+        assert_equal 'Ce', t(@camille, @name.substring(1, 1)+'e')
       end
 
       def test_find_in_set
         skip "Sqlite version can't load extension for find_in_set" if $sqlite && $load_extension_disabled
-        skip 'SQL Server does not know about FIND_IN_SET' if @env_db == 'mssql'
+        skip "SQL Server does not know about FIND_IN_SET" if @env_db == 'mssql'
         assert_equal 5, t(@neg, @comments & 2)
         assert_equal 0, t(@neg, @comments & 6) # not found
       end
 
       def test_string_comparators
-        # skip "Oracle can't use math operators to compare strings" if @env_db == 'oracle' # use GREATEST ?
+        #skip "Oracle can't use math operators to compare strings" if @env_db == 'oracle' # use GREATEST ?
         skip "SQL Server can't use math operators to compare strings" if @env_db == 'mssql' # use GREATEST ?
         if @env_db == 'postgresql' # may return real boolean
           assert t(@neg, @name >= 'Mest') == true || t(@neg, @name >= 'Mest') == 't' # depends of ar version
           assert t(@neg, @name <= (@name + 'Z')) == true || t(@neg, @name <= (@name + 'Z')) == 't'
         elsif @env_db == 'oracle'
-          assert_equal 1, t(@neg, Arel.when(@name >= 'Mest').then(1).else(0))
-          assert_equal 1, t(@neg, Arel.when(@name <= (@name + 'Z')).then(1).else(0))
-          assert_equal 1, t(@neg, Arel.when(@name > 'Mest').then(1).else(0))
-          assert_equal 1, t(@neg, Arel.when(@name < (@name + 'Z')).then(1).else(0))
+          assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name >= 'Mest').then(1).else(0))
+          assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name <= (@name + 'Z')).then(1).else(0))
+          assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name > 'Mest').then(1).else(0))
+          assert_equal 1, t(@neg, ArelExtensions::Nodes::Case.new.when(@name < (@name + 'Z')).then(1).else(0))
         else
           assert_equal 1, t(@neg, @name >= 'Mest')
           assert_equal 1, t(@neg, @name <= (@name + 'Z'))
@@ -321,75 +249,69 @@ module ArelExtensions
       def test_compare_on_date_time_types
         skip "Sqlite can't compare time" if $sqlite
         skip "Oracle can't compare time" if @env_db == 'oracle'
-        # @created_at == 2016-05-23
-        assert_includes [true, 't', 1], t(@laure, Arel.when(@created_at >= '2014-01-01').then(1).else(0))
-        assert_includes [false, 'f', 0], t(@laure, Arel.when(@created_at >= '2018-01-01').then(1).else(0))
-        # @updated_at == 2014-03-03 12:42:00
-        assert_includes [true, 't', 1], t(@laure, Arel.when(@updated_at >= '2014-03-03 10:10:10').then(1).else(0))
-        assert_includes [false, 'f', 0], t(@laure, Arel.when(@updated_at >= '2014-03-03 13:10:10').then(1).else(0))
-        # @duration == 12:42:21
-        # puts @laure.select(Arel.when(@duration >= '10:10:10').then(1).else(0)).to_sql
-        # puts @laure.select(Arel.when(@duration >= '14:10:10').then(1).else(0)).to_sql
-        assert_includes [true, 't', 1], t(@laure, Arel.when(@duration >= '10:10:10').then(1).else(0))
-        assert_includes [false, 'f', 0], t(@laure, Arel.when(@duration >= '14:10:10').then(1).else(0))
+        #@created_at == 2016-05-23
+        assert_includes [true,'t',1], t(@laure, ArelExtensions::Nodes::Case.new.when(@created_at >= '2014-01-01').then(1).else(0))
+        assert_includes [false,'f',0], t(@laure, ArelExtensions::Nodes::Case.new.when(@created_at >= '2018-01-01').then(1).else(0))
+        #@updated_at == 2014-03-03 12:42:00
+        assert_includes [true,'t',1], t(@laure, ArelExtensions::Nodes::Case.new.when(@updated_at >= '2014-03-03 10:10:10').then(1).else(0))
+        assert_includes [false,'f',0], t(@laure, ArelExtensions::Nodes::Case.new.when(@updated_at >= '2014-03-03 13:10:10').then(1).else(0))
+        #@duration == 12:42:21
+        #puts @laure.select(ArelExtensions::Nodes::Case.new.when(@duration >= '10:10:10').then(1).else(0)).to_sql
+        #puts @laure.select(ArelExtensions::Nodes::Case.new.when(@duration >= '14:10:10').then(1).else(0)).to_sql
+        assert_includes [true,'t',1], t(@laure, ArelExtensions::Nodes::Case.new.when(@duration >= '10:10:10').then(1).else(0))
+        assert_includes [false,'f',0], t(@laure, ArelExtensions::Nodes::Case.new.when(@duration >= '14:10:10').then(1).else(0))
       end
 
+
       def test_regexp_not_regexp
         skip "Sqlite version can't load extension for regexp" if $sqlite && $load_extension_disabled
-        skip 'SQL Server does not know about REGEXP without extensions' if @env_db == 'mssql'
+        skip "SQL Server does not know about REGEXP without extensions" if @env_db == 'mssql'
         assert_equal 1, User.where(@name =~ '^M').count
-        assert_equal 8, User.where(@name !~ '^L').count
+        assert_equal 6, User.where(@name !~ '^L').count
         assert_equal 1, User.where(@name =~ /^M/).count
-        assert_equal 8, User.where(@name !~ /^L/).count
+        assert_equal 6, User.where(@name !~ /^L/).count
       end
 
       def test_imatches
-        # puts User.where(@name.imatches('m%')).to_sql
+        #puts User.where(@name.imatches('m%')).to_sql
         assert_equal 1, User.where(@name.imatches('m%')).count
         assert_equal 4, User.where(@name.imatches_any(['L%', '%e'])).count
-        assert_equal 8, User.where(@name.idoes_not_match('L%')).count
+        assert_equal 6, User.where(@name.idoes_not_match('L%')).count
       end
 
       def test_replace
-        assert_equal 'LucaX', t(@lucas, @name.replace('s', 'X'))
-        assert_equal 'replace', t(@lucas, @name.replace(@name, 'replace'))
-
-        skip 'Sqlite does not seem to support regexp_replace' if $sqlite
-        skip 'SQL Server does not know about REGEXP without extensions' if @env_db == 'mssql'
-        skip 'Travis mysql version does not support REGEXP_REPLACE' if @env_db == 'mysql'
-        assert_equal 'LXcXs', t(@lucas, @name.replace(/[ua]/, 'X'))
-        assert_equal 'LXcXs', t(@lucas, @name.regexp_replace(/[ua]/, 'X'))
-        assert_equal 'LXcXs', t(@lucas, @name.regexp_replace('[ua]', 'X'))
+        assert_equal "LucaX", t(@lucas, @name.replace("s", "X"))
+        assert_equal "replace", t(@lucas, @name.replace(@name, "replace"))
       end
 
       def test_replace_once
-        skip 'TODO'
-        # skip "Sqlite version can't load extension for locate" if $sqlite && $load_extension_disabled
-        assert_equal 'LuCas', t(@lucas, @name.substring(1, @name.locate('c') - 1) + 'C' + @name.substring(@name.locate('c') + 1, @name.length))
+        skip "TODO"
+        #skip "Sqlite version can't load extension for locate" if $sqlite && $load_extension_disabled
+        assert_equal "LuCas", t(@lucas, @name.substring(1, @name.locate('c') - 1) + 'C' + @name.substring(@name.locate('c') + 1, @name.length))
       end
 
       def test_soundex
         skip "Sqlite version can't load extension for soundex" if $sqlite && $load_extension_disabled
         skip "PostgreSql version can't load extension for soundex" if @env_db == 'postgresql'
-        assert_equal 'C540', t(@camille, @name.soundex)
-        assert_equal 10, User.where(@name.soundex.eq(@name.soundex)).count
-        assert_equal 10, User.where(@name.soundex == @name.soundex).count
+        assert_equal "C540", t(@camille, @name.soundex)
+        assert_equal 8, User.where(@name.soundex.eq(@name.soundex)).count
+        assert_equal 8, User.where(@name.soundex == @name.soundex).count
       end
 
       def test_change_case
-        assert_equal 'myung', t(@myung, @name.downcase)
-        assert_equal 'MYUNG', t(@myung, @name.upcase)
-        assert_equal 'myung', t(@myung, @name.upcase.downcase)
+        assert_equal "myung", t(@myung, @name.downcase)
+        assert_equal "MYUNG", t(@myung, @name.upcase)
+        assert_equal "myung", t(@myung, @name.upcase.downcase)
       end
 
       def test_trim
-        assert_equal 'Myung', t(@myung, @name.trim)
-        assert_equal 'Myung', t(@myung, @name.trim.ltrim.rtrim)
-        assert_equal 'Myun', t(@myung, @name.rtrim('g'))
-        assert_equal 'yung', t(@myung, @name.ltrim('M'))
-        assert_equal 'yung', t(@myung, (@name + 'M').trim('M'))
-        skip 'Oracle does not accept multi char trim' if @env_db == 'oracle'
-        assert_equal '', t(@myung, @name.rtrim(@name))
+        assert_equal "Myung", t(@myung, @name.trim)
+        assert_equal "Myung", t(@myung, @name.trim.ltrim.rtrim)
+        assert_equal "Myun", t(@myung, @name.rtrim("g"))
+        assert_equal "yung", t(@myung, @name.ltrim("M"))
+        assert_equal "yung", t(@myung, (@name + "M").trim("M"))
+        skip "Oracle does not accept multi char trim" if @env_db == 'oracle'
+        assert_equal "", t(@myung, @name.rtrim(@name))
       end
 
       def test_blank
@@ -418,244 +340,32 @@ module ArelExtensions
         assert_equal 'true', t(@neg, @comments.not_blank.then('true', 'false'))
       end
 
-      # This test repeats a lot of `test_blank` cases.
-      def test_present
-        if @env_db == 'postgresql'
-          assert_includes [true, 't'], t(@myung, @name.present) # depends of adapter
-          assert_includes [false, 'f'], t(@myung, @comments.present)
-        end
-        assert_equal 1, @myung.where(@name.present).count
-        assert_equal 0, @myung.where(@comments.present).count
-        assert_equal 0, @sophie.where(@comments.present).count
-        assert_equal 0, @camille.where(@comments.present).count
-
-        assert_equal 1, @neg.where(@comments.present).count
-        assert_equal 'true', t(@myung, @name.present.then('true', 'false'))
-        assert_equal 'false', t(@myung, @comments.present.then('true', 'false'))
-        assert_equal 'true', t(@neg, @comments.present.then('true', 'false'))
-      end
-
       def test_format
-        %i[format format_date].each do |method|
-          assert_equal '2016-05-23', t(@lucas, @created_at.send(method, '%Y-%m-%d'))
-          assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S'))
-          assert_equal '12:42%', t(@lucas, @updated_at.send(method, '%R%%'))
-
-          # The following tests will ensure proper conversion of timestamps to
-          # requested timezones.
-          #
-          # The names of the timezones is highly dependant on the underlying
-          # operating system, and this is why we need to handle each database
-          # separately: the images we're using to test these databases are
-          # different. So don't rely on the provided examples. Your setup is your
-          # reference.
-          #
-          # One could always have portable code if s/he uses standard
-          # abbreviations, like:
-          #
-          # 1. CET  => Central European Time
-          # 2. CEST => Central European Summer Time
-          #
-          # Which implies that the caller should handle daylight saving detection.
-          # In fact, CET will handle daylight saving in MySQL but not Postgres.
-          #
-          # It looks like the posix convention is supported by mysql and
-          # postgresql, e.g.:
-          #
-          # posix/Europe/Paris
-          # posix/America/Nipigon
-          #
-          # so it looks like a more reliably portable way of specifying it.
-          time_zones = {
-            'mssql'       => {
-              'utc'       => 'UTC',
-              'sao_paulo' => 'Argentina Standard Time',
-              'tahiti'    => 'Hawaiian Standard Time',
-              'paris'     => 'Central European Standard Time'
-            },
-            'posix'       => {
-              'utc'       => 'UTC',
-              'sao_paulo' => 'America/Sao_Paulo',
-              'tahiti'    => 'Pacific/Tahiti',
-              'paris'     => 'Europe/Paris'
-            }
-          }
-
-          skip "Unsupported timezone conversion for DB=#{ENV['DB']}" if !%w[mssql mysql oracle postgresql].include?(ENV['DB'])
-          # TODO: Standarize timezone conversion across all databases.
-          #       This test case will be refactored and should work the same across all vendors.
-          if ENV['DB'] == 'mssql' && /Microsoft SQL Server (\d+)/.match(ActiveRecord::Base.connection.select_value('SELECT @@version'))[1].to_i < 2016
-            skip "SQL Server < 2016 is not currently supported"
-          end
-
-          tz = ENV['DB'] == 'mssql' ? time_zones['mssql'] : time_zones['posix']
-
-          assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', tz['utc']))
-          assert_equal '2014/03/03 09:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['sao_paulo']}))
-          assert_equal '2014/03/03 02:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['tahiti']}))
-
-          # Skipping conversion from UTC to the desired timezones fails in SQL
-          # Server and Postgres. This is mainly due to the fact that timezone
-          # information is not preserved in the column itself.
-          #
-          # MySQL is happy to consider that times by default are in UTC.
-          assert_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-          refute_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', tz['paris'])) if !%w[mysql postgresql].include?(ENV['DB'])
-
-          # Winter/Summer time
-          assert_equal '2014/08/03 14:42:00', t(@lucas, (@updated_at + 5.months).send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-          if ENV['DB'] == 'mssql'
-            assert_equal '2022/02/01 11:42:00', t(@lucas, Arel.quoted('2022-02-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-            assert_equal '2022/08/01 12:42:00', t(@lucas, Arel.quoted('2022-08-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-          else
-            assert_equal '2022/02/01 11:42:00', t(@lucas, Arel.quoted('2022-02-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', tz['paris']))
-            assert_equal '2022/08/01 12:42:00', t(@lucas, Arel.quoted('2022-08-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', tz['paris']))
-          end
-        end
-      end
-
-      def test_format_iso_week
-        %i[format format_date].each do |method|
-          skip "Unsupported ISO week number for DB=#{ENV['DB']}" if ['sqlite'].include?(ENV['DB'])
-          assert_equal '10', t(@lucas, @updated_at.send(method, '%V'))
-          {
-            '2024-01-01 10:42:00' => '01', # Monday
-            '2030-01-01 10:42:00' => '01', # Tuesday
-            '2025-01-01 10:42:00' => '01', # Wednesday
-            '2026-01-01 10:42:00' => '01', # Thursday
-            '2027-01-01 10:42:00' => '53', # Friday
-            '2028-01-01 10:42:00' => '52', # Saturday
-            '2034-01-01 10:42:00' => '52', # Sunday
-          }.each do |date, exp|
-            assert_equal exp, t(@lucas, Arel.quoted(date).cast(:datetime).send(method, '%V'))
-          end
-        end
-      end
-
-      def test_format_iso_year_of_week
-        skip "Unsupported ISO year of week for DB=#{ENV['DB']}" if %w[mssql sqlite].include?(ENV['DB'])
-        %i[format format_date].each do |method|
-          assert_equal '2014', t(@lucas, @updated_at.send(method, '%G'))
-
-          {
-            '2024-01-01 10:42:00' => '2024', # Monday
-            '2030-01-01 10:42:00' => '2030', # Tuesday
-            '2025-01-01 10:42:00' => '2025', # Wednesday
-            '2026-01-01 10:42:00' => '2026', # Thursday
-            '2027-01-01 10:42:00' => '2026', # Friday
-            '2028-01-01 10:42:00' => '2027', # Saturday
-            '2034-01-01 10:42:00' => '2033', # Sunday
-          }.each do |date, exp|
-            assert_equal exp, t(@lucas, Arel.quoted(date).cast(:datetime).send(method, '%G'))
-          end
-        end
-      end
-
-      def test_format_date_with_names
-        skip "#{ENV['DB']} does not support a variety of word-based formatting for month and day names" if %w[mssql sqlite].include?(ENV['DB'])
-        %i[format format_date].each do |method|
-          assert_equal 'Mon, 03 Mar 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
-          assert_equal 'Monday, 03 March 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
-        end
-
-        skip "#{ENV['DB']} does not support ALLCAPS month and day names" if ['mysql'].include?(ENV['DB'])
-        %i[format format_date].each do |method|
-
-          assert_equal 'Mon, 03 MAR 14', t(@lucas, @updated_at.send(method, '%a, %d %^b %y'))
-          assert_equal 'Monday, 03 MARCH 14', t(@lucas, @updated_at.send(method, '%A, %d %^B %y'))
-        end
-      end
-
-      def switch_to_lang(lang)
-        languages = {
-          'mssql'      => {en: 'English',    fr: 'French'},
-          'mysql'      => {en: 'en_US',      fr: 'fr_FR'},
-          'postgresql' => {en: 'en_US.utf8', fr: 'fr_FR.utf8'}
-        }
-
-        sql = {
-          'mssql'      => ->(l) { "SET LANGUAGE #{l};"          },
-          'mysql'      => ->(l) { "SET lc_time_names = '#{l}';" },
-          'postgresql' => ->(l) { "SET lc_time to '#{l}';"      }
-        }
-
-        User.connection.execute(sql[ENV['DB']][languages[ENV['DB']][lang]])
-      end
-
-      def test_format_date_with_names_and_lang_switch
-        skip "#{ENV['DB']} does not support word-based formatting for month and day names" if ['sqlite'].include?(ENV['DB'])
-
-        # the begin-rescue block is here to make sure we set the db back to en_US
-        # if we fail, so that other tests don't get contaminated.
-        #
-        # Tests should assert one single thing in principle, but until we
-        # refactor this whole thing, we'll have to do tricks of this sort.
-        %i[format format_date].each do |method|
-          begin
-            switch_to_lang(:en)
-            case ENV['DB']
-            when 'mysql', 'postgresql'
-              assert_equal 'Mon, 03 Mar 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
-              assert_equal 'Monday, 03 March 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
-            when 'mssql'
-              assert_equal 'Monday, 03 March 2014', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
-            end
-            switch_to_lang(:fr)
-            case ENV['DB']
-            when 'mysql'
-              assert_equal 'lun, 03 mar 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
-              assert_equal 'lundi, 03 mars 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
-            when 'postgresql'
-              assert_equal 'Lun., 03 Mars 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
-              assert_equal 'Lundi, 03 Mars 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
-            when 'mssql'
-              assert_equal 'lundi, 03 mars 2014', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
-            end
-          ensure
-            switch_to_lang(:en)
-          end
-        end
+        assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
+        skip "SQL Server does not accept any format" if @env_db == 'mssql'
+        assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
       end
 
       def test_coalesce
-        assert_equal 'Camille concat', t(@camille, @name.coalesce(nil, 'default') + ' concat')
+        assert_equal 'Camille concat', t(@camille, @name.coalesce(nil, "default") + ' concat')
 
-        assert_equal 'toto', t(@test, @other.coalesce(''))
+        assert_equal 'toto', t(@test, @other.coalesce(""))
 
-        assert_equal ' ', t(@myung, @comments.coalesce('Myung').coalesce('ignored'))
-        assert_equal 'Laure', t(@laure, @comments.coalesce('Laure'))
+        assert_equal ' ', t(@myung, @comments.coalesce("Myung").coalesce('ignored'))
+        assert_equal 'Laure', t(@laure, @comments.coalesce("Laure"))
         if @env_db == 'oracle'
-          assert_nil t(@laure, @comments.coalesce(''))
-          assert_nil t(@camille, @other.coalesce(''))
+          assert_nil t(@laure, @comments.coalesce(""))
+          assert_nil t(@camille, @other.coalesce(""))
         else
-          assert_equal('', t(@laure, @comments.coalesce('')))
-          assert_equal '', t(@camille, @other.coalesce(''))
+          assert_equal('', t(@laure, @comments.coalesce("")))
+          assert_equal '', t(@camille, @other.coalesce(""))
         end
         assert_equal 100, t(@test, @age.coalesce(100))
-        assert_equal 'Camille', t(@camille, @name.coalesce(nil, 'default'))
+        assert_equal "Camille", t(@camille, @name.coalesce(nil, "default"))
         assert_equal 20, t(@test, @age.coalesce(nil, 20))
 
-        assert_equal 20, t(@test, @age.coalesce(10) + 10)
-        assert_equal 'Laure10', t(@laure, @comments.coalesce('Laure') + 10)
-      end
-
-      def test_coalesce_blank
-        assert_equal 'Myung', t(@myung, @comments.coalesce_blank('Myung').coalesce_blank('ignored'))
-        assert_equal 'Myung', t(@myung, @comments.coalesce_blank('', ' ', '   ').coalesce_blank('Myung'))
-        assert_equal 'Myung', t(@myung, @comments.coalesce_blank('', ' ', '   ', 'Myung'))
-        assert_equal '2016-05-23', t(@myung, @created_at.coalesce_blank(Date.new(2022, 1, 1)).format('%Y-%m-%d'))
-        assert_equal '2016-05-23', t(@myung, @created_at.coalesce_blank(Date.new(2022, 1, 1)).format_date('%Y-%m-%d'))
-        assert_equal 'Laure', t(@laure, @comments.coalesce_blank('Laure'))
-        assert_equal 100, t(@test, @age.coalesce_blank(100))
-        assert_equal 20, t(@test, @age.coalesce_blank(20))
-        assert_equal 20, t(@test, @age.coalesce_blank(10) + 10)
-        assert_equal 'Laure10', t(@laure, @comments.coalesce_blank('Laure') + 10)
-
-        skip 'mssql does not support null in case results' if @env_db == 'mssql'
-
-        assert_equal 'Camille concat', t(@camille, @name.coalesce_blank(Arel.null, 'default') + ' concat')
-        assert_equal 'Myung', t(@myung, @comments.coalesce_blank(Arel.null, 'Myung'))
-        assert_equal 'Camille', t(@camille, @name.coalesce_blank(Arel.null, 'default'))
+        assert_equal 20, t(@test, @age.coalesce(10)+10)
+        assert_equal 'Laure10', t(@laure, @comments.coalesce("Laure") + 10)
       end
 
       # Comparators
@@ -664,44 +374,37 @@ module ArelExtensions
         assert_equal 2, User.where(@age <= 10).count
         assert_equal 3, User.where(@age > 20).count
         assert_equal 4, User.where(@age >= 20).count
-        assert_equal 2, User.where(@age > 5).where(@age < 20).count
+        assert_equal 1, User.where(@age > 5).where(@age < 20).count
       end
 
       def test_date_comparator
         d = Date.new(2016, 5, 23)
         assert_equal 0, User.where(@created_at < d).count
-        assert_equal 10, User.where(@created_at >= d).count
+        assert_equal 8, User.where(@created_at >= d).count
       end
 
       def test_date_duration
-        # When user `nilly` is created, with an explicit `created_at: nil`,
-        # activerecord will give it the current date.
-        #
-        # So depending on the month when we run this test, we will get different
-        # results for `User.where(@created_at.month.eq('05'))`.
-        count_for_may = Time.now.month == 5 ? 10 : 9
-
-        # Year
+        #Year
         assert_equal 2016, t(@lucas, @created_at.year).to_i
-        assert_equal 0, User.where(@created_at.year.eq('2012')).count
-        # Month
+        assert_equal 0, User.where(@created_at.year.eq("2012")).count
+        #Month
         assert_equal 5, t(@camille, @created_at.month).to_i
-        assert_equal count_for_may, User.where(@created_at.month.eq('05')).count
-        # Week
+        assert_equal 8, User.where(@created_at.month.eq("05")).count
+        #Week
         assert_equal(@env_db == 'mssql' ? 22 : 21, t(@arthur, @created_at.week).to_i)
-        assert_equal count_for_may, User.where(@created_at.month.eq('05')).count
-        # Day
+        assert_equal 8, User.where(@created_at.month.eq("05")).count
+        #Day
         assert_equal 23, t(@laure, @created_at.day).to_i
-        assert_equal 0, User.where(@created_at.day.eq('05')).count
+        assert_equal 0, User.where(@created_at.day.eq("05")).count
 
-        # skip "manage DATE" if @env_db == 'oracle'
-        # Hour
+        #skip "manage DATE" if @env_db == 'oracle'
+        #Hour
         assert_equal 0, t(@laure, @created_at.hour).to_i
         assert_equal 12, t(@lucas, @updated_at.hour).to_i
-        # Minute
+        #Minute
         assert_equal 0, t(@laure, @created_at.minute).to_i
         assert_equal 42, t(@lucas, @updated_at.minute).to_i
-        # Second
+        #Second
         assert_equal 0, t(@laure, @created_at.second).to_i
         assert_equal 0, t(@lucas, @updated_at.second).to_i
       end
@@ -709,8 +412,8 @@ module ArelExtensions
       def test_datetime_diff
         assert_equal 0, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 42)).to_i
         if @env_db == 'oracle' && Arel::VERSION.to_i > 6 # in rails 5, result is multiplied by 24*60*60 = 86400...
-          assert_equal 42 * 86_400, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 41, 18)).to_i
-          assert_equal(-3600 * 86_400, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 13, 42)).to_i)
+          assert_equal 42 * 86400, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 41, 18)).to_i
+          assert_equal(-3600 * 86400, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 13, 42)).to_i)
         else
           assert_equal 42, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 41, 18)).to_i
           assert_equal(-3600, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 13, 42)).to_i)
@@ -721,8 +424,7 @@ module ArelExtensions
           end
         end
 
-
-        skip 'not yet implemented' if $sqlite
+        skip "not yet implemented" if $sqlite
 
         date1 = Date.new(2016, 5, 23)
         durPos = 10.years
@@ -734,134 +436,106 @@ module ArelExtensions
 
         datetime1 = Time.utc(2014, 3, 3, 12, 42, 0)
         # Pull Request #5 tests
-        # puts (@created_at + durPos).cast(:date).to_sql
-        assert_includes [date2, '2026-05-23'], t(@test, (@created_at + durPos).cast(:date))
-        assert_includes [date3, '2006-05-23'], t(@test, (@created_at + durNeg).cast(:date))
+        #puts (@created_at + durPos).cast(:date).to_sql
+        assert_includes [date2,"2026-05-23"], t(@test,(@created_at + durPos).cast(:date))
+        assert_includes [date3,"2006-05-23"], t(@test,(@created_at + durNeg).cast(:date))
 
-        # puts (@created_at + @created_at.day).cast(:date).to_sql
-        assert_includes [date4, '2016-06-15'], t(@test, (@created_at + @created_at.day).cast(:date))
-        # puts (@created_at - @created_at.day).cast(:date).to_sql
-        assert_includes [date5, '2016-04-30'], t(@test, (@created_at - @created_at.day).cast(:date))
+        #puts (@created_at + @created_at.day).cast(:date).to_sql
+        assert_includes [date4,"2016-06-15"], t(@test,(@created_at + @created_at.day).cast(:date))
+        #puts (@created_at - @created_at.day).cast(:date).to_sql
+        assert_includes [date5,"2016-04-30"], t(@test,(@created_at - @created_at.day).cast(:date))
 
-        assert_includes [datetime1 + 42.seconds, '2014-03-03 12:42:42 UTC'], t(@lucas, (@updated_at + @updated_at.minute))
-        assert_includes [datetime1 - 42.seconds, '2014-03-03 12:41:18 UTC'], t(@lucas, (@updated_at - @updated_at.minute))
+        assert_includes [datetime1 + 42.seconds,"2014-03-03 12:42:42 UTC"], t(@lucas,(@updated_at + @updated_at.minute))
+        assert_includes [datetime1 - 42.seconds,"2014-03-03 12:41:18 UTC"], t(@lucas,(@updated_at - @updated_at.minute))
 
         # (@updated_at + Arel.duration('s',(@updated_at.hour*60 + @updated_at.minute))).to_sql
-        assert_includes [datetime1 + (12 * 60 + 42).seconds, '2014-03-03 12:54:42 UTC'],
-                        t(@lucas, (@updated_at + Arel.duration('s', (@updated_at.hour * 60 + @updated_at.minute))))
+        assert_includes [datetime1 + (12*60+42).seconds,"2014-03-03 12:54:42 UTC"],
+          t(@lucas,(@updated_at + Arel.duration('s',(@updated_at.hour*60 + @updated_at.minute))))
 
-        assert_includes [datetime1 + (12 * 60 + 42).minutes, '2014-03-04 01:24:00 UTC'],
-                        t(@lucas, (@updated_at + Arel.duration('mn', (@updated_at.hour * 60 + @updated_at.minute))))
+        assert_includes [datetime1 + (12*60+42).minutes,"2014-03-04 01:24:00 UTC"],
+          t(@lucas,(@updated_at + Arel.duration('mn',(@updated_at.hour*60 + @updated_at.minute))))
 
-        assert_includes ['2024-03-03'], t(@lucas, (@updated_at + durPos).format('%Y-%m-%d'))
-        assert_includes ['2024-03-03'], t(@lucas, (@updated_at + durPos).format_date('%Y-%m-%d'))
-        # puts (@updated_at - durPos).to_sql
-        assert_includes ['2004-03-03'], t(@lucas, (@updated_at - durPos).format('%Y-%m-%d'))
-        assert_includes ['2004-03-03'], t(@lucas, (@updated_at - durPos).format_date('%Y-%m-%d'))
+        assert_includes ["2024-03-03"], t(@lucas,(@updated_at + durPos).format('%Y-%m-%d'))
+        #puts (@updated_at - durPos).to_sql
+        assert_includes ["2004-03-03"], t(@lucas,(@updated_at - durPos).format('%Y-%m-%d'))
 
 
         # we test with the ruby object or the string because some adapters don't return an object Date
-        #        end
+#        end
       end
 
       # TODO; cast types
       def test_cast_types
-        assert_equal '5', t(@lucas, @age.cast(:string))
-        skip 'jdbc adapters does not work properly here (v52 works fine)' if RUBY_PLATFORM.match?(/java/i)
+        assert_equal "5", t(@lucas, @age.cast(:string))
         if @env_db == 'mysql' || @env_db == 'postgresql' || @env_db == 'oracle' || @env_db == 'mssql'
-          assert_equal 1, t(@laure, Arel.when(@duration.cast(:time).cast(:string).eq('12:42:21')).then(1).else(0)) unless @env_db == 'oracle' || @env_db == 'mssql'
-          assert_equal 1, t(@laure, Arel.when(@duration.cast(:time).eq('12:42:21')).then(1).else(0)) unless @env_db == 'oracle'
-          assert_equal '20.16', t(@laure, @score.cast(:string)).gsub(/0*\z/, '')
-          assert_equal '20.161', t(@laure, @score.cast(:string) + 1).gsub(/0*1\z/, '1')
-          assert_equal 21.16, t(@laure, @score.cast(:string).cast(:decimal) + 1)
-          assert_equal 21, t(@laure, @score.cast(:string).cast(:int) + 1)
-
-          assert_equal String, t(@lucas, @updated_at.cast(:string)).class
-
-          assert_equal Date, t(@lucas, @updated_at.cast(:date)).class unless @env_db == 'oracle' # DateTime
-          assert_equal Time, t(@lucas, @updated_at.cast(:string).cast(:datetime)).class
-          assert_equal Time, t(@lucas, @updated_at.cast(:time)).class
-
-          # mysql adapter in rails7 adds some infos we just squeeze here
-          assert_equal '2014-03-03 12:42:00', t(@lucas, @updated_at.cast(:string)).split('.').first unless @env_db == 'mssql' # locale dependent
-          assert_equal Date.parse('2014-03-03'), t(@lucas, Arel.quoted('2014-03-03').cast(:date))
-          assert_equal Date.parse('5014-03-03'), t(@lucas, (@age.cast(:string) + '014-03-03').cast(:date))
-          assert_equal Time.parse('2014-03-03 12:42:00 UTC'), t(@lucas, @updated_at.cast(:string).cast(:datetime))
-          assert_equal Date.parse('2014-03-03'), t(@lucas, @updated_at.cast(:date))
-          assert_equal '12:42:00', t(@lucas, @updated_at.cast(:time).cast(:string)).split('.').first unless @env_db == 'oracle' # DateTime
-        end
-      end
-
-      def test_if_present
-        assert_nil t(@myung, @comments.if_present)
-        assert_equal 0, t(@myung, @comments.if_present.count)
-        assert_equal 20.16, t(@myung, @score.if_present)
-        assert_equal '2016-05-23', t(@myung, @created_at.if_present.format('%Y-%m-%d'))
-        assert_equal '2016-05-23', t(@myung, @created_at.if_present.format_date('%Y-%m-%d'))
-        assert_nil t(@laure, @comments.if_present)
-
-        assert_nil t(@nilly, @duration.if_present.format('%Y-%m-%d'))
-        assert_nil t(@nilly, @duration.if_present.format_date('%Y-%m-%d'))
-
-        # NOTE: here we're testing the capacity to format a nil value,
-        # however, @comments is a text field, and not a date/datetime field,
-        # so Postgres will rightfully complain when we format the text:
-        # we need to cast it first.
-        if @env_db == 'postgresql'
-          assert_nil t(@laure, @comments.cast(:date).if_present.format('%Y-%m-%d'))
-          assert_nil t(@laure, @comments.cast(:date).if_present.format_date('%Y-%m-%d'))
-        else
-          assert_nil t(@laure, @comments.if_present.format('%Y-%m-%d'))
-          assert_nil t(@laure, @comments.if_present.format_date('%Y-%m-%d'))
+          assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).cast(:string).eq("12:42:21")).then(1).else(0)) unless @env_db == 'oracle' || @env_db == 'mssql'
+          assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).eq("12:42:21")).then(1).else(0)) unless @env_db == 'oracle'
+          assert_equal "20.16", t(@laure,@score.cast(:string)).gsub(/[0]*\z/,'')
+          assert_equal "20.161", t(@laure,@score.cast(:string)+1).gsub(/[0]*1\z/,'1')
+          assert_equal 21.16, t(@laure,@score.cast(:string).cast(:decimal)+1)
+          assert_equal 21, t(@laure,@score.cast(:string).cast(:int)+1)
+
+          assert_equal String, t(@lucas,@updated_at.cast(:string)).class
+          assert_equal Date, t(@lucas,@updated_at.cast(:date)).class unless @env_db == 'oracle' # DateTime
+          assert_equal Time, t(@lucas,@updated_at.cast(:string).cast(:datetime)).class
+          assert_equal Time, t(@lucas,@updated_at.cast(:time)).class
+
+          assert_equal "2014-03-03 12:42:00", t(@lucas,@updated_at.cast(:string)) unless @env_db == 'mssql' #locale dependent
+          assert_equal Date.parse("2014-03-03"), t(@lucas,Arel::Nodes.build_quoted('2014-03-03').cast(:date))
+          assert_equal Date.parse("5014-03-03"), t(@lucas,(@age.cast(:string) + '014-03-03').cast(:date))
+          assert_equal Time.parse("2014-03-03 12:42:00 UTC"), t(@lucas,@updated_at.cast(:string).cast(:datetime))
+          assert_equal Date.parse("2014-03-03"), t(@lucas,@updated_at.cast(:date))
+          assert_equal "12:42:00", t(@lucas,@updated_at.cast(:time).cast(:string)).split('.').first unless @env_db == 'oracle'  #DateTime
         end
       end
 
       def test_is_null
-        # puts User.where(@age.is_null).select(@name).to_sql
-        # puts @age.is_null
-        # puts @age.is_null.inspect
-        # puts @age.is_null.to_sql
-        # puts @age=='34'
-        assert_equal 'Test', User.select(@name).where(@age.is_null).first.name
+        #puts User.where(@age.is_null).select(@name).to_sql
+        #puts @age.is_null
+        #puts @age.is_null.inspect
+        #puts @age.is_null.to_sql
+        #puts @age=='34'
+        assert_equal "Test", User.select(@name).where(@age.is_null.to_sql).first.name
       end
 
       def test_math_plus
         d = Date.new(1997, 6, 15)
-        # Concat String
-        assert_equal 'SophiePhan', t(@sophie, @name + 'Phan')
-        assert_equal 'Sophie2', t(@sophie, @name + 2)
-        assert_equal 'Sophie1997-06-15', t(@sophie, @name + d)
-        assert_equal 'Sophie15', t(@sophie, @name + @age)
-        assert_equal 'SophieSophie', t(@sophie, @name + @name)
-        assert_equal 'SophieSophieSophie', t(@sophie, @name + @name + @name)
-        assert_equal 'SophieSophieSophie', t(@sophie, @name.concat(@name.concat(@name)))
-        assert_equal 'SophieSophieSophie', t(@sophie, @name.concat(@name).concat(@name))
-        # FIXME: should work as expected in Oracle
-        assert_equal 'Sophie2016-05-23', t(@sophie, @name + @created_at) unless @env_db == 'oracle'
-        # concat Integer
+        #Concat String
+        assert_equal "SophiePhan", t(@sophie, @name + "Phan")
+        assert_equal "Sophie2", t(@sophie, @name + 2)
+        assert_equal "Sophie1997-06-15", t(@sophie, @name + d)
+        assert_equal "Sophie15", t(@sophie, @name + @age)
+        assert_equal "SophieSophie", t(@sophie, @name + @name)
+        assert_equal "SophieSophieSophie", t(@sophie, @name + @name + @name)
+        assert_equal "SophieSophieSophie", t(@sophie, @name.concat(@name.concat(@name)))
+        assert_equal "SophieSophieSophie", t(@sophie, @name.concat(@name).concat(@name))
+        #FIXME: should work as expected in Oracle
+        assert_equal "Sophie2016-05-23", t(@sophie, @name + @created_at) unless @env_db == 'oracle'
+        #concat Integer
         assert_equal 1, User.where((@age + 10).eq(33)).count
-        assert_equal 1, User.where((@age + '1').eq(6)).count
+        assert_equal 1, User.where((@age + "1").eq(6)).count
         assert_equal 1, User.where((@age + @age).eq(10)).count
-        # concat Date
-        # puts((User.arel_table[:created_at] + 1).as("res").to_sql.inspect)
-        assert_equal '2016-05-24', t(@myung, @created_at + 1).to_date.to_s
-        assert_equal '2016-05-25', t(@myung, @created_at + 2.day).to_date.to_s
+        #concat Date
+        #puts((User.arel_table[:created_at] + 1).as("res").to_sql.inspect)
+        assert_equal "2016-05-24", t(@myung, @created_at + 1).to_date.to_s
+        assert_equal "2016-05-25", t(@myung, @created_at + 2.day).to_date.to_s
       end
 
+
       def test_math_minus
         d = Date.new(2016, 5, 20)
-        # Datediff
-        assert_equal 10, User.where((@created_at - @created_at).eq(0)).count
-        assert_equal 3, @laure.select((@created_at - d).as('res')).first.res.abs.to_i
-        # Substraction
+        #Datediff
+        assert_equal 8, User.where((@created_at - @created_at).eq(0)).count
+        assert_equal 3, @laure.select((@created_at - d).as("res")).first.res.abs.to_i
+        #Substraction
         assert_equal 0, User.where((@age - 10).eq(50)).count
-        assert_equal 0, User.where((@age - '10').eq(50)).count
+        assert_equal 0, User.where((@age - "10").eq(50)).count
         # assert_equal 0, User.where((@age - 9.5).eq(50.5)).count # should work: TODO
-        assert_equal 0, User.where((@age - '9.5').eq(50.5)).count
+        assert_equal 0, User.where((@age - "9.5").eq(50.5)).count
       end
 
       def test_wday
-        # d = Date.new(2016, 6, 26)
+        #d = Date.new(2016, 6, 26)
         assert_equal(@env_db == 'oracle' || @env_db == 'mssql' ? 2 : 1, t(@myung, @created_at.wday).to_i) # monday
       end
 
@@ -880,8 +554,8 @@ module ArelExtensions
         assert_equal 3, User.select('*').from((@ut.project(@age).where(@age.eq(20)) + @ut.project(@age).where(@age.eq(23)) + @ut.project(@age).where(@age.eq(21))).as('my_union')).length
         assert_equal 2, User.select('*').from((@ut.project(@age).where(@age.eq(20)) + @ut.project(@age).where(@age.eq(20)) + @ut.project(@age).where(@age.eq(21))).as('my_union')).length
 
-        assert_equal 3, User.find_by_sql(@ut.project(@age).where(@age.gt(22)).union_all(@ut.project(@age).where(@age.lt(0))).to_sql).length
-        assert_equal 3, User.find_by_sql(@ut.project(@age).where(@age.eq(20)).union_all(@ut.project(@age).where(@age.eq(20))).union_all(@ut.project(@age).where(@age.eq(21))).to_sql).length
+        assert_equal 3, User.find_by_sql((@ut.project(@age).where(@age.gt(22)).union_all(@ut.project(@age).where(@age.lt(0)))).to_sql).length
+        assert_equal 3, User.find_by_sql((@ut.project(@age).where(@age.eq(20)).union_all(@ut.project(@age).where(@age.eq(20))).union_all(@ut.project(@age).where(@age.eq(21)))).to_sql).length
         assert_equal 3, User.select('*').from((@ut.project(@age).where(@age.gt(22)).union_all(@ut.project(@age).where(@age.lt(0)))).as('my_union')).length
         assert_equal 3, User.select('*').from((@ut.project(@age).where(@age.eq(20)).union_all(@ut.project(@age).where(@age.eq(23))).union_all(@ut.project(@age).where(@age.eq(21)))).as('my_union')).length
         assert_equal 3, User.select('*').from((@ut.project(@age).where(@age.eq(20)).union_all(@ut.project(@age).where(@age.eq(20))).union_all(@ut.project(@age).where(@age.eq(21)))).as('my_union')).length
@@ -892,118 +566,116 @@ module ArelExtensions
       # Case clause
       def test_case
         assert_equal 4, User.find_by_sql(@ut.project(@score.when(20.16).then(1).else(0).as('score_bin')).to_sql).sum(&:score_bin)
-        assert_equal 4, User.where(@score.when(20.16).then(1).else(0).eq(1)).count
-        assert_equal 2, t(@arthur, @score.when(65.62, 1).else(0) + 1)
-        assert_equal 0, t(@arthur, @score.when(65.62, 1).else(0) - 1)
-        assert_equal '11', t(@arthur, @score.when(65.62).then('1').else('0') + '1')
-        assert_equal 66.62, t(@arthur, @score.when(65.62).then(@score).else(@score) + 1)
-        assert_equal '65.621', t(@arthur, @score.when(65.62).then(@score.cast(:string)).else(@score.cast(:string)) + 1).tr('0', '') # tr is here because of precision on cast for some DBMS
+        assert_equal 2, t(@arthur, @score.when(65.62,1).else(0)+1)
+        assert_equal 0, t(@arthur, @score.when(65.62,1).else(0)-1)
+        assert_equal "11", t(@arthur, @score.when(65.62).then("1").else("0")+"1")
+        assert_equal 66.62, t(@arthur, @score.when(65.62).then(@score).else(@score)+1)
+        assert_equal "65.621", t(@arthur, @score.when(65.62).then(@score.cast(:string)).else(@score.cast(:string))+1).tr('0','') #tr is here because of precision on cast for some DBMS
       end
 
       def test_format_numbers
-        # score of Arthur = 65.62
-        skip ' Works with SQLite if the version used knows printf' if $sqlite
-
-        assert_equal 'Wrong Format', t(@arthur, @score.format_number('$ %...234.6F €', 'fr_FR'))
-        assert_equal 'AZERTY65,62', t(@arthur, @score.format_number('AZERTY%.2f', 'fr_FR'))
-        assert_equal '65,62AZERTY', t(@arthur, @score.format_number('%.2fAZERTY', 'fr_FR'))
-        assert_equal '$ 65.62 €', t(@arthur, @score.format_number('$ %.2f €', 'en_US'))
-        assert_equal '$ 66 €', t(@arthur, @score.format_number('$ %.0f €', 'en_US'))
-        assert_equal '$ 0065,62 €', t(@arthur, @score.format_number('$ %07.2f €', 'fr_FR'))
-        assert_equal '$ 65,62   €', t(@arthur, @score.format_number('$ %-07.2f €', 'fr_FR'))
-        assert_equal '$ 65,62   €', t(@arthur, @score.format_number('$ %-7.2f €', 'fr_FR'))
-        assert_equal '$   65,62 €', t(@arthur, @score.format_number('$ % 7.2f €', 'fr_FR'))
-        assert_equal '$    65,6 €', t(@arthur, @score.format_number('$ % 7.1f €', 'fr_FR'))
-        assert_equal '$  +65,62 €', t(@arthur, @score.format_number('$ % +7.2f €', 'fr_FR'))
-        assert_equal '$ +065,62 €', t(@arthur, @score.format_number('$ %0+7.2f €', 'fr_FR'))
-        assert_includes ['$ 6,56e1 €', '$ 6,56e+01 €'], t(@arthur, @score.format_number('$ %.2e €', 'fr_FR'))
-        assert_includes ['$ 6,56E1 €', '$ 6,56E+01 €'], t(@arthur, @score.format_number('$ %.2E €', 'fr_FR'))
-        assert_includes ['$ 6,562E1 €', '$ 6,562E+01 €'], t(@arthur, @score.format_number('$ %.3E €', 'fr_FR'))
-        assert_equal '123 456 765,6', t(@arthur, (@score + 123_456_700).format_number('%.1f', 'sv_SE')).tr("\u00A0", ' ') # some DBMS put no-break space here (it makes sense thus)
-        assert_equal '123456765,6', t(@arthur, (@score + 123_456_700).format_number('%.1f', 'fr_FR')).delete("\u00A0") # because SqlServer does it like no one else
-        assert_equal '123,456,765.6', t(@arthur, (@score + 123_456_700).format_number('%.1f', 'en_US'))
-        assert_equal '   123,456,765.6', t(@arthur, (@score + 123_456_700).format_number('%16.1f', 'en_US'))
-        assert_equal '$ 0,00 €', t(@arthur, @score.when(65.62).then(Arel.sql('null')).else(1).format_number('$ %.2f €', 'fr_FR'))
-        assert_equal '$ 0,00 €', t(@arthur, (@score - 65.62).format_number('$ %.2f €', 'fr_FR'))
+        #score of Arthur = 65.62
+        skip " Works with SQLite if the version used knows printf" if $sqlite
+
+        assert_equal "Wrong Format" , t(@arthur, @score.format_number("$ %...234.6F €","fr_FR"))
+        assert_equal "AZERTY65,62" , t(@arthur, @score.format_number("AZERTY%.2f","fr_FR"))
+        assert_equal "65,62AZERTY" , t(@arthur, @score.format_number("%.2fAZERTY","fr_FR"))
+        assert_equal "$ 65.62 €" , t(@arthur, @score.format_number("$ %.2f €","en_US"))
+        assert_equal "$ 66 €" , t(@arthur, @score.format_number("$ %.0f €","en_US"))
+        assert_equal "$ 0065,62 €" , t(@arthur, @score.format_number("$ %07.2f €","fr_FR"))
+        assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-07.2f €","fr_FR"))
+        assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-7.2f €","fr_FR"))
+        assert_equal "$   65,62 €" , t(@arthur, @score.format_number("$ % 7.2f €","fr_FR"))
+        assert_equal "$    65,6 €" , t(@arthur, @score.format_number("$ % 7.1f €","fr_FR"))
+        assert_equal "$  +65,62 €" , t(@arthur, @score.format_number("$ % +7.2f €","fr_FR"))
+        assert_equal "$ +065,62 €" , t(@arthur, @score.format_number("$ %0+7.2f €","fr_FR"))
+        assert_includes ["$ 6,56e1 €","$ 6,56e+01 €"], t(@arthur, @score.format_number("$ %.2e €","fr_FR"))
+        assert_includes ["$ 6,56E1 €","$ 6,56E+01 €"], t(@arthur, @score.format_number("$ %.2E €","fr_FR"))
+        assert_includes ["$ 6,562E1 €","$ 6,562E+01 €"], t(@arthur, @score.format_number("$ %.3E €","fr_FR"))
+        assert_equal "123 456 765,6" , t(@arthur, (@score+123456700).format_number("%.1f","sv_SE")).gsub("\u00A0"," ") #some DBMS put no-break space here (it makes sense thus)
+        assert_equal "123456765,6" , t(@arthur, (@score+123456700).format_number("%.1f","fr_FR")).gsub("\u00A0","") #because SqlServer does it like no one else
+        assert_equal "123,456,765.6" , t(@arthur, (@score+123456700).format_number("%.1f","en_US"))
+        assert_equal "   123,456,765.6" , t(@arthur, (@score+123456700).format_number("%16.1f","en_US"))
+        assert_equal "$ 0,00 €" , t(@arthur, @score.when(65.62).then(Arel.sql("null")).else(1).format_number("$ %.2f €","fr_FR"))
+        assert_equal "$ 0,00 €" , t(@arthur, (@score-65.62).format_number("$ %.2f €","fr_FR"))
       end
 
       def test_accent_insensitive
-        skip 'SQLite is natively Case Insensitive and Accent Sensitive' if $sqlite
-        skip 'Not finished' if @env_db == 'mysql'
+        skip "SQLite is natively Case Insensitive and Accent Sensitive" if $sqlite
+        skip "Not finished" if @env_db == 'mysql'
         # actual comments value: "arrêté"
-        # AI & CI
+        #AI & CI
         if !['postgresql'].include?(@env_db) # Extension unaccent required on PG
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_imatches('arrêté')).then('1').else('0'))
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_imatches('arrete')).then('1').else('0'))
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_imatches('àrrétè')).then('1').else('0'))
-          assert_equal '0', t(@arthur, Arel.when(@comments.ai_imatches('arretez')).then('1').else('0'))
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_imatches('Arrete')).then('1').else('0'))
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_imatches('Arrêté')).then('1').else('0'))
-          # AI & CS
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_matches('arrêté')).then('1').else('0'))
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_matches('arrete')).then('1').else('0'))
-          assert_equal '1', t(@arthur, Arel.when(@comments.ai_matches('àrrétè')).then('1').else('0'))
-          assert_equal '0', t(@arthur, Arel.when(@comments.ai_matches('arretez')).then('1').else('0'))
-          if !%w[oracle postgresql mysql].include?(@env_db) # AI => CI
-            assert_equal '0', t(@arthur, Arel.when(@comments.ai_matches('Arrete')).then('1').else('0'))
-            assert_equal '0', t(@arthur, Arel.when(@comments.ai_matches('Arrêté')).then('1').else('0'))
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arrêté")).then("1").else("0"))
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arrete")).then("1").else("0"))
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("àrrétè")).then("1").else("0"))
+          assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arretez")).then("1").else("0"))
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("Arrete")).then("1").else("0"))
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("Arrêté")).then("1").else("0"))
+          #AI & CS
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arrêté")).then("1").else("0"))
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arrete")).then("1").else("0"))
+          assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("àrrétè")).then("1").else("0"))
+          assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arretez")).then("1").else("0"))
+          if !['oracle','postgresql','mysql'].include?(@env_db) # AI => CI
+            assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("Arrete")).then("1").else("0"))
+            assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("Arrêté")).then("1").else("0"))
           end
         end
-        # AS & CI
-        assert_equal '1', t(@arthur, Arel.when(@comments.imatches('arrêté')).then('1').else('0'))
+        #AS & CI
+        assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arrêté")).then("1").else("0"))
         if !['mysql'].include?(@env_db) # CI => AI in utf8 (AI not possible in latin1)
-          assert_equal '0', t(@arthur, Arel.when(@comments.imatches('arrete')).then('1').else('0'))
-          assert_equal '0', t(@arthur, Arel.when(@comments.imatches('àrrétè')).then('1').else('0'))
+          assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arrete")).then("1").else("0"))
+          assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("àrrétè")).then("1").else("0"))
         end
-        assert_equal '0', t(@arthur, Arel.when(@comments.imatches('arretez')).then('1').else('0'))
+        assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arretez")).then("1").else("0"))
         if !['mysql'].include?(@env_db) # CI => AI in utf8 (AI not possible in latin1)
-          assert_equal '0', t(@arthur, Arel.when(@comments.imatches('Arrete')).then('1').else('0'))
+          assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("Arrete")).then("1").else("0"))
         end
-        assert_equal '1', t(@arthur, Arel.when(@comments.imatches('Arrêté')).then('1').else('0'))
-        # AS & CS
-        assert_equal '1', t(@arthur, Arel.when(@comments.smatches('arrêté')).then('1').else('0'))
-        assert_equal '0', t(@arthur, Arel.when(@comments.smatches('arrete')).then('1').else('0'))
-        assert_equal '0', t(@arthur, Arel.when(@comments.smatches('àrrétè')).then('1').else('0'))
-        assert_equal '0', t(@arthur, Arel.when(@comments.smatches('arretez')).then('1').else('0'))
-        assert_equal '0', t(@arthur, Arel.when(@comments.smatches('Arrete')).then('1').else('0'))
-        assert_equal '0', t(@arthur, Arel.when(@comments.smatches('Arrêté')).then('1').else('0'))
+        assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("Arrêté")).then("1").else("0"))
+        #AS & CS
+        assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arrêté")).then("1").else("0"))
+        assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arrete")).then("1").else("0"))
+        assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("àrrétè")).then("1").else("0"))
+        assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arretez")).then("1").else("0"))
+        assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("Arrete")).then("1").else("0"))
+        assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("Arrêté")).then("1").else("0"))
       end
 
       def test_subquery_with_order
-        skip if ['mssql'].include?(@env_db) && Arel::VERSION.to_i < 10
-        assert_equal 10, User.where(name: User.select(:name).order(:name)).count
-        assert_equal 10, User.where(@ut[:name].in(@ut.project(@ut[:name]).order(@ut[:name]))).count
-        if !['mysql'].include?(@env_db) # MySql can't have limit in IN subquery
-          assert_equal 2, User.where(name: User.select(:name).order(:name).limit(2)).count
-          # assert_equal 6, User.where(name: User.select(:name).order(:name).offset(2)).count
+        assert_equal 8, User.where(:name => User.select(:name).order(:name)).count
+        assert_equal 8, User.where(@ut[:name].in(@ut.project(@ut[:name]).order(@ut[:name]))).count
+        if !['mysql'].include?(@env_db)  # MySql can't have limit in IN subquery
+          assert_equal 2, User.where(:name => User.select(:name).order(:name).limit(2)).count
+          #assert_equal 6, User.where(:name => User.select(:name).order(:name).offset(2)).count
         end
       end
 
       def test_in_with_nil
-        assert_predicate @myung.where(@age.in(1)), :blank?
-        assert_predicate @myung.where(@age.in(23)), :present?
-        assert_predicate @myung.where(@age.in([1])), :blank?
-        assert_predicate @myung.where(@age.in([1, 2])), :blank?
-        assert_predicate @myung.where(@age.in([1, 23])), :present?
-        assert_predicate @myung.where(@age.in(nil)), :blank?
-        assert_predicate @myung.where(@age.in([nil])), :blank?
-        assert_predicate @myung.where(@age.in([nil, 1])), :blank?
-        assert_predicate @myung.where(@age.in([nil, 23])), :present?
-        assert_predicate @myung.where(@age.in([nil, 1, 2])), :blank?
-        assert_predicate @myung.where(@age.in([nil, 1, 23])), :present?
-        assert_predicate @test.where(@age.in(1)), :blank?
-        assert_predicate @test.where(@age.in([1])), :blank?
-        assert_predicate @test.where(@age.in([1, 2])), :blank?
-        assert_predicate @test.where(@age.in(nil)), :present?
-        assert_predicate @test.where(@age.in([nil])), :present?
-        assert_predicate @test.where(@age.in([nil, 1])), :present?
-        assert_predicate @test.where(@age.in([nil, 1, 2])), :present?
+        assert_equal true  , @myung.where(@age.in(1)).blank?
+        assert_equal false , @myung.where(@age.in(23)).blank?
+        assert_equal true  , @myung.where(@age.in([1])).blank?
+        assert_equal true  , @myung.where(@age.in([1,2])).blank?
+        assert_equal false , @myung.where(@age.in([1,23])).blank?
+        assert_equal true  , @myung.where(@age.in(nil)).blank?
+        assert_equal true  , @myung.where(@age.in([nil])).blank?
+        assert_equal true  , @myung.where(@age.in([nil,1])).blank?
+        assert_equal false , @myung.where(@age.in([nil,23])).blank?
+        assert_equal true  , @myung.where(@age.in([nil,1,2])).blank?
+        assert_equal false , @myung.where(@age.in([nil,1,23])).blank?
+        assert_equal true  , @test.where(@age.in(1)).blank?
+        assert_equal true  , @test.where(@age.in([1])).blank?
+        assert_equal true  , @test.where(@age.in([1,2])).blank?
+        assert_equal false , @test.where(@age.in(nil)).blank?
+        assert_equal false , @test.where(@age.in([nil])).blank?
+        assert_equal false , @test.where(@age.in([nil,1])).blank?
+        assert_equal false , @test.where(@age.in([nil,1,2])).blank?
       end
 
       def test_scope_with_in_plus_new
         begin
-          @test.where(@age.in([1, 2])).new
-          @test.where(@age.not_in([1, 2])).new
+          @test.where(@age.in([1,2])).new
+          @test.where(@age.not_in([1,2])).new
           assert true
         rescue
           assert false
@@ -1011,129 +683,114 @@ module ArelExtensions
       end
 
       def test_is_not_null
-        assert_predicate @myung.where(@age.is_not_null), :present?
-        assert_predicate @test.where(@age.is_not_null), :blank?
+        assert_equal false , @myung.where(@age.is_not_null).blank?
+        assert_equal true  , @test.where(@age.is_not_null).blank?
       end
 
       def test_not_in_with_nil
-        assert_predicate @myung.where(@age.not_in(1)), :present?
-        assert_predicate @myung.where(@age.not_in(23)), :blank?
-        assert_predicate @myung.where(@age.not_in([1])), :present?
-        assert_predicate @myung.where(@age.not_in([1, 2])), :present?
-        assert_predicate @myung.where(@age.not_in([1, 23])), :blank?
-        assert_predicate @myung.where(@age.not_in(nil)), :present?
-        assert_predicate @myung.where(@age.not_in([nil])), :present?
-        assert_predicate @myung.where(@age.not_in([nil, 1])), :present?
-        assert_predicate @myung.where(@age.not_in([nil, 23])), :blank?
-        assert_predicate @myung.where(@age.not_in([nil, 1, 2])), :present?
-        assert_predicate @myung.where(@age.not_in([nil, 1, 23])), :blank?
-
-        assert_predicate @myung.where(@age.not_in(1..2)), :present?
-
-        # if the column is null, the entry will never be selected with not in (like every DBMS does)
-        # assert_predicate @test.where(@age.not_in(1)), :present?
-        # assert_predicate @test.where(@age.not_in([1])), :present?
-        # assert_predicate @test.where(@age.not_in([1,2])), :present?
-        # assert_predicate @test.where(@age.not_in(nil)), :blank?
-        # assert_predicate @test.where(@age.not_in([nil])), :blank?
-        # assert_predicate @test.where(@age.not_in([nil,1])), :blank?
-        # assert_predicate @test.where(@age.not_in([nil,1,2])), :blank?
-      end
-
-      def test_in_on_grouping
-        skip 'We should modify the visitor of IN to make it work' if $sqlite || @env_db == 'mssql'
-        assert_equal 2, User.where(Arel.tuple(@name, @age).in(Arel.tuple('Myung', 23), Arel.tuple('Arthur', 21))).count
-        assert_equal 1, User.where(Arel.tuple(@name, @age).in(Arel.tuple('Myung', 23))).count
-        assert_equal 0, User.where(Arel.tuple(@name, @age).in([])).count
+        assert_equal false , @myung.where(@age.not_in(1)).blank?
+        assert_equal true  , @myung.where(@age.not_in(23)).blank?
+        assert_equal false , @myung.where(@age.not_in([1])).blank?
+        assert_equal false , @myung.where(@age.not_in([1,2])).blank?
+        assert_equal true  , @myung.where(@age.not_in([1,23])).blank?
+        assert_equal false , @myung.where(@age.not_in(nil)).blank?
+        assert_equal false , @myung.where(@age.not_in([nil])).blank?
+        assert_equal false , @myung.where(@age.not_in([nil,1])).blank?
+        assert_equal true  , @myung.where(@age.not_in([nil,23])).blank?
+        assert_equal false , @myung.where(@age.not_in([nil,1,2])).blank?
+        assert_equal true  , @myung.where(@age.not_in([nil,1,23])).blank?
+
+        assert_equal false , @myung.where(@age.not_in(1..2)).blank?
+
+        #if the column is null, the entry will never be selected with not in (like every DBMS does)
+        #assert_equal false , @test.where(@age.not_in(1)).blank?
+        #assert_equal false , @test.where(@age.not_in([1])).blank?
+        #assert_equal false , @test.where(@age.not_in([1,2])).blank?
+        #assert_equal true  , @test.where(@age.not_in(nil)).blank?
+        #assert_equal true  , @test.where(@age.not_in([nil])).blank?
+        #assert_equal true  , @test.where(@age.not_in([nil,1])).blank?
+        #assert_equal true  , @test.where(@age.not_in([nil,1,2])).blank?
       end
 
       def test_alias_shortened
-        if %w[postgresql oracle].include?(@env_db)
+        if ['postgresql','oracle'].include?(@env_db)
           new_alias = Arel.shorten('azerty' * 15)
           at = User.arel_table.alias('azerty' * 15)
           assert_equal "\"user_tests\" \"#{new_alias}\"".downcase, User.arel_table.alias('azerty' * 15).to_sql.downcase
           assert_equal '"user_tests" "u"'.downcase, User.arel_table.alias('u').to_sql.downcase
-          assert_equal %Q[SELECT "#{new_alias}"."id" FROM "user_tests" "#{new_alias}"].downcase,
-                       User.select(at[:id]).from(at).to_sql.downcase
+          assert_equal  %Q[SELECT "#{new_alias}"."id" FROM "user_tests" "#{new_alias}"].downcase,
+                User.select(at[:id]).from(at).to_sql.downcase
         end
       end
 
       def test_stat_functions
         skip "SQLite doesn't work for most on this functions" if $sqlite
-        # puts t(User.where(nil), @score.average)
-        # puts t(User.where(nil), @score.variance(unbiased: true))
-        # puts t(User.where(nil), @score.variance(unbiased: false))
-        # puts t(User.where(nil), @score.std(unbiased: true))
-        # puts t(User.where(nil), @score.std(unbiased: false))
-
-        assert ( 15.43222 - t(User.where(nil), @score.average)).abs < 0.01
-        assert (539.79804 - t(User.where(nil), @score.variance)).abs < 0.01
-        assert (479.82048 - t(User.where(nil), @score.variance(unbiased: false))).abs < 0.01
-        assert ( 23.23355 - t(User.where(nil), @score.std)).abs < 0.01
-        assert ( 21.90480 - t(User.where(nil), @score.std(unbiased: false))).abs < 0.01
-        skip 'Not Yet Implemented' # if !['postgresql'].include?(@env_db)
-        assert_equal 2, User.select(@score.std(group: Arel.when(@name > 'M').then(0).else(1)).as('res')).map{|e| e['res']}.uniq.length
-        assert_equal 2, User.select(@score.variance(group: Arel.when(@name > 'M').then(0).else(1)).as('res')).map{|e| e['res']}.uniq.length
-        assert_equal 2, User.select(@score.sum(group: Arel.when(@name > 'M').then(0).else(1)).as('res')).map{|e| e['res']}.uniq.length
-        assert_equal 2, User.select(@comments.group_concat(group: Arel.when(@name > 'M').then(0).else(1)).as('res')).map{|e| e['res']}.uniq.length
+        #puts t(User.where(nil), @score.average)
+        #puts t(User.where(nil), @score.variance(true))
+        #puts t(User.where(nil), @score.variance(false))
+        #puts t(User.where(nil), @score.std(true))
+        #puts t(User.where(nil), @score.std(false))
+
+        assert ( 15.98625 - t(User.where(nil), @score.average)).abs < 0.01
+        assert (613.75488 - t(User.where(nil), @score.variance)).abs < 0.01
+        assert ( 537.0355 - t(User.where(nil), @score.variance(false))).abs < 0.01
+        assert ( 24.77408 - t(User.where(nil), @score.std)).abs < 0.01
+        assert ( 23.17403 - t(User.where(nil), @score.std(false))).abs < 0.01
       end
 
       def test_levenshtein_distance
-        skip 'Not Yet Implemented' if $sqlite
-        assert_equal 0,  t(@arthur, @name.levenshtein_distance('Arthur'))
-        assert_equal 2,  t(@arthur, @name.levenshtein_distance('Artoor'))
-        assert_equal 1,  t(@arthur, @name.levenshtein_distance('Artehur'))
+        skip "Not Yet Implemented" if $sqlite
+        assert_equal 0,  t(@arthur,@name.levenshtein_distance("Arthur"))
+        assert_equal 2,  t(@arthur,@name.levenshtein_distance("Artoor"))
+        assert_equal 1,  t(@arthur,@name.levenshtein_distance("Artehur"))
       end
 
       def test_json
         skip "Can't be tested on travis"
-        # creation
-        assert_equal 'Arthur', t(@arthur, Arel.json(@name))
-        assert_equal %w[Arthur Arthur], parse_json(t(@arthur, Arel.json(@name, @name)))
-        assert_equal ({'Arthur' => 'Arthur', 'Arthur2' => 'ArthurArthur'}), parse_json(t(@arthur, Arel.json({@name => @name, @name + '2' => @name + @name})))
-        assert_equal ({'Arthur' => 'Arthur', 'Arthur2' => 1}), parse_json(t(@arthur, Arel.json({@name => @name, @name + '2' => 1})))
-        assert_equal [{'age' => 21}, {'name' => 'Arthur', 'score' => 65.62}], parse_json(t(@arthur, Arel.json([{age: @age}, {name: @name, score: @score}])))
+        #creation
+        assert_equal 'Arthur', t(@arthur,Arel.json(@name))
+        assert_equal ["Arthur","Arthur"], parse_json(t(@arthur,Arel.json(@name,@name)))
+        assert_equal ({"Arthur" => "Arthur", "Arthur2" => "ArthurArthur"}), parse_json(t(@arthur,Arel.json({@name => @name,@name+"2" => @name+@name})))
+        assert_equal ({"Arthur" => "Arthur","Arthur2" => 1}), parse_json(t(@arthur,Arel.json({@name => @name,@name+"2" => 1})))
+        assert_equal ([{"age" => 21},{"name" => "Arthur","score" => 65.62}]), parse_json(t(@arthur,Arel.json([{age: @age},{name: @name,score: @score}])))
 
         # aggregate
-        assert_equal ({'5' => 'Lucas', '15' => 'Sophie', '23' => 'Myung', '25' => 'Laure'}),
-                     parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16), Arel.json({@age => @name}).group(false)))
-        assert_equal ({'5' => 'Lucas', '15' => 'Sophie', '23' => 'Myung', '25' => 'Laure', 'Laure' => 25, 'Lucas' => 5, 'Myung' => 23, 'Sophie' => 15}),
-                     parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16), Arel.json({@age => @name, @name => @age}).group(false)))
-        assert_equal [{'5' => 'Lucas'}, {'15' => 'Sophie'}, {'23' => 'Myung'}, {'25' => 'Laure'}],
-                     parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16).select(@score), Arel.json({@age => @name}).group(true, [@age])))
-
-        # puts User.group(:score).where(@age.is_not_null).where(@score == 20.16).select(@score, Arel.json({@age => @name}).group(true,[@age])).to_sql
-        # puts User.group(:score).where(@age.is_not_null).where(@score == 20.16).select(@score, Arel.json({@age => @name}).group(true,[@age])).to_a
-
-        skip 'Not Yet Implemented' if $sqlite || %w[oracle mssql].include?(@env_db)
-        # get
-        h1 = Arel.json({@name => @name + @name, @name + '2' => 1})
-        assert_equal 'ArthurArthur', parse_json(t(@arthur, h1.get(@name)))
-        h2 = Arel.json([{age: @age}, {name: @name, score: @score}])
-        assert_equal ({'age' => 21}), parse_json(t(@arthur, h2.get(0)))
-        assert_equal 21, parse_json(t(@arthur, h2.get(0).get('age')))
-        assert_nil t(@arthur, h2.get('age'))
-        # set
-        assert_equal ({'Arthur' => %w[toto tata], 'Arthur2' => 1}), parse_json(t(@arthur, h1.set(@name, %w[toto tata])))
-        assert_equal ({'Arthur' => 'ArthurArthur', 'Arthur2' => 1, 'Arthur3' => 2}), parse_json(t(@arthur, h1.set(@name + '3', 2)))
-        assert_equal ({'Arthur' => 'ArthurArthur', 'Arthur2' => 1, 'Arthur3' => nil}), parse_json(t(@arthur, h1.set(@name + '3', nil)))
-        assert_equal ({'Arthur' => 'ArthurArthur', 'Arthur2' => 1, 'Arthur3' => {'a' => 2}}), parse_json(t(@arthur, h1.set(@name + '3', {a: 2})))
-        # merge
-        assert_equal ({'Arthur' => %w[toto tata], 'Arthur2' => 1, 'Arthur3' => 2}), parse_json(t(@arthur, h1.merge({@name => %w[toto tata]}, {@name + '3' => 2})))
-        assert_equal ({'Arthur' => %w[toto tata], 'Arthur2' => 1, 'Arthur3' => 2}), parse_json(t(@arthur, h1.merge({@name => %w[toto tata], @name + '3' => 2})))
-        assert_equal ({'Arthur' => 'ArthurArthur', 'Arthur2' => 1}), parse_json(t(@arthur, h1.merge({})))
+        assert_equal ({"5" => "Lucas", "15" => "Sophie", "23" => "Myung", "25" => "Laure"}),
+              parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16),Arel.json({@age => @name}).group(false)))
+        assert_equal ({"5" => "Lucas", "15" => "Sophie", "23" => "Myung", "25" => "Laure", "Laure"=>25, "Lucas"=>5, "Myung"=>23, "Sophie"=>15}),
+              parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16),Arel.json({@age => @name,@name => @age}).group(false)))
+        assert_equal ([{"5" => "Lucas"},{ "15" => "Sophie"},{ "23" => "Myung"},{ "25" => "Laure"}]),
+              parse_json(t(User.group(:score).where(@age.is_not_null).where(@score == 20.16).select(@score),Arel.json({@age => @name}).group(true,[@age])))
+
+        #puts User.group(:score).where(@age.is_not_null).where(@score == 20.16).select(@score,Arel.json({@age => @name}).group(true,[@age])).to_sql
+        #puts User.group(:score).where(@age.is_not_null).where(@score == 20.16).select(@score,Arel.json({@age => @name}).group(true,[@age])).to_a
+
+        skip "Not Yet Implemented" if $sqlite || ['oracle','mssql'].include?(@env_db)
+        #get
+        h1 = Arel.json({@name => @name+@name,@name+"2" => 1})
+        assert_equal "ArthurArthur", parse_json(t(@arthur,h1.get(@name)))
+        h2 = Arel.json([{age: @age},{name: @name,score: @score}])
+        assert_equal ({"age" => 21}), parse_json(t(@arthur,h2.get(0)))
+        assert_equal 21, parse_json(t(@arthur,h2.get(0).get('age')))
+        assert_nil t(@arthur,h2.get('age'))
+        #set
+        assert_equal ({"Arthur" => ["toto", "tata"], "Arthur2" => 1}), parse_json(t(@arthur,h1.set(@name, ['toto','tata'])))
+        assert_equal ({"Arthur" => "ArthurArthur", "Arthur2" => 1, "Arthur3" => 2}), parse_json(t(@arthur,h1.set(@name+"3",2)))
+        assert_equal ({"Arthur" => "ArthurArthur", "Arthur2" => 1, "Arthur3" => nil}), parse_json(t(@arthur,h1.set(@name+"3",nil)))
+        assert_equal ({"Arthur" => "ArthurArthur", "Arthur2" => 1, "Arthur3" => {"a" => 2}}), parse_json(t(@arthur,h1.set(@name+"3",{a: 2})))
+        #merge
+        assert_equal ({"Arthur" => ["toto", "tata"], "Arthur2" => 1, "Arthur3" => 2}), parse_json(t(@arthur,h1.merge({@name => ['toto','tata']},{@name+"3" => 2})))
+        assert_equal ({"Arthur" => ["toto", "tata"], "Arthur2" => 1, "Arthur3" => 2}), parse_json(t(@arthur,h1.merge({@name => ['toto','tata'], @name+"3" => 2})))
+        assert_equal ({"Arthur" => "ArthurArthur","Arthur2" => 1}), parse_json(t(@arthur,h1.merge({})))
       end
 
       def test_as_on_everything
         name = @arthur.select(@name.as('NaMe')).first.attributes
-        assert_equal 'Arthur', name['NaMe'] || name['name'] # because of Oracle
-        assert_equal 'Arthur', @arthur.select(@name.as('Na Me')).first.attributes['Na Me']
-        assert_equal 'ArthurArthur', @arthur.select((@name + @name).as('Na-Me')).first.attributes['Na-Me']
+        assert_equal 'Arthur', name["NaMe"] || name["name"] #because of Oracle
+        assert_equal 'Arthur', @arthur.select(@name.as('Na Me')).first.attributes["Na Me"]
+        assert_equal 'ArthurArthur', @arthur.select((@name+@name).as('Na-Me')).first.attributes["Na-Me"]
       end
 
-      def test_exists_in_subquery
-        assert User.where(User.where(nil).arel.exists).first
-      end
     end
   end
 end