arel_extensions 2.3.2 → 2.4.0

data/test/with_ar/all_agnostic_test.rb

@@ -1,11 +1,27 @@
 require 'arelx_test_helper'
 require 'date'
 
+# class ActiveRecord::ConnectionAdapters::SQLServerAdapter
+#   # We use *args to avoid breaking signature changes between versions.
+#   # internal_exec_sql_query(sql, name = "SQL", binds = [], prepare: false)
+#   def internal_exec_sql_query(*args)
+#     sql = args.first
+#     puts "[DEBUG] MSSQL Query: #{sql}\n"
+
+#     # Call original implementation (defined in the DatabaseStatements module included in this class)
+#     super
+#   rescue => e
+#     # Catch the crash to print the specific query that caused it one last time
+#     puts "[CRASH]: #{args.first}\n"
+#     raise e
+#   end
+# end
+
 module ArelExtensions
   module WithAr
     class ListTest < Minitest::Test
       def connect_db
-        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+        ActiveRecord::Base.configurations = ConfigLoader.load('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})"
@@ -13,7 +29,7 @@ module ArelExtensions
           @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
+        if ACTIVE_RECORD_VERSION >= V7_0
           ActiveRecord.default_timezone = :utc
         else
           ActiveRecord::Base.default_timezone = :utc
@@ -68,13 +84,20 @@ module ArelExtensions
         @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
+        u = User.create age: -42, name: 'Negatif', comments: '1,22,3,42,2', created_at: d, updated_at: d.to_time, score: 0.17, other: '2'
         @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: nil, name: 'esmé', created_at: nil, score: nil
+        @esme = User.where(id: u.id)
+        u = User.create age: nil, name: 'esmé ', created_at: nil, score: nil
+        @esme2 = User.where(id: u.id)
+        u = User.create age: nil, name: nil, created_at: nil, score: nil
+        @all_nil = User.where(id: u.id)
+
+        @id = User.arel_table[:id]
         @age = User.arel_table[:age]
         @name = User.arel_table[:name]
         @score = User.arel_table[:score]
@@ -96,7 +119,9 @@ module ArelExtensions
       end
 
       def t(scope, node)
-        scope.select(node.as('res')).to_a.first.res
+        res = scope.select(node.as('res'))
+        # puts "[scope] #{res.to_sql}"
+        res.to_a.first.res
       end
 
       # manage the difference between adapters that handle or not json type
@@ -150,7 +175,7 @@ module ArelExtensions
       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 13, User.order(Arel.rand).limit(50).count
       end
 
       def test_round
@@ -253,6 +278,20 @@ module ArelExtensions
         assert_equal 7, t(@camille, @name.length)
         assert_equal 7, t(@camille, @name.length.round.abs)
         assert_equal 42, t(@laure, @name.length + 37)
+
+        if @env_db == 'mssql'
+          # By default it's UTF-16, and configuring the CI to be UTF-8 is a bit of a hassle.
+          assert_equal 4, t(@esme, @name.byte_size)
+          assert_equal 5, t(@esme2, @name.byte_size)
+        else
+          assert_equal 5, t(@esme, @name.byte_size)
+          assert_equal 6, t(@esme2, @name.byte_size)
+        end
+        assert_equal 0, t(@all_nil, @name.byte_size)
+
+        assert_equal 4, t(@esme, @name.char_length)
+        assert_equal 5, t(@esme2, @name.char_length)
+        assert_equal 0, t(@all_nil, @name.char_length)
       end
 
       def test_md5
@@ -297,6 +336,9 @@ module ArelExtensions
         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
+        assert_equal 5, t(@neg, @comments & '2')
+        assert_equal 0, t(@neg, @comments & '6') # not found
+        assert_equal 5, t(@neg, @comments & @other)
       end
 
       def test_string_comparators
@@ -338,16 +380,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 8, User.where(@name !~ '^L').count
+        assert_equal 10, User.where(@name !~ '^L').count
         assert_equal 1, User.where(@name =~ /^M/).count
-        assert_equal 8, User.where(@name !~ /^L/).count
+        assert_equal 10, User.where(@name !~ /^L/).count
+      end
+
+      def test_regex_matches
+        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.regex_matches '^M').count
+        assert_equal 1, User.where(@name.regex_matches /^M/).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 8, User.where(@name.idoes_not_match('L%')).count
+        if @env_db == 'mysql'
+          assert_equal 5, User.where(@name.imatches_any(['L%', '%e'])).count
+        else
+          assert_equal 4, User.where(@name.imatches_any(['L%', '%e'])).count
+        end
+        assert_equal 10, User.where(@name.idoes_not_match('L%')).count
       end
 
       def test_replace
@@ -372,8 +425,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 10, User.where(@name.soundex.eq(@name.soundex)).count
-        assert_equal 10, User.where(@name.soundex == @name.soundex).count
+        assert_equal 12, User.where(@name.soundex.eq(@name.soundex)).count
+        assert_equal 12, User.where(@name.soundex == @name.soundex).count
       end
 
       def test_change_case
@@ -670,7 +723,7 @@ module ArelExtensions
       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 13, User.where(@created_at >= d).count
       end
 
       def test_date_duration
@@ -853,7 +906,7 @@ module ArelExtensions
       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 13, 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
@@ -972,10 +1025,15 @@ module ArelExtensions
       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
+        skip if @env_db == 'mssql' && Arel::VERSION.to_i < 10
+        assert_equal 12, User.where(name: User.select(:name).order(:name)).count
+        assert_equal 12, User.where(@ut[:name].in(@ut.project(@ut[:name]).order(@ut[:name]))).count
+
+        if %w[mssql sqlite].include? @env_db
+          # Sqlite and mssql are sensistive to the nil value in name, defined by @all_nil
+          assert_equal 1, User.where(name: User.select(:name).order(:name).limit(2)).count
+        elsif @env_db != 'mysql'
+          # 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

data/test/with_ar/insert_agnostic_test.rb

@@ -5,7 +5,7 @@ module ArelExtensions
   module WithAr
     class InsertManagerTest < Minitest::Test
       def connect_db
-        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+        ActiveRecord::Base.configurations = ConfigLoader.load('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})"
@@ -13,7 +13,7 @@ module ArelExtensions
           @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
+        if ACTIVE_RECORD_VERSION >= V7_0
           ActiveRecord.default_timezone = :utc
         else
           ActiveRecord::Base.default_timezone = :utc

data/test/with_ar/test_bulk_sqlite.rb

@@ -4,9 +4,9 @@ module ArelExtensions
   module WithAr
     describe 'the sqlite visitor' do
       before do
-        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ActiveRecord::VERSION::MAJOR >= 7
+        if ACTIVE_RECORD_VERSION >= V7_0
           ActiveRecord.default_timezone = :utc
         else
           ActiveRecord::Base.default_timezone = :utc

data/test/with_ar/test_math_sqlite.rb

@@ -4,9 +4,9 @@ module ArelExtensions
   module WithAr
     describe 'the sqlite visitor can do maths' do
       before do
-        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ActiveRecord::VERSION::MAJOR >= 7
+        if ACTIVE_RECORD_VERSION >= V7_0
           ActiveRecord.default_timezone = :utc
         else
           ActiveRecord::Base.default_timezone = :utc

data/test/with_ar/test_string_mysql.rb

@@ -5,9 +5,9 @@ module ArelExtensions
   module WithAr
     describe 'the mysql visitor can do string operations' do
       before do
-        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-mysql" : :mysql))
-        if ActiveRecord::VERSION::MAJOR >= 7
+        if ACTIVE_RECORD_VERSION >= V7_0
           ActiveRecord.default_timezone = :utc
         else
           ActiveRecord::Base.default_timezone = :utc

data/test/with_ar/test_string_sqlite.rb

@@ -5,9 +5,9 @@ module ArelExtensions
   module WithAr
     describe 'the sqlite visitor can do string operations' do
       before do
-        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ActiveRecord::VERSION::MAJOR >= 7
+        if ACTIVE_RECORD_VERSION >= V7_0
           ActiveRecord.default_timezone = :utc
         else
           ActiveRecord::Base.default_timezone = :utc

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.3.2'.freeze
+  VERSION = '2.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,6 +75,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE.txt
+- Makefile
 - NEWS.md
 - README.md
 - Rakefile
@@ -83,15 +84,12 @@ files:
 - appveyor.yml
 - arel_extensions.gemspec
 - bin/build
-- bin/compose
 - bin/publish
 - dev/arelx.dockerfile
 - dev/compose.yaml
 - dev/postgres.dockerfile
 - dev/rbenv
 - functions.html
-- gemfiles/rails3.gemfile
-- gemfiles/rails4_2.gemfile
 - gemfiles/rails5.gemfile
 - gemfiles/rails5_1_4.gemfile
 - gemfiles/rails5_2.gemfile
@@ -100,6 +98,8 @@ files:
 - gemfiles/rails7.gemfile
 - gemfiles/rails7_1.gemfile
 - gemfiles/rails7_2.gemfile
+- gemfiles/rails8.gemfile
+- gemfiles/rails8_1.gemfile
 - gemspecs/arel_extensions-v1.gemspec
 - gemspecs/arel_extensions-v2.gemspec
 - generate_gems.sh
@@ -114,6 +114,7 @@ files:
 - lib/arel_extensions/boolean_functions.rb
 - lib/arel_extensions/common_sql_functions.rb
 - lib/arel_extensions/comparators.rb
+- lib/arel_extensions/constants.rb
 - lib/arel_extensions/date_duration.rb
 - lib/arel_extensions/helpers.rb
 - lib/arel_extensions/insert_manager.rb
@@ -123,10 +124,12 @@ files:
 - lib/arel_extensions/nodes/abs.rb
 - lib/arel_extensions/nodes/aggregate_function.rb
 - lib/arel_extensions/nodes/blank.rb
+- lib/arel_extensions/nodes/byte_size.rb
 - lib/arel_extensions/nodes/case.rb
 - lib/arel_extensions/nodes/cast.rb
 - lib/arel_extensions/nodes/ceil.rb
 - lib/arel_extensions/nodes/change_case.rb
+- lib/arel_extensions/nodes/char_length.rb
 - lib/arel_extensions/nodes/coalesce.rb
 - lib/arel_extensions/nodes/collate.rb
 - lib/arel_extensions/nodes/concat.rb
@@ -181,6 +184,7 @@ files:
 - lib/arel_extensions/visitors/to_sql.rb
 - lib/arel_extensions/warning.rb
 - test/arelx_test_helper.rb
+- test/config_loader.rb
 - test/database.yml
 - test/real_db_test.rb
 - test/support/alter_system_user_password.sql

data/bin/compose

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-IFS=$'\n\t'
-set -euo pipefail
-
-docker compose -f dev/compose.yaml up --exit-code-from arelx

data/gemfiles/rails3.gemfile

@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'arel', '~> 3.0' # too old...
-
-group :development, :test do
-  gem 'sqlite3', '<= 1.3.13', platform: %i[ruby mswin mingw]
-  gem 'mysql2', '0.4.10', platform: %i[ruby mswin mingw]
-  gem 'activerecord-mysql2-adapter', platform: %i[ruby mswin mingw]
-  gem 'pg', platform: %i[ruby mswin mingw]
-  # for JRuby
-  gem 'jdbc-sqlite3', platform: :jruby
-  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-  gem 'activesupport', '~> 3.2'
-  gem 'activemodel', '~> 3.2'
-  gem 'activerecord', '~> 3.2'
-end
-
-gemspec path: Dir.pwd

data/gemfiles/rails4_2.gemfile

@@ -1,38 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'arel', '~> 6.0'
-
-group :development, :test do
-  # We need to explicitly include bigdecimal for ruby 2.7 .
-  # See https://github.com/ruby/bigdecimal for details.
-  rb_version = Gem::Version.new(RUBY_VERSION)
-  if Gem::Version.new('2.7') <= rb_version && rb_version < Gem::Version.new('2.8')
-     gem 'bigdecimal', '~> 1.3.5', platforms: %i[mri mingw x64_mingw mswin]
-  end
-
-  gem 'activesupport', '~> 4.0'
-  gem 'activemodel', '~> 4.0'
-  gem 'activerecord', '~> 4.0'
-
-  gem 'sqlite3', '<= 1.3.13', platforms: %i[mri mswin mingw]
-  gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
-  gem 'pg', '< 1.0.0', platforms: %i[mri mingw]
-
-  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 4.2.0', platforms: %i[mri mingw x64_mingw mswin]
-
-  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
-  gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
-
-  # for JRuby
-  gem 'activerecord-jdbc-adapter', '~> 1.3', platforms: :jruby
-  gem 'jdbc-sqlite3', '~> 3.28', platforms: :jruby
-  gem 'jdbc-postgres', '~> 42.2', platforms: :jruby
-  gem 'jdbc-mysql', '~> 5.1', platforms: :jruby
-  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
-  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
-  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
-  gem 'activerecord-jdbcmssql-adapter', platforms: :jruby
-end
-
-gemspec path: Dir.pwd