arel_extensions 2.0.1 → 2.0.4

data/test/visitors/test_oracle.rb

@@ -50,6 +50,7 @@ module ArelExtensions
         compile((c >= 'test').as('new_name')).must_be_like %{("users"."name" >= 'test') AS new_name}
         compile(c <= @table[:comments]).must_be_like %{"users"."name" <= "users"."comments"}
         compile(c =~ /\Atest\Z/).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
+        compile(c =~ /\Atest\z/).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
         compile(c =~ '^test$').must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
         compile(c !~ /\Ate\Dst\Z/).must_be_like %{NOT REGEXP_LIKE("users"."name", '^te[^0-9]st$')}
         compile(c.imatches('%test%')).must_be_like %{LOWER("users"."name") LIKE LOWER('%test%')}

data/test/visitors/test_to_sql.rb

@@ -88,6 +88,7 @@ module ArelExtensions
         compile((c >= 'test').as('new_name')).must_be_like %{("users"."name" >= 'test') AS new_name}
         compile(c <= @table[:comments]).must_be_like %{"users"."name" <= "users"."comments"}
         compile(c =~ /\Atest\Z/).must_be_like %{"users"."name" REGEXP '^test$'}
+        compile(c =~ /\Atest\z/).must_be_like %{"users"."name" REGEXP '^test$'}
         compile(c !~ /\Ate\Dst\Z/).must_be_like %{"users"."name" NOT REGEXP '^te[^0-9]st$'}
         compile(c.imatches('%test%')).must_be_like %{"users"."name" ILIKE '%test%'}
         compile(c.imatches_any(['%test%', 't2'])).must_be_like %{(("users"."name" ILIKE '%test%') OR ("users"."name" ILIKE 't2'))}
@@ -120,6 +121,10 @@ module ArelExtensions
         compile(@table[:id] < 42).must_match %{"users"."id" < 42}
         compile(@table[:id] <= 42).must_match %{"users"."id" <= 42}
         compile((@table[:id] <= 42).as('new_name')).must_match %{("users"."id" <= 42) AS new_name}
+        compile(@table[:id].count.eq 42).must_match %{COUNT("users"."id") = 42}
+        #compile(@table[:id].count == 42).must_match %{COUNT("users"."id") = 42} # TODO
+        #compile(@table[:id].count != 42).must_match %{COUNT("users"."id") != 42}
+        #compile(@table[:id].count >= 42).must_match %{COUNT("users"."id") >= 42}
       end
 
       it "should accept comparators on dates" do
@@ -328,9 +333,11 @@ module ArelExtensions
         compile(@table[:id].in(1))
           .must_be_like %{"users"."id" IN (1)}
         compile(@table[:id].in([1]))
-          .must_be_like %{"users"."id" IN (1)}
+          .must_be_like %{"users"."id" = 1}
         compile(@table[:id].in([1,2]))
           .must_be_like %{"users"."id" IN (1, 2)}
+        compile(@table[:id].in([]))
+          .must_be_like %{ISNULL("users"."id")}
       end
 
       it "should be possible to correctly use a Range on an IN" do
@@ -340,6 +347,13 @@ module ArelExtensions
           .must_be_like %{"users"."created_at" BETWEEN ('2016-03-31') AND ('2017-03-31')}
       end
 
+      it "should be possible to use a list of values and ranges on an IN" do
+        compile(@table[:id].in [1..10, 20, 30, 40..50])
+          .must_be_like %{(("users"."id" IN (20, 30)) OR ("users"."id" BETWEEN (1) AND (10))) OR ("users"."id" BETWEEN (40) AND (50))}
+#        compile(@table[:created_at].in(@date .. Date.new(2017, 3, 31))) # @date = Date.new(2016, 3, 31)
+#          .must_be_like %{"users"."created_at" BETWEEN ('2016-03-31') AND ('2017-03-31')}
+      end
+
       it "should be possible to add and substract as much as we want" do
         c = @table[:name]
         compile(c.locate('test')+1)

