arel_extensions 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f586ca440095febfcae38a3b2d2b911069751db2cb4817f08edecb4561edc829
-  data.tar.gz: 8dca7e2bbbf5e14ebb54176cf1a73419765f1d4a0f2d2bf70593b9a4ee5d063d
+  metadata.gz: 4a3d245de4fca76ff0c5c0806b3b1ed04f47afd7bab31e104c9366870308b638
+  data.tar.gz: 95d67960f12cdd7f6bda282e6258d069276e2e24146c26e70b868e4828ed10ad
 SHA512:
-  metadata.gz: 7adc670c444b2bd553420c42f6cc8d5df2fed537fe252d99dd20dbb8603b89727472804b72842da5166670f0eb91b29918bd592de439c2d728f5586b229f54c1
-  data.tar.gz: 0bb2be5b50e1ed8afce7f17541305ab72206ae01ad15a07859c41f4b4e77683e8e42f7868673cb6e8abf53b9384e88af75fdc0f8d01ba9730b4973e67e73826c
+  metadata.gz: 4cdf102bc01abe1b41c19f129d86a28b8e8e43e702e9240a8aa286d9bcc71a04dba47965667f185379d1b69ee69490e40bd7dc3e7f1b974f5e95a2ce59424964
+  data.tar.gz: d93e6301b77655ac3ff34164f7f1794846d408be2751705b3cf467808a7919e31be6b5bb43a3996f61ddd89d97f681cb34793d93d98e1433c16a3dba96f7795b

data/.github/workflows/ruby.yml

@@ -13,12 +13,16 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
+          {ruby: '3.2',     rails: 7_1, arelx: 2},
           {ruby: '3.2',     rails: 7,   arelx: 2},
           {ruby: '3.2',     rails: 6_1, arelx: 2},
+          {ruby: '3.1',     rails: 7_1, arelx: 2},
           {ruby: '3.1',     rails: 7,   arelx: 2},
           {ruby: '3.1',     rails: 6_1, arelx: 2},
+          {ruby: '3.0',     rails: 7_1, arelx: 2},
           {ruby: '3.0',     rails: 7,   arelx: 2},
           {ruby: '3.0',     rails: 6_1, arelx: 2},
+          {ruby: '2.7',     rails: 7_1, arelx: 2},
           {ruby: '2.7',     rails: 7,   arelx: 2},
           {ruby: '2.7',     rails: 6_1, arelx: 2},
           {ruby: '2.7',     rails: 6,   arelx: 2},
@@ -68,12 +72,16 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
+          {ruby: '3.2',     rails: 7_1, arelx: 2},
           {ruby: '3.2',     rails: 7,   arelx: 2},
           {ruby: '3.2',     rails: 6_1, arelx: 2},
+          {ruby: '3.1',     rails: 7_1, arelx: 2},
           {ruby: '3.1',     rails: 7,   arelx: 2},
           {ruby: '3.1',     rails: 6_1, arelx: 2},
+          {ruby: '3.0',     rails: 7_1, arelx: 2},
           {ruby: '3.0',     rails: 7,   arelx: 2},
           {ruby: '3.0',     rails: 6_1, arelx: 2},
+          {ruby: '2.7',     rails: 7_1, arelx: 2},
           {ruby: '2.7',     rails: 7,   arelx: 2},
           {ruby: '2.7',     rails: 6_1, arelx: 2},
           {ruby: '2.7',     rails: 6,   arelx: 2},
@@ -124,12 +132,16 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
+          {ruby: '3.2',     rails: 7_1, arelx: 2},
           {ruby: '3.2',     rails: 7,   arelx: 2},
           {ruby: '3.2',     rails: 6_1, arelx: 2},
+          {ruby: '3.1',     rails: 7_1, arelx: 2},
           {ruby: '3.1',     rails: 7,   arelx: 2},
           {ruby: '3.1',     rails: 6_1, arelx: 2},
+          {ruby: '3.0',     rails: 7_1, arelx: 2},
           {ruby: '3.0',     rails: 7,   arelx: 2},
           {ruby: '3.0',     rails: 6_1, arelx: 2},
+          {ruby: '2.7',     rails: 7_1, arelx: 2},
           {ruby: '2.7',     rails: 7,   arelx: 2},
           {ruby: '2.7',     rails: 6_1, arelx: 2},
           {ruby: '2.7',     rails: 6,   arelx: 2},
@@ -205,12 +217,16 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
+          {ruby: '3.2',     rails: 7_1, arelx: 2},
           {ruby: '3.2',     rails: 7,   arelx: 2},
           {ruby: '3.2',     rails: 6_1, arelx: 2},
+          {ruby: '3.1',     rails: 7_1, arelx: 2},
           {ruby: '3.1',     rails: 7,   arelx: 2},
           {ruby: '3.1',     rails: 6_1, arelx: 2},
+          {ruby: '3.0',     rails: 7_1, arelx: 2},
           {ruby: '3.0',     rails: 7,   arelx: 2},
           {ruby: '3.0',     rails: 6_1, arelx: 2},
+          {ruby: '2.7',     rails: 7_1, arelx: 2},
           {ruby: '2.7',     rails: 7,   arelx: 2},
           {ruby: '2.7',     rails: 6_1, arelx: 2},
           {ruby: '2.7',     rails: 6,   arelx: 2},

data/README.md

@@ -771,3 +771,15 @@ bundle exec rake test:to_sql
 
 Refer to the [Version Compatibility](#version-compatibility) section to correctly
 set your gemfile.
+
+### MariaDB and Postgres
+
+We provide a `docker compose` to set up some databases for testing:
+
+```bash
+docker-compose -f dev/compose.yaml up
+```
+
+⚠️ Note: localization tests will fail for postgresql because the image is made
+for `en_US.UTF`. We should fix it later, but for the time being the CI works
+correctly for these tests, so you can safely ignore them for the time being.

data/Rakefile

@@ -48,3 +48,10 @@ end
   # Make sure the adapter test evaluates the env setting task
   task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
 end
+
+# Useful shorthands.
+namespace :test do
+  task :sql => :to_sql
+  task :pg => :postgresql
+  task :postgres => :postgresql
+end

data/dev/compose.yaml

@@ -0,0 +1,29 @@
+name: arelx-dbs
+services:
+  mariadb:
+    image: mariadb:11.0
+    container_name: mariadb
+    environment:
+      MARIADB_DATABASE: arelx_test
+      MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true
+    ports:
+      - "3306:3306"
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+  postgres:
+    image: postgres:15
+    container_name: postgres
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: secret
+      POSTGRES_DB: arelx_test
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3

data/gemfiles/rails7_1.gemfile

@@ -0,0 +1,22 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.1'
+
+group :development, :test do
+  gem 'activesupport', '~> 7.1'
+  gem 'activemodel', '~> 7.1'
+  gem 'activerecord', '~> 7.1'
+
+  gem 'sqlite3', '~> 1.6', platforms: [:mri]
+  gem 'mysql2', '~>0.5', platforms: [:mri]
+  gem 'pg', '~> 1.5', platforms: [:mri]
+
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 7.1.0.beta1', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
+
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0' if ENV.has_key? 'ORACLE_HOME'
+end
+
+gemspec path: Dir.pwd

data/lib/arel_extensions/helpers.rb

@@ -20,7 +20,8 @@ module ArelExtensions
   rescue NoMethodError
     nil
   rescue => e
-    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of_via_arel_table`\n#{e.class}: #{e}")
+    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of_via_arel_table`\n#{e.class}")
+    warn(e.backtrace)
     nil
   end
 
@@ -33,10 +34,14 @@ module ArelExtensions
       column_of_via_arel_table(table_name, column_name)
     else
       if pool.respond_to?(:pool_config)
-        pool.pool_config.schema_cache.columns_hash(table_name)[column_name]
-      elsif pool.respond_to?(:schema_cache)
+        if pool.pool_config.respond_to?(:schema_reflection) # activerecord >= 7.1
+          pool.pool_config.schema_reflection.columns_hash(ActiveRecord::Base.connection, table_name)[column_name]
+        else # activerecord < 7.1
+          pool.pool_config.schema_cache.columns_hash(table_name)[column_name]
+        end
+      elsif pool.respond_to?(:schema_cache) # activerecord < 6.1
         pool.schema_cache.columns_hash(table_name)[column_name]
-      else
+      else # activerecord < 5.0
         column_of_via_arel_table(table_name, column_name)
       end
     end
@@ -45,7 +50,8 @@ module ArelExtensions
   rescue ActiveRecord::StatementInvalid
     nil
   rescue => e
-    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of`\n#{e.class}: #{e}")
+    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of`\n#{e.class}")
+    warn(e.backtrace)
     nil
   end
 end

data/lib/arel_extensions/nodes/concat.rb

@@ -16,7 +16,7 @@ module ArelExtensions::Nodes
         if b.is_a?(Arel::Nodes::Quoted) && b.expr == ''
           res
         elsif res.last && res.last.is_a?(Arel::Nodes::Quoted) && b.is_a?(Arel::Nodes::Quoted)
-          res[-1] = Arel.quoted(res.last.expr + b.expr)
+          res[-1] = Arel.quoted(res.last.expr.to_s + b.expr.to_s)
         else
           res << b
         end

data/lib/arel_extensions/nodes/json.rb

@@ -18,8 +18,12 @@ module ArelExtensions
         JsonSet.new(self, key, value)
       end
 
-      def group as_array = true, orders = nil
-        JsonGroup.new(self, as_array, orders)
+      def group as_array = true, orders = nil, distinct: false
+        if distinct
+          JsonGroup.new(Arel::Nodes::NamedFunction.new('DISTINCT', [self]), as_array, orders)
+        else
+          JsonGroup.new(self, as_array, orders)
+        end
       end
 
       def hash

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.1.7'.freeze
+  VERSION = '2.1.8'.freeze
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -9,7 +9,13 @@ module ArelExtensions
         Arel.quoted('"') \
         + expr
             .coalesce('')
-            .replace('\\', '\\\\').replace('"', '\"').replace("\n", '\n') \
+            .replace('\\', '\\\\')
+            .replace('"', '\"')
+            .replace("\b", '\b')
+            .replace("\f", '\f')
+            .replace("\n", '\n')
+            .replace("\r", '\r')
+            .replace("\t", '\t') \
         + '"'
       end
 

data/lib/arel_extensions.rb

@@ -256,6 +256,13 @@ end
 
 class Arel::Table
   alias_method(:old_alias, :alias) rescue nil
+
+  # activerecord 7.1 removed the alias. We might need to remove our dependency
+  # on the alias if it proves problematic.
+  if !self.respond_to?(:table_name)
+    alias :table_name :name
+  end
+
   def alias(name = "#{self.name}_2")
     if name.present?
       Arel::Nodes::TableAlias.new(self, name)

data/test/arelx_test_helper.rb

@@ -12,10 +12,6 @@ end
 
 YELLOW = '33'
 
-def warn(msg)
-  $stderr.puts(colored(YELLOW, msg))
-end
-
 # Load gems specific to databases
 # NOTE:
 #     It's strongly advised to test each database on its own. Loading multiple

data/test/with_ar/all_agnostic_test.rb

@@ -675,15 +675,22 @@ module ArelExtensions
       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
         assert_equal 2016, t(@lucas, @created_at.year).to_i
         assert_equal 0, User.where(@created_at.year.eq('2012')).count
         # Month
         assert_equal 5, t(@camille, @created_at.month).to_i
-        assert_equal 9, User.where(@created_at.month.eq('05')).count
+        assert_equal count_for_may, 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 9, User.where(@created_at.month.eq('05')).count
+        assert_equal count_for_may, 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

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '1.3.7'.freeze
+  VERSION = '1.3.8'.freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.1.7'.freeze
+  VERSION = '2.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -79,6 +79,7 @@ files:
 - TODO
 - appveyor.yml
 - arel_extensions.gemspec
+- dev/compose.yaml
 - functions.html
 - gemfiles/rails3.gemfile
 - gemfiles/rails4_2.gemfile
@@ -88,6 +89,7 @@ files:
 - gemfiles/rails6.gemfile
 - gemfiles/rails6_1.gemfile
 - gemfiles/rails7.gemfile
+- gemfiles/rails7_1.gemfile
 - gemspecs/arel_extensions-v1.gemspec
 - gemspecs/arel_extensions-v2.gemspec
 - generate_gems.sh