arel_extensions 1.2.5 → 1.2.15

data/test/with_ar/all_agnostic_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions
@@ -68,7 +68,8 @@ module ArelExtensions
         @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)
 
         @age = User.arel_table[:age]
         @name = User.arel_table[:name]
@@ -121,6 +122,7 @@ module ArelExtensions
         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
@@ -129,12 +131,14 @@ module ArelExtensions
         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 8, User.order(Arel.rand).limit(50).count
+        assert_equal 9, User.order(Arel.rand).limit(50).count
       end
 
       def test_round
@@ -147,15 +151,15 @@ module ArelExtensions
       def test_sum
         if @env_db == 'mssql'
           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
+          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
         else
-          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
+          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
         end
       end
 
@@ -268,21 +272,28 @@ module ArelExtensions
         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'
         assert_equal 1, User.where(@name =~ '^M').count
-        assert_equal 6, User.where(@name !~ '^L').count
+        assert_equal 7, User.where(@name !~ '^L').count
         assert_equal 1, User.where(@name =~ /^M/).count
-        assert_equal 6, User.where(@name !~ /^L/).count
+        assert_equal 7, User.where(@name !~ /^L/).count
       end
 
       def test_imatches
         #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 6, User.where(@name.idoes_not_match('L%')).count
+        assert_equal 7, 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"))
       end
 
       def test_replace_once
@@ -295,8 +306,8 @@ module ArelExtensions
         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 8, User.where(@name.soundex.eq(@name.soundex)).count
-        assert_equal 8, User.where(@name.soundex == @name.soundex).count
+        assert_equal 9, User.where(@name.soundex.eq(@name.soundex)).count
+        assert_equal 9  , User.where(@name.soundex == @name.soundex).count
       end
 
       def test_change_case
@@ -375,13 +386,13 @@ 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 1, User.where(@age > 5).where(@age < 20).count
+        assert_equal 2, 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 8, User.where(@created_at >= d).count
+        assert_equal 9, User.where(@created_at >= d).count
       end
 
       def test_date_duration
@@ -390,10 +401,10 @@ module ArelExtensions
         assert_equal 0, User.where(@created_at.year.eq("2012")).count
         #Month
         assert_equal 5, t(@camille, @created_at.month).to_i
-        assert_equal 8, User.where(@created_at.month.eq("05")).count
+        assert_equal 9, 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 8, User.where(@created_at.month.eq("05")).count
+        assert_equal 9, 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
@@ -425,6 +436,7 @@ module ArelExtensions
           end
         end
 
+
         skip "not yet implemented" if $sqlite
 
         date1 = Date.new(2016, 5, 23)
@@ -468,15 +480,17 @@ module ArelExtensions
       # 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 =~ /java/i
         if @env_db == 'mysql' || @env_db == 'postgresql' || @env_db == 'oracle' || @env_db == 'mssql'
-          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 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
@@ -526,7 +540,7 @@ module ArelExtensions
       def test_math_minus
         d = Date.new(2016, 5, 20)
         #Datediff
-        assert_equal 8, User.where((@created_at - @created_at).eq(0)).count
+        assert_equal 9, 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
@@ -567,6 +581,7 @@ 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")
@@ -644,8 +659,8 @@ module ArelExtensions
       end
 
       def test_subquery_with_order
-        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
+        assert_equal 9, User.where(:name => User.select(:name).order(:name)).count
+        assert_equal 9, 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
@@ -713,6 +728,13 @@ module ArelExtensions
         #assert_equal true  , @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
+      end
+
       def test_alias_shortened
         if ['postgresql','oracle'].include?(@env_db)
           new_alias = Arel.shorten('azerty' * 15)
@@ -727,21 +749,21 @@ module ArelExtensions
       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(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(unbiased: 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(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(&:res).uniq.length
-        assert_equal 2, User.select(@score.variance(group: Arel.when(@name > "M").then(0).else(1)).as('res')).map(&:res).uniq.length
-        assert_equal 2, User.select(@score.sum(group: Arel.when(@name > "M").then(0).else(1)).as('res')).map(&:res).uniq.length
-        assert_equal 2, User.select(@comments.group_concat(group: Arel.when(@name > "M").then(0).else(1)).as('res')).map(&:res).uniq.length
+        #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
       end
 
       def test_levenshtein_distance
@@ -798,7 +820,7 @@ module ArelExtensions
       end
 
       def test_exists_in_subquery
-        assert User.where(User.where(nil).exists).first
+        assert User.where(User.where(nil).arel.exists).first
       end
 
 

data/test/with_ar/insert_agnostic_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions

data/test/with_ar/test_bulk_sqlite.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 
 module ArelExtensions
   module WthAr
@@ -38,11 +38,12 @@ 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(ActiveRecord::Base).into(@table)
         insert_manager.bulk_insert(@cols, @data)
-        sql = insert_manager.to_sql
-        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']
+        _(insert_manager.to_sql)
+          .must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at")
+                         SELECT 23 AS 'id', 'nom1' AS 'name', 'sdfdsfdsfsdf' AS 'comments', '2016-01-01' AS 'created_at' UNION ALL SELECT 25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01']
       end
 
     end
 
   end
-end
+end

data/test/with_ar/test_math_sqlite.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 
 module ArelExtensions
   module WthAr
@@ -61,4 +61,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/test/with_ar/test_string_mysql.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions
@@ -67,11 +67,9 @@ module ArelExtensions
         # Replace
         assert_equal "LucaX", User.where(:id => @lucas).select(@name.replace("s","X").as("res")).first.res
         assert_equal "replace", User.where(:id => @lucas).select(@name.replace(@name,"replace").as("res")).first.res
-
-        #
       end
 
     end
 
   end
-end
+end

data/test/with_ar/test_string_sqlite.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'arelx_test_helper'
 require 'date'
 
 module ArelExtensions
@@ -57,16 +57,12 @@ module ArelExtensions
         assert_equal 1, User.where((User.arel_table[:age] + "1").eq(6)).count
         assert_equal 1, User.where((User.arel_table[:age] + User.arel_table[:age]).eq(10)).count
 
-
-
         # Replace
         assert_equal "LucaX", User.where(:id => @lucas).select(@name.replace("s","X").as("res")).first.res
         assert_equal "replace", User.where(:id => @lucas).select(@name.replace(@name,"replace").as("res")).first.res
-
-        #
       end
 
     end
 
   end
-end
+end

data/version_v1.rb

@@ -0,0 +1,3 @@
+module ArelExtensions
+  VERSION = "1.2.15".freeze
+end

data/version_v2.rb

@@ -0,0 +1,3 @@
+module ArelExtensions
+  VERSION = "2.0.11".freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.15
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: 12.3.3
 description: Adds new features to Arel
 email:
 - yann.azoury@faveod.com
@@ -104,6 +104,9 @@ files:
 - gemfiles/rails5_0.gemfile
 - gemfiles/rails5_1_4.gemfile
 - gemfiles/rails5_2.gemfile
+- gemfiles/rails6.gemfile
+- gemspec_v2/arel_extensions-v2.gemspec
+- generate_gems.sh
 - init/mssql.sql
 - init/mysql.sql
 - init/oracle.sql
@@ -174,8 +177,8 @@ files:
 - lib/arel_extensions/visitors/postgresql.rb
 - lib/arel_extensions/visitors/sqlite.rb
 - lib/arel_extensions/visitors/to_sql.rb
+- test/arelx_test_helper.rb
 - test/database.yml
-- test/helper.rb
 - test/real_db_test.rb
 - test/support/alter_system_user_password.sql
 - test/support/create_oracle_enhanced_users.sql
@@ -192,6 +195,8 @@ files:
 - test/with_ar/test_math_sqlite.rb
 - test/with_ar/test_string_mysql.rb
 - test/with_ar/test_string_sqlite.rb
+- version_v1.rb
+- version_v2.rb
 homepage: https://github.com/Faveod/arel-extensions
 licenses:
 - MIT

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'fileutils'
-require 'arel'
-require 'active_record'
-
-require 'arel_extensions'
-
-require 'support/fake_record'
-Arel::Table.engine = FakeRecord::Base.new
-
-$arel_silence_type_casting_deprecation = true
-
-class Object
-  def must_be_like other
-    gsub(/\s+/, ' ').strip.must_equal other.gsub(/\s+/, ' ').strip
-  end
-end