data/test/with_ar/all_agnostic_test.rb

@@ -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
 
@@ -175,6 +179,7 @@ module ArelExtensions
         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))
+        assert_equal "Lucas,Sophie,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',order: [@score.asc,@name.asc]))
       end
 
       def test_length
@@ -267,21 +272,27 @@ 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'
+        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
@@ -294,8 +305,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
@@ -374,13 +385,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
@@ -389,10 +400,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
@@ -424,6 +435,7 @@ module ArelExtensions
           end
         end
 
+
         skip "not yet implemented" if $sqlite
 
         date1 = Date.new(2016, 5, 23)
@@ -525,7 +537,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
@@ -643,8 +655,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
@@ -726,16 +738,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(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
+        #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(&: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
       end
 
       def test_levenshtein_distance
@@ -791,6 +808,11 @@ module ArelExtensions
         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

data/test/with_ar/insert_agnostic_test.rb

@@ -23,7 +23,7 @@ module ArelExtensions
             @cnx.execute(sql) rescue $stderr << "can't create functions\n"
           end
         end
-        @cnx.drop_table(:user_tests) rescue nil 
+        @cnx.drop_table(:user_tests) rescue nil
         @cnx.create_table :user_tests do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -77,6 +77,7 @@ END;])
         insert_manager.bulk_insert(@cols2, @data2)
         @cnx.execute(insert_manager.to_sql)
         assert_equal 4, User.count, "insertions failed"
+
       end
 
     end

data/test/with_ar/test_bulk_sqlite.rb

@@ -12,7 +12,7 @@ module ArelExtensions
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil 
+        @cnx.drop_table(:products) rescue nil
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -45,4 +45,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/test/with_ar/test_math_sqlite.rb

@@ -11,8 +11,8 @@ module ArelExtensions
         ActiveRecord::Base.default_timezone = :utc
         Arel::Table.engine = ActiveRecord::Base
         @cnx = ActiveRecord::Base.connection
-        @cnx.drop_table(:users) rescue nil 
-        @cnx.drop_table(:products) rescue nil 
+        @cnx.drop_table(:users) rescue nil
+        @cnx.drop_table(:products) rescue nil
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -61,4 +61,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/test/with_ar/test_string_mysql.rb

@@ -10,7 +10,7 @@ module ArelExtensions
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-mysql" : :mysql))
         ActiveRecord::Base.default_timezone = :utc
-        begin 
+        begin
           @cnx = ActiveRecord::Base.connection
         rescue => e
           puts "\n#{e.inspect}"
@@ -19,7 +19,7 @@ module ArelExtensions
         end
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil 
+        @cnx.drop_table(:products) rescue nil
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -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

@@ -12,7 +12,7 @@ module ArelExtensions
         ActiveRecord::Base.default_timezone = :utc
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
-        @cnx.drop_table(:users) rescue nil 
+        @cnx.drop_table(:users) rescue nil
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -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.8".freeze
+end

data/version_v2.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -120,6 +123,7 @@ files:
 - lib/arel_extensions/math_functions.rb
 - lib/arel_extensions/nodes.rb
 - lib/arel_extensions/nodes/abs.rb
+- lib/arel_extensions/nodes/aggregate_function.rb
 - lib/arel_extensions/nodes/blank.rb
 - lib/arel_extensions/nodes/case.rb
 - lib/arel_extensions/nodes/cast.rb
@@ -151,6 +155,7 @@ files:
 - lib/arel_extensions/nodes/soundex.rb
 - lib/arel_extensions/nodes/std.rb
 - lib/arel_extensions/nodes/substring.rb
+- lib/arel_extensions/nodes/sum.rb
 - lib/arel_extensions/nodes/then.rb
 - lib/arel_extensions/nodes/trim.rb
 - lib/arel_extensions/nodes/union.rb
@@ -190,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