arel_extensions 2.3.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ba7863a47f7cce39fc8c67a9961b283049c67290579174abeebe9627ff91fd
-  data.tar.gz: 45a5857221ba52b473a41d90095bd99bc30f4408ac5088b2e9b2abdbf5905681
+  metadata.gz: 2117a2b819da1a1699428d490c507dbd426fae75cfe135c07dc77dd92889fe64
+  data.tar.gz: c822dbd22779954cccd01a0915c2ccd88340d7dca8e44fc4883036268f154947
 SHA512:
-  metadata.gz: df6101b959517997535c23e48b15338ecb709b78517cec71e78e5cf7ec52bc0862af5ed855bc041e24c6a3e2bcee2ba2cbf4fdcad10cb1035f68996991faa930
-  data.tar.gz: f30130c1d0d2e58bda2790988762118f36a025e9bc888bf759cb0846db66ea7fa91850d707cc997c66632a59ab2939de86ca568624e74d7e39766cdbab5bf5e2
+  metadata.gz: a003802df5fa1bf4ed39562f679deeb3675f9771d14693a740a0374631e311a7ba25d6418f8161b1042e413ab7a71b3b283757b20d903ba0061734d12a14481c
+  data.tar.gz: 413005a75a63ff2a6e6c72e75ccff060b2c6d3698725a561541b3b981400a48f1840fb1d762f02fd07b453df2107acbefe465a75e5e07c4503d458d444381e8f

data/.github/workflows/publish.yml

@@ -1,7 +1,8 @@
-name: "Publish Gems"
+name: rubygems.org
 on:
   release:
     types: [published]
+  workflow_dispatch:
 
 jobs:
   publish_gems:

data/.github/workflows/ruby.yml

@@ -2,6 +2,10 @@ name: Build and Test
 
 # Ruby + Rails Compatibility Matrix from here:
 # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+#
+# Images are fixed to ubuntu 22.04 because jruby-9.2 is unavailable in
+# ubuntu-24.04 (ubuntu-latest when I tested). Also, for rails < 6, sqlite3
+# will not build because libsqlite3-dev is missing.
 
 on:
   push:
@@ -14,7 +18,7 @@ on:
 jobs:
   job_test_to_sql:
     name: test to_sql
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -78,7 +82,7 @@ jobs:
 
   job_test_sqlite:
     name: test sqlite
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -143,7 +147,7 @@ jobs:
 
   job_test_postgres:
     name: test postgres
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -232,7 +236,7 @@ jobs:
 
   job_test_mysql:
     name: test mysql
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -316,7 +320,7 @@ jobs:
 
   job_test_mssql:
     name: test mssql on linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -352,8 +356,8 @@ jobs:
             # {ruby: jruby-9.3,   rails: 6_1, arelx: 2},
             # {ruby: jruby-9.3,   rails: 6,   arelx: 2},
             # {ruby: jruby-9.3,   rails: 5_2, arelx: 1},
-            { ruby: jruby-9.4, rails: 7_1, arelx: 2 },
-            { ruby: jruby-9.4, rails: 7, arelx: 2 },
+            { ruby: jruby-9.4.10, rails: 7_1, arelx: 2 }, # The reason we pin to the patch level is https://github.com/ruby/psych/issues/700
+            { ruby: jruby-9.4.10, rails: 7, arelx: 2 },
             #
             # 6 and 6.1 don't work because of a bug in the alt adapter
             # https://github.com/JesseChavez/activerecord-jdbc-adapter/issues/16

data/NEWS.md

@@ -2,6 +2,16 @@
 
 ## [unreleased]
 
+## Release v2.3.3/v1.5.3 (11-02-2025)
+
+- Fix the `&` operator which does `find_in_set` for mysql and postgres, accepting strings and integers.
+- Add `regex_matches`, an alias for `=~`.
+
+## Release v2.3.2/v1.5.2 (02-01-2025)
+
+- Fix a subtle bug on table access as in `table[:col]` in certain situations.
+- `==` and `!=` deprecation warnings can stem from `arel` itself, so now we don't emit them because they're plain wrong.
+
 ## Release v2.3.1/v1.5.1 (20-12-2024)
 
 - Fallback to Ruby's Warning module if ActiveSupport doesn't exist. Relevant for old Rails versions.

data/gemfiles/rails6.gemfile

@@ -5,6 +5,7 @@ gem 'rails', '~> 6.0.0'
 group :development, :test do
   gem 'ruby-lsp', platforms: %i[mri]
   gem 'debug', platforms: %i[mri]
+  gem 'concurrent-ruby', '1.3.4' # Need to pin b/c of a known issue https://github.com/rails/rails/issues/54260
 
   gem 'activesupport', '~> 6.0.0'
   gem 'activemodel', '~> 6.0.0'

data/gemfiles/rails6_1.gemfile

@@ -5,6 +5,7 @@ gem 'rails', '~> 6.1.0'
 group :development, :test do
   gem 'ruby-lsp', platforms: %i[mri]
   gem 'debug', platforms: %i[mri]
+  gem 'concurrent-ruby', '1.3.4' # Need to pin b/c of a known issue https://github.com/rails/rails/issues/54260
 
   gem 'activesupport', '~> 6.1.0'
   gem 'activemodel', '~> 6.1.0'

data/gemfiles/rails7.gemfile

@@ -5,6 +5,7 @@ gem 'rails', '~> 7.0.1'
 group :development, :test do
   gem 'ruby-lsp', platforms: %i[mri]
   gem 'debug', platforms: %i[mri]
+  gem 'concurrent-ruby', '1.3.4' # Need to pin b/c of a known issue https://github.com/rails/rails/issues/54260
 
   gem 'activesupport', '~> 7.0.1'
   gem 'activemodel', '~> 7.0.1'

data/gemfiles/rails7_1.gemfile

@@ -22,7 +22,6 @@ group :development, :test do
   gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'jar-dependencies', '0.4.1', platforms: :jruby
   gem 'jdbc-mssql', platforms: :jruby, require: true
   gem 'jdbc-sqlite3', platform: :jruby
   gem 'activerecord-jdbc-alt-adapter', '~> 71.0.0.alpha1', platform: :jruby, require: true

data/init/postgresql.sql

@@ -1,18 +1,17 @@
-CREATE OR REPLACE FUNCTION public.find_in_set(n INTEGER, s TEXT)
+CREATE OR REPLACE FUNCTION public.find_in_set(n TEXT, s TEXT)
  RETURNS INT4
  LANGUAGE sql
 AS $function$
     SELECT * FROM (
       select int4(z.row_number) from (
         select row_number() over(), y.x
-        from (select unnest(('{' || $2 || '}')::int[]) as x) as y
+        from (select unnest(regexp_split_to_array($2, ',')) as x) as y -- use string_to_array if on pg 14+.
       ) as z
       where z.x = $1
     UNION ALL
       SELECT 0) z
     LIMIT 1
-$function$
-;
+$function$;
 
 CREATE OR REPLACE FUNCTION public.levenshtein_distance(s text, t text)
 RETURNS integer AS $$

data/lib/arel_extensions/comparators.rb

@@ -25,6 +25,8 @@ module ArelExtensions
       #      end
     end
 
+    alias regex_matches =~
+
     # NOT_REGEXP function
     # Negation of Regexp
     def !~(other)

data/lib/arel_extensions/string_functions.rb

@@ -21,7 +21,10 @@ module ArelExtensions
   module StringFunctions
     # *FindInSet function .......
     def &(other)
-      ArelExtensions::Nodes::FindInSet.new [other, self]
+      ArelExtensions::Nodes::FindInSet.new [
+        Arel.quoted(other.is_a?(Integer) ? other.to_s : other),
+        self,
+      ]
     end
 
     # LENGTH function returns the length (bytewise) of the value in a text field.
@@ -47,14 +50,27 @@ module ArelExtensions
       ArelExtensions::Nodes::Substring.new [self, start, len]
     end
 
-    def [](start, ind = nil)
-      start += 1 if start.is_a?(Integer)
-      if start.is_a?(Range)
+    # Return a [ArelExtensions::Nodes::Substring] if `start` is a [Range] or an
+    # [Integer].
+    #
+    # Return the result to `self.send(start)` if it's a [String|Symbol]. The
+    # assumption is that you're trying to reach an [Arel::Table]'s
+    # [Arel::Attribute].
+    #
+    # @note `ind` should be an [Integer|NilClass] if `start` is an [Integer].
+    #   It's ignored in all other cases.
+    def [](start, end_ = nil)
+      if start.is_a?(String) || start.is_a?(Symbol)
+        self.send(start)
+      elsif start.is_a?(Range)
         ArelExtensions::Nodes::Substring.new [self, start.begin + 1, start.end - start.begin + 1]
-      elsif start.is_a?(Integer) && !ind
-        ArelExtensions::Nodes::Substring.new [self, start, 1]
+      elsif start.is_a?(Integer) && !end_
+        ArelExtensions::Nodes::Substring.new [self, start + 1, 1]
+      elsif start.is_a?(Integer)
+        start += 1
+        ArelExtensions::Nodes::Substring.new [self, start, end_ - start + 1]
       else
-        ArelExtensions::Nodes::Substring.new [self, start, ind - start + 1]
+        raise ArgumentError, 'unrecognized argument types; can accept integers, ranges, or strings.'
       end
     end
 

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.3.3'.freeze
 end

data/lib/arel_extensions/warning.rb

@@ -33,7 +33,7 @@ module ArelExtensions
   module Warning
     def deprecated msg, what: nil
       kaller = caller(2..2).first
-      return if kaller.include?('lib/arel_extensions') && ENV['AREL_EXTENSIONS_IN_TEST'] != '1'
+      return if /lib\/(:?arel(?:_extensions)?|active_record)\// =~ kaller && ENV['AREL_EXTENSIONS_IN_TEST'] != '1'
 
       what = caller_locations(1, 1).first.label if what.nil?
       ArelExtensions.deprecator.warn "#{kaller}: `#{what}` is now deprecated. #{msg}"

data/test/visitors/test_to_sql.rb

@@ -115,7 +115,7 @@ module ArelExtensions
         # puts (c.length.round + 42).inspect
         _(compile(c.length.round + 42)).must_be_like %{(ROUND(LENGTH("users"."name")) + 42)}
         _(compile(c.locate('test'))).must_be_like %{LOCATE('test', "users"."name")}
-        _(compile(c & 42)).must_be_like %{FIND_IN_SET(42, "users"."name")}
+        _(compile(c & 42)).must_be_like %{FIND_IN_SET('42', "users"."name")}
 
         _(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"}

data/test/with_ar/all_agnostic_test.rb

@@ -68,7 +68,7 @@ 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)
@@ -297,6 +297,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
@@ -343,6 +346,13 @@ module ArelExtensions
         assert_equal 8, 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

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.3'.freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.3.3'.freeze
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3
 platform: ruby
 authors:
 - Yann Azoury
 - Félix Bellanger
 - Julien Delporte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -204,7 +204,7 @@ homepage: https://github.com/Faveod/arel-extensions
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.19
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Extending Arel
 test_files: []