RubyGems - arel_extensions - Versions diffs - 2.1.6 → 2.1.8 - Mend

arel_extensions 2.1.6 → 2.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

checksums.yaml +4 -4
data/.github/workflows/ruby.yml +96 -65
data/NEWS.md +20 -3
data/README.md +46 -9
data/Rakefile +7 -0
data/dev/compose.yaml +29 -0
data/gemfiles/rails6_1.gemfile +1 -1
data/gemfiles/rails7.gemfile +1 -1
data/gemfiles/rails7_1.gemfile +22 -0
data/lib/arel_extensions/date_duration.rb +5 -0
data/lib/arel_extensions/helpers.rb +11 -5
data/lib/arel_extensions/nodes/concat.rb +1 -1
data/lib/arel_extensions/nodes/formatted_date.rb +42 -0
data/lib/arel_extensions/nodes/json.rb +6 -2
data/lib/arel_extensions/version.rb +1 -1
data/lib/arel_extensions/visitors/mssql.rb +4 -0
data/lib/arel_extensions/visitors/mysql.rb +28 -22
data/lib/arel_extensions/visitors/oracle.rb +4 -0
data/lib/arel_extensions/visitors/postgresql.rb +4 -0
data/lib/arel_extensions/visitors/to_sql.rb +27 -1
data/lib/arel_extensions.rb +7 -0
data/test/arelx_test_helper.rb +0 -4
data/test/with_ar/all_agnostic_test.rb +150 -123
data/version_v1.rb +1 -1
data/version_v2.rb +1 -1
metadata +6 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c31abd9b0c4ea7cfe26860fba2149ba9a998340e5a34e782a4e0f6790f466fb
-  data.tar.gz: 045325b9361956a6f07f24b252aa2328dada7bb9a3ffd5b75cb59bb8d65fbdbb
+  metadata.gz: 4a3d245de4fca76ff0c5c0806b3b1ed04f47afd7bab31e104c9366870308b638
+  data.tar.gz: 95d67960f12cdd7f6bda282e6258d069276e2e24146c26e70b868e4828ed10ad
 SHA512:
-  metadata.gz: 8988d1d77e9213dd6fbf36921604dd684d5ff624862a1be8c200cbd6c77233e9ae1130642eb711e92804862eefcc386c204dee765e541ca5290bf7d0ce5afabb
-  data.tar.gz: 918c39d67c2f3b1a1f9335818858d503072e34cda34d4112bac482c36d715258570a0a46c7b1a802893f57a9245af385e3a4f8c819548d2c716a02e9fe28032e
+  metadata.gz: 4cdf102bc01abe1b41c19f129d86a28b8e8e43e702e9240a8aa286d9bcc71a04dba47965667f185379d1b69ee69490e40bd7dc3e7f1b974f5e95a2ce59424964
+  data.tar.gz: d93e6301b77655ac3ff34164f7f1794846d408be2751705b3cf467808a7919e31be6b5bb43a3996f61ddd89d97f681cb34793d93d98e1433c16a3dba96f7795b

data/.github/workflows/ruby.yml CHANGED Viewed

@@ -13,19 +13,25 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
-          {ruby: 3.1,       rails: 7,   arelx: 2},
-          {ruby: 3.1,       rails: 6_1, arelx: 2},
-          {ruby: 3.0,       rails: 7,   arelx: 2},
-          {ruby: 3.0,       rails: 6_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},
-          {ruby: 2.7,       rails: 5_2, arelx: 1},
-          {ruby: 2.7,       rails: 4_2, arelx: 1},
-          {ruby: 2.5,       rails: 6_1, arelx: 2},
-          {ruby: 2.5,       rails: 6,   arelx: 2},
-          {ruby: 2.5,       rails: 5_2, arelx: 1},
-          {ruby: 2.5,       rails: 4_2, arelx: 1},
+          {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},
+          {ruby: '2.7',     rails: 5_2, arelx: 1},
+          {ruby: '2.7',     rails: 4_2, arelx: 1},
+          {ruby: '2.5',     rails: 6_1, arelx: 2},
+          {ruby: '2.5',     rails: 6,   arelx: 2},
+          {ruby: '2.5',     rails: 5_2, arelx: 1},
+          {ruby: '2.5',     rails: 4_2, arelx: 1},
           {ruby: jruby-9.2, rails: 6_1, arelx: 2},
           {ruby: jruby-9.2, rails: 6,   arelx: 2},
           {ruby: jruby-9.2, rails: 5_2, arelx: 1},
@@ -44,6 +50,7 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
       - name: Update system-wide gems
+        if: ${{ !contains(fromJson('["2.5", "jruby-9.2"]'), matrix.versions.ruby) }}
         run: gem update --system --no-document
       - name: Setup Gemfile for arelx 2.x
         if: ${{ matrix.versions.arelx == 2 }}
@@ -65,19 +72,25 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
-          {ruby: 3.1,       rails: 7,   arelx: 2},
-          {ruby: 3.1,       rails: 6_1, arelx: 2},
-          {ruby: 3.0,       rails: 7,   arelx: 2},
-          {ruby: 3.0,       rails: 6_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},
-          {ruby: 2.7,       rails: 5_2, arelx: 1},
-          {ruby: 2.7,       rails: 4_2, arelx: 1},
-          {ruby: 2.5,       rails: 6_1, arelx: 2},
-          {ruby: 2.5,       rails: 6,   arelx: 2},
-          {ruby: 2.5,       rails: 5_2, arelx: 1},
-          {ruby: 2.5,       rails: 4_2, arelx: 1},
+          {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},
+          {ruby: '2.7',     rails: 5_2, arelx: 1},
+          {ruby: '2.7',     rails: 4_2, arelx: 1},
+          {ruby: '2.5',     rails: 6_1, arelx: 2},
+          {ruby: '2.5',     rails: 6,   arelx: 2},
+          {ruby: '2.5',     rails: 5_2, arelx: 1},
+          {ruby: '2.5',     rails: 4_2, arelx: 1},
           {ruby: jruby-9.2, rails: 6_1, arelx: 2},
           {ruby: jruby-9.2, rails: 6,   arelx: 2},
           {ruby: jruby-9.2, rails: 5_2, arelx: 1},
@@ -97,6 +110,7 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
       - name: Update system-wide gems
+        if: ${{ !contains(fromJson('["2.5", "jruby-9.2"]'), matrix.versions.ruby) }}
         run: gem update --system --no-document
       - name: Setup Gemfile
         if: ${{ matrix.versions.arelx == 2 }}
@@ -118,19 +132,25 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
-          {ruby: 3.1,       rails: 7,   arelx: 2},
-          {ruby: 3.1,       rails: 6_1, arelx: 2},
-          {ruby: 3.0,       rails: 7,   arelx: 2},
-          {ruby: 3.0,       rails: 6_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},
-          {ruby: 2.7,       rails: 5_2, arelx: 1},
-          {ruby: 2.7,       rails: 4_2, arelx: 1},
-          {ruby: 2.5,       rails: 6_1, arelx: 2},
-          {ruby: 2.5,       rails: 6,   arelx: 2},
-          {ruby: 2.5,       rails: 5_2, arelx: 1},
-          {ruby: 2.5,       rails: 4_2, arelx: 1},
+          {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},
+          {ruby: '2.7',     rails: 5_2, arelx: 1},
+          {ruby: '2.7',     rails: 4_2, arelx: 1},
+          {ruby: '2.5',     rails: 6_1, arelx: 2},
+          {ruby: '2.5',     rails: 6,   arelx: 2},
+          {ruby: '2.5',     rails: 5_2, arelx: 1},
+          {ruby: '2.5',     rails: 4_2, arelx: 1},
           {ruby: jruby-9.2, rails: 6_1, arelx: 2},
           {ruby: jruby-9.2, rails: 6,   arelx: 2},
           {ruby: jruby-9.2, rails: 5_2, arelx: 1},
@@ -172,6 +192,7 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
       - name: Update system-wide gems
+        if: ${{ !contains(fromJson('["2.5", "jruby-9.2"]'), matrix.versions.ruby) }}
         run: gem update --system --no-document
       - name: Setup Gemfile
         if: ${{ matrix.versions.arelx == 2 }}
@@ -196,19 +217,25 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
-          {ruby: 3.1,       rails: 7,   arelx: 2},
-          {ruby: 3.1,       rails: 6_1, arelx: 2},
-          {ruby: 3.0,       rails: 7,   arelx: 2},
-          {ruby: 3.0,       rails: 6_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},
-          {ruby: 2.7,       rails: 5_2, arelx: 1},
-          {ruby: 2.7,       rails: 4_2, arelx: 1},
-          {ruby: 2.5,       rails: 6_1, arelx: 2},
-          {ruby: 2.5,       rails: 6,   arelx: 2},
-          {ruby: 2.5,       rails: 5_2, arelx: 1},
-          {ruby: 2.5,       rails: 4_2, arelx: 1},
+          {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},
+          {ruby: '2.7',     rails: 5_2, arelx: 1},
+          {ruby: '2.7',     rails: 4_2, arelx: 1},
+          {ruby: '2.5',     rails: 6_1, arelx: 2},
+          {ruby: '2.5',     rails: 6,   arelx: 2},
+          {ruby: '2.5',     rails: 5_2, arelx: 1},
+          {ruby: '2.5',     rails: 4_2, arelx: 1},
           {ruby: jruby-9.2, rails: 6_1, arelx: 2},
           {ruby: jruby-9.2, rails: 6,   arelx: 2},
           {ruby: jruby-9.2, rails: 5_2, arelx: 1},
@@ -242,6 +269,7 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
       - name: Update system-wide gems
+        if: ${{ !contains(fromJson('["2.5", "jruby-9.2"]'), matrix.versions.ruby) }}
         run: gem update --system --no-document
       - name: Setup Gemfile
         if: ${{ matrix.versions.arelx == 2 }}
@@ -269,19 +297,21 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
-          # {ruby: 3.1,         rails: 7,   arelx: 2},
-          {ruby: 3.1,         rails: 6_1, arelx: 2},
-          # {ruby: 3.0,         rails: 7,   arelx: 2},
-          {ruby: 3.0,         rails: 6_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},
-          {ruby: 2.7,         rails: 5_2, arelx: 1},
-          {ruby: 2.7,         rails: 4_2, arelx: 1},
-          {ruby: 2.5,         rails: 6_1, arelx: 2},
-          {ruby: 2.5,         rails: 6,   arelx: 2},
-          {ruby: 2.5,         rails: 5_2, arelx: 1},
-          {ruby: 2.5,         rails: 4_2, arelx: 1},
+          # {ruby: '3.2',       rails: 7,   arelx: 2},
+          {ruby: '3.2',       rails: 6_1, arelx: 2},
+          # {ruby: '3.1',       rails: 7,   arelx: 2},
+          {ruby: '3.1',       rails: 6_1, arelx: 2},
+          # {ruby: '3.0',       rails: 7,   arelx: 2},
+          {ruby: '3.0',       rails: 6_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},
+          {ruby: '2.7',       rails: 5_2, arelx: 1},
+          {ruby: '2.7',       rails: 4_2, arelx: 1},
+          {ruby: '2.5',       rails: 6_1, arelx: 2},
+          {ruby: '2.5',       rails: 6,   arelx: 2},
+          {ruby: '2.5',       rails: 5_2, arelx: 1},
+          {ruby: '2.5',       rails: 4_2, arelx: 1},
           # {ruby: jruby-9.2,   rails: 6_1, arelx: 2},
           # {ruby: jruby-9.2,   rails: 6,   arelx: 2},
           {ruby: jruby-9.2,   rails: 5_2, arelx: 1},
@@ -308,6 +338,7 @@ jobs:
           install: sqlengine, sqlclient, sqlpackage, localdb
           sa-password: Password12!
       - name: Update system-wide gems
+        if: ${{ !contains(fromJson('["2.5", "jruby-9.2"]'), matrix.versions.ruby) }}
         run: gem update --system --no-document
       - name: Setup Gemfile
         if: ${{ matrix.versions.arelx == 2 }}

data/NEWS.md CHANGED Viewed

@@ -1,13 +1,30 @@
-# Release
+# News
-## Bug Fixes
+## Current Release
+### New Features
+- `o.format_date` as an alternative to `o.format`
+  The actual behavior of `format` is inconsistent across DB vendors: in mysql we
+  can format dates and numbers with it, and in the other ones we only format
+  dates.
+  We're planning on normalizing this behavior. We want `format` to "cleverly"
+  format dates or numbers, and `format_date` / `format_number` to strictly
+  format dates / numbers.
+  The introduction of `format_date` is the first step in this direction.
+## Release v2.1.6/v1.3.6
+### Bug Fixes
 - This used to fail.
   ```
   Arel.when(a).then(b).format('%Y-%m-%d')
   ```
-## New Features
+### New Features
 - `o.present`, a synonym for `o.not_blank`
 - `o.coalesce_blank(a, b, c)`

data/README.md CHANGED Viewed

@@ -36,7 +36,8 @@ It will add common SQL features in your DB to align ti with current routines. Te
 ## Examples
-t is an Arel::Table for table my_table
+In the following examples
+`t` is an `Arel::Table` for table `my_table` (i.e., `t = Arel::Table.new('my_table')`).
 ## Comparators
@@ -50,7 +51,7 @@ t is an Arel::Table for table my_table
 # => my_table.nb > 42
 ```
-Other operators : <, >=, <=, =~
+Other operators: <, >=, <=, =~
 ## Maths
@@ -73,7 +74,7 @@ With Arel Extensions:
 # => SUM(my_table.nb) + 42
 ```
-Other functions : ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
+Other functions: ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
 For Example:
 ```ruby
@@ -94,14 +95,29 @@ t[:price].format_number("%07.2f €","fr_FR")
 # => TRIM(TRIM(TRIM(COALESCE(my_table.name, '')), '\t'), '\n') = ''
 (t[:name] =~ /\A[a-d_]+/).to_sql
-# => my_table.name REGEXP '\^[a-d_]+'
+# => my_table.name REGEXP '^[a-d_]+'
 ```
-Other functions : SOUNDEX, LENGTH, REPLACE, LOCATE, SUBSTRING, TRIM
+The `replace` function supports string and regex patterns.
+For instance
+```ruby
+t[:email].replace('@', ' at ').replace('.', ' dot ').to_sql
+# => REPLACE(REPLACE(`my_table`.`email`, '@', ' at '), '.', ' dot ')
+```
+Captures are supported when using regex patterns.  The replace string may then reference the capture groups using `\1`, `\2`, etc.  For instance
+```ruby
+t[:email].replace(/^(.*)@(.*)$/, 'user: \1, host: \2').to_sql
+# => REGEXP_REPLACE(`my_table`.`email`, '(?-mix:^(.*)@(.*)$)', 'user: \\1, host: \\2')
+```
+Other functions: SOUNDEX, LENGTH, REPLACE, LOCATE, SUBSTRING, TRIM
 ### String Array operations
-```t[:list]``` is a classical varchar containing a comma separated list ("1,2,3,4")
+`t[:list]` is a classical varchar containing a comma separated list (`"1,2,3,4"`).
 ```ruby
 (t[:list] & 3).to_sql
@@ -228,15 +244,15 @@ t[:id].cast('char').to_sql
 ## Stored Procedures and User-defined functions
 To optimize queries, some classical functions are defined in databases missing any alternative native functions.
-Examples :
-- FIND_IN_SET
+Examples:
+- `FIND_IN_SET`
 ## BULK INSERT / UPSERT
 Arel Extensions improves InsertManager by adding bulk_insert method, which allows to insert multiple rows in one insert.
-```
+```ruby
 @cols = ['id', 'name', 'comments', 'created_at']
 @data = [
    	[23, 'name1', "sdfdsfdsfsdf", '2016-01-01'],
@@ -437,6 +453,15 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">REPLACE<br>column.replace(/re/,"X")</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">SOUNDEX<br>column.soundex</td>
     <td class="ok">✔</td>
@@ -746,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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -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/rails6_1.gemfile CHANGED Viewed

@@ -9,7 +9,7 @@ group :development, :test do
   gem 'activerecord', '~> 6.1.0'
   gem 'sqlite3', '~> 1.4', platforms: [:mri]
-  gem 'mysql2', '0.5.2', platforms: [:mri]
+  gem 'mysql2', '~>0.5', platforms: [:mri]
   gem 'pg', '~> 1.1', platforms: [:mri]
   gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]

data/gemfiles/rails7.gemfile CHANGED Viewed

@@ -9,7 +9,7 @@ group :development, :test do
   gem 'activerecord', '~> 7.0.1'
   gem 'sqlite3', '~> 1.4', platforms: [:mri]
-  gem 'mysql2', '0.5.2', platforms: [:mri]
+  gem 'mysql2', '~>0.5', platforms: [:mri]
   gem 'pg', '~> 1.1', platforms: [:mri]
   gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]

data/gemfiles/rails7_1.gemfile ADDED Viewed

@@ -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/date_duration.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 require 'arel_extensions/nodes/format'
+require 'arel_extensions/nodes/formatted_date'
 require 'arel_extensions/nodes/duration'
 require 'arel_extensions/nodes/wday'
@@ -43,5 +44,9 @@ module ArelExtensions
     def format(tpl, time_zone = nil)
       ArelExtensions::Nodes::Format.new [self, tpl, time_zone]
     end
+    def format_date(tpl, time_zone = nil)
+      ArelExtensions::Nodes::FormattedDate.new [self, tpl, time_zone]
+    end
   end
 end

data/lib/arel_extensions/helpers.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/formatted_date.rb ADDED Viewed

@@ -0,0 +1,42 @@
+require 'strscan'
+module ArelExtensions
+  module Nodes
+    class FormattedDate < Function
+      RETURN_TYPE = :string
+      attr_accessor :col_type, :iso_format, :time_zone
+      def initialize expr
+        col = expr[0]
+        @iso_format = convert_format(expr[1])
+        @time_zone  = expr[2]
+        @col_type = type_of_attribute(col)
+        super [col, convert_to_string_node(@iso_format)]
+      end
+      private
+      # Address portability issues with some of the formats.
+      def convert_format(fmt)
+        s = StringScanner.new fmt
+        res = StringIO.new
+        while !s.eos?
+          res <<
+            case
+            when s.scan(/%D/)    then '%m/%d/%y'
+            when s.scan(/%F/)    then '%Y-%m-%d'
+            when s.scan(/%R/)    then '%H:%M'
+            when s.scan(/%r/)    then '%I:%M:%S %p'
+            when s.scan(/%T/)    then '%H:%M:%S'
+            when s.scan(/%v/)    then '%e-%b-%Y'
+            when s.scan(/[^%]+/) then s.matched
+            when s.scan(/./)     then s.matched
+            end
+        end
+        res.string
+      end
+    end
+  end
+end

data/lib/arel_extensions/nodes/json.rb CHANGED Viewed

@@ -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 CHANGED Viewed

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

data/lib/arel_extensions/visitors/mssql.rb CHANGED Viewed

@@ -355,6 +355,10 @@ module ArelExtensions
       end
       def visit_ArelExtensions_Nodes_Format o, collector
+        visit_ArelExtensions_Nodes_FormattedDate o, collector
+      end
+      def visit_ArelExtensions_Nodes_FormattedDate o, collector
         f = ArelExtensions::Visitors::strftime_to_format(o.iso_format, LOADED_VISITOR::DATE_FORMAT_DIRECTIVES)
         if fmt = LOADED_VISITOR::DATE_CONVERT_FORMATS[f]
           collector << "CONVERT(VARCHAR(#{f.length})"

data/lib/arel_extensions/visitors/mysql.rb CHANGED Viewed

@@ -258,33 +258,16 @@ module ArelExtensions
         # In this case, `o.col_type` is `nil` but we have a legitimate type in
         # the expression to be formatted.  The following is a best effort to
         # infer the proper type.
+        first = o.expressions[0]
         type =
-          o.col_type.nil? && !o.expressions[0].return_type.nil? \
-          ? o.expressions[0].return_type \
+          o.col_type.nil? \
+            && (first.respond_to?(:return_type) && !first&.return_type.nil?) \
+          ? first&.return_type \
           : o.col_type
         case type
         when :date, :datetime, :time
-          fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
-          collector << 'DATE_FORMAT('
-          collector << 'CONVERT_TZ(' if o.time_zone
-          collector = visit o.left, collector
-          case o.time_zone
-          when Hash
-            src_tz, dst_tz = o.time_zone.first
-            collector << COMMA
-            collector = visit Arel.quoted(src_tz), collector
-            collector << COMMA
-            collector = visit Arel.quoted(dst_tz), collector
-            collector << ')'
-          when String
-            collector << COMMA << "'UTC'" << COMMA
-            collector = visit Arel.quoted(o.time_zone), collector
-            collector << ')'
-          end
-          collector << COMMA
-          collector = visit Arel.quoted(fmt), collector
-          collector << ')'
+          visit_ArelExtensions_Nodes_FormattedDate o, collector
         when :integer, :float, :decimal
           collector << 'FORMAT('
           collector = visit o.left, collector
@@ -299,6 +282,29 @@ module ArelExtensions
         collector
       end
+      def visit_ArelExtensions_Nodes_FormattedDate o, collector
+        fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
+        collector << 'DATE_FORMAT('
+        collector << 'CONVERT_TZ(' if o.time_zone
+        collector = visit o.left, collector
+        case o.time_zone
+        when Hash
+          src_tz, dst_tz = o.time_zone.first
+          collector << COMMA
+          collector = visit Arel.quoted(src_tz), collector
+          collector << COMMA
+          collector = visit Arel.quoted(dst_tz), collector
+          collector << ')'
+        when String
+          collector << COMMA << "'UTC'" << COMMA
+          collector = visit Arel.quoted(o.time_zone), collector
+          collector << ')'
+        end
+        collector << COMMA
+        collector = visit Arel.quoted(fmt), collector
+        collector << ')'
+      end
       def visit_ArelExtensions_Nodes_DateDiff o, collector
         case o.right_node_type
         when :ruby_date, :ruby_time, :date, :datetime, :time

data/lib/arel_extensions/visitors/oracle.rb CHANGED Viewed

@@ -451,6 +451,10 @@ module ArelExtensions
       end
       def visit_ArelExtensions_Nodes_Format o, collector
+        visit_ArelExtensions_Nodes_FormattedDate o, collector
+      end
+      def visit_ArelExtensions_Nodes_FormattedDate o, collector
         fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
         collector << 'TO_CHAR('
         collector << 'CAST(' if o.time_zone

data/lib/arel_extensions/visitors/postgresql.rb CHANGED Viewed

@@ -174,6 +174,10 @@ module ArelExtensions
       end
       def visit_ArelExtensions_Nodes_Format o, collector
+        visit_ArelExtensions_Nodes_FormattedDate o, collector
+      end
+      def visit_ArelExtensions_Nodes_FormattedDate o, collector
         fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
         collector << 'TO_CHAR('
         collector << '(' if o.time_zone

data/lib/arel_extensions/visitors/to_sql.rb CHANGED Viewed

@@ -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
@@ -289,6 +295,26 @@ module ArelExtensions
         collector
       end
+      def visit_ArelExtensions_Nodes_FormattedDate o, collector
+        case o.col_type
+        when :date, :datetime, :time
+          collector << 'STRFTIME('
+          collector = visit o.right, collector
+          collector << COMMA
+          collector = visit o.left, collector
+          collector << ')'
+        when :integer, :float, :decimal
+          collector << 'FORMAT('
+          collector = visit o.left, collector
+          collector << COMMA
+          collector = visit o.right, collector
+          collector << ')'
+        else
+          collector = visit o.left, collector
+        end
+        collector
+      end
       # comparators
       def visit_ArelExtensions_Nodes_Cast o, collector

data/lib/arel_extensions.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -437,123 +437,134 @@ module ArelExtensions
       end
       def test_format
-        assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
-        assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
-        assert_equal '12:42%', t(@lucas, @updated_at.format('%R%%'))
-        # The following tests will ensure proper conversion of timestamps to
-        # requested timezones.
-        #
-        # The names of the timezones is highly dependant on the underlying
-        # operating system, and this is why we need to handle each database
-        # separately: the images we're using to test these databases are
-        # different. So don't rely on the provided examples. Your setup is your
-        # reference.
-        #
-        # One could always have portable code if s/he uses standard
-        # abbreviations, like:
-        #
-        # 1. CET  => Central European Time
-        # 2. CEST => Central European Summer Time
-        #
-        # Which implies that the caller should handle daylight saving detection.
-        # In fact, CET will handle daylight saving in MySQL but not Postgres.
-        #
-        # It looks like the posix convention is supported by mysql and
-        # postgresql, e.g.:
-        #
-        # posix/Europe/Paris
-        # posix/America/Nipigon
-        #
-        # so it looks like a more reliably portable way of specifying it.
-        time_zones = {
-          'mssql'       => {
-                            'utc'       => 'UTC',
-                            'sao_paulo' => 'Argentina Standard Time',
-                            'tahiti'    => 'Hawaiian Standard Time',
-                            'paris'     => 'Central European Standard Time'
-                           },
-          'posix'       => {
-                            'utc'       => 'UTC',
-                            'sao_paulo' => 'America/Sao_Paulo',
-                            'tahiti'    => 'Pacific/Tahiti',
-                            'paris'     => 'Europe/Paris'
-                           }
-        }
-        skip "Unsupported timezone conversion for DB=#{ENV['DB']}" if !%w[mssql mysql oracle postgresql].include?(ENV['DB'])
-        # TODO: Standarize timezone conversion across all databases.
-        #       This test case will be refactored and should work the same across all vendors.
-        if ENV['DB'] == 'mssql' && /Microsoft SQL Server (\d+)/.match(ActiveRecord::Base.connection.select_value('SELECT @@version'))[1].to_i < 2016
-          skip "SQL Server < 2016 is not currently supported"
-        end
-        tz = ENV['DB'] == 'mssql' ? time_zones['mssql'] : time_zones['posix']
-        assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', tz['utc']))
-        assert_equal '2014/03/03 09:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['sao_paulo']}))
-        assert_equal '2014/03/03 02:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['tahiti']}))
+        %i[format format_date].each do |method|
+          assert_equal '2016-05-23', t(@lucas, @created_at.send(method, '%Y-%m-%d'))
+          assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S'))
+          assert_equal '12:42%', t(@lucas, @updated_at.send(method, '%R%%'))
+          # The following tests will ensure proper conversion of timestamps to
+          # requested timezones.
+          #
+          # The names of the timezones is highly dependant on the underlying
+          # operating system, and this is why we need to handle each database
+          # separately: the images we're using to test these databases are
+          # different. So don't rely on the provided examples. Your setup is your
+          # reference.
+          #
+          # One could always have portable code if s/he uses standard
+          # abbreviations, like:
+          #
+          # 1. CET  => Central European Time
+          # 2. CEST => Central European Summer Time
+          #
+          # Which implies that the caller should handle daylight saving detection.
+          # In fact, CET will handle daylight saving in MySQL but not Postgres.
+          #
+          # It looks like the posix convention is supported by mysql and
+          # postgresql, e.g.:
+          #
+          # posix/Europe/Paris
+          # posix/America/Nipigon
+          #
+          # so it looks like a more reliably portable way of specifying it.
+          time_zones = {
+            'mssql'       => {
+              'utc'       => 'UTC',
+              'sao_paulo' => 'Argentina Standard Time',
+              'tahiti'    => 'Hawaiian Standard Time',
+              'paris'     => 'Central European Standard Time'
+            },
+            'posix'       => {
+              'utc'       => 'UTC',
+              'sao_paulo' => 'America/Sao_Paulo',
+              'tahiti'    => 'Pacific/Tahiti',
+              'paris'     => 'Europe/Paris'
+            }
+          }
+          skip "Unsupported timezone conversion for DB=#{ENV['DB']}" if !%w[mssql mysql oracle postgresql].include?(ENV['DB'])
+          # TODO: Standarize timezone conversion across all databases.
+          #       This test case will be refactored and should work the same across all vendors.
+          if ENV['DB'] == 'mssql' && /Microsoft SQL Server (\d+)/.match(ActiveRecord::Base.connection.select_value('SELECT @@version'))[1].to_i < 2016
+            skip "SQL Server < 2016 is not currently supported"
+          end
-        # Skipping conversion from UTC to the desired timezones fails in SQL
-        # Server and Postgres. This is mainly due to the fact that timezone
-        # information is not preserved in the column itself.
-        #
-        # MySQL is happy to consider that times by default are in UTC.
-        assert_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-        refute_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', tz['paris'])) if !['mysql'].include?(ENV['DB'])
-        # Winter/Summer time
-        assert_equal '2014/08/03 14:42:00', t(@lucas, (@updated_at + 5.months).format('%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-        if ENV['DB'] == 'mssql'
-          assert_equal '2022/02/01 11:42:00', t(@lucas, Arel.quoted('2022-02-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-          assert_equal '2022/08/01 12:42:00', t(@lucas, Arel.quoted('2022-08-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
-        else
-          assert_equal '2022/02/01 11:42:00', t(@lucas, Arel.quoted('2022-02-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', tz['paris']))
-          assert_equal '2022/08/01 12:42:00', t(@lucas, Arel.quoted('2022-08-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', tz['paris']))
+          tz = ENV['DB'] == 'mssql' ? time_zones['mssql'] : time_zones['posix']
+          assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', tz['utc']))
+          assert_equal '2014/03/03 09:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['sao_paulo']}))
+          assert_equal '2014/03/03 02:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['tahiti']}))
+          # Skipping conversion from UTC to the desired timezones fails in SQL
+          # Server and Postgres. This is mainly due to the fact that timezone
+          # information is not preserved in the column itself.
+          #
+          # MySQL is happy to consider that times by default are in UTC.
+          assert_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
+          refute_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', tz['paris'])) if !['mysql'].include?(ENV['DB'])
+          # Winter/Summer time
+          assert_equal '2014/08/03 14:42:00', t(@lucas, (@updated_at + 5.months).send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
+          if ENV['DB'] == 'mssql'
+            assert_equal '2022/02/01 11:42:00', t(@lucas, Arel.quoted('2022-02-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
+            assert_equal '2022/08/01 12:42:00', t(@lucas, Arel.quoted('2022-08-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', {tz['utc'] => tz['paris']}))
+          else
+            assert_equal '2022/02/01 11:42:00', t(@lucas, Arel.quoted('2022-02-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', tz['paris']))
+            assert_equal '2022/08/01 12:42:00', t(@lucas, Arel.quoted('2022-08-01 10:42:00').cast(:datetime).send(method, '%Y/%m/%d %H:%M:%S', tz['paris']))
+          end
         end
       end
       def test_format_iso_week
-        skip "Unsupported ISO week number for DB=#{ENV['DB']}" if ['sqlite'].include?(ENV['DB'])
-        assert_equal '10', t(@lucas, @updated_at.format('%V'))
-        {
-          '2024-01-01 10:42:00' => '01', # Monday
-          '2030-01-01 10:42:00' => '01', # Tuesday
-          '2025-01-01 10:42:00' => '01', # Wednesday
-          '2026-01-01 10:42:00' => '01', # Thursday
-          '2027-01-01 10:42:00' => '53', # Friday
-          '2028-01-01 10:42:00' => '52', # Saturday
-          '2034-01-01 10:42:00' => '52', # Sunday
-        }.each do |date, exp|
-          assert_equal exp, t(@lucas, Arel.quoted(date).cast(:datetime).format('%V'))
+        %i[format format_date].each do |method|
+          skip "Unsupported ISO week number for DB=#{ENV['DB']}" if ['sqlite'].include?(ENV['DB'])
+          assert_equal '10', t(@lucas, @updated_at.send(method, '%V'))
+          {
+            '2024-01-01 10:42:00' => '01', # Monday
+            '2030-01-01 10:42:00' => '01', # Tuesday
+            '2025-01-01 10:42:00' => '01', # Wednesday
+            '2026-01-01 10:42:00' => '01', # Thursday
+            '2027-01-01 10:42:00' => '53', # Friday
+            '2028-01-01 10:42:00' => '52', # Saturday
+            '2034-01-01 10:42:00' => '52', # Sunday
+          }.each do |date, exp|
+            assert_equal exp, t(@lucas, Arel.quoted(date).cast(:datetime).send(method, '%V'))
+          end
         end
       end
       def test_format_iso_year_of_week
         skip "Unsupported ISO year of week for DB=#{ENV['DB']}" if %w[mssql sqlite].include?(ENV['DB'])
-        assert_equal '2014', t(@lucas, @updated_at.format('%G'))
-        {
-          '2024-01-01 10:42:00' => '2024', # Monday
-          '2030-01-01 10:42:00' => '2030', # Tuesday
-          '2025-01-01 10:42:00' => '2025', # Wednesday
-          '2026-01-01 10:42:00' => '2026', # Thursday
-          '2027-01-01 10:42:00' => '2026', # Friday
-          '2028-01-01 10:42:00' => '2027', # Saturday
-          '2034-01-01 10:42:00' => '2033', # Sunday
-        }.each do |date, exp|
-          assert_equal exp, t(@lucas, Arel.quoted(date).cast(:datetime).format('%G'))
+        %i[format format_date].each do |method|
+          assert_equal '2014', t(@lucas, @updated_at.send(method, '%G'))
+          {
+            '2024-01-01 10:42:00' => '2024', # Monday
+            '2030-01-01 10:42:00' => '2030', # Tuesday
+            '2025-01-01 10:42:00' => '2025', # Wednesday
+            '2026-01-01 10:42:00' => '2026', # Thursday
+            '2027-01-01 10:42:00' => '2026', # Friday
+            '2028-01-01 10:42:00' => '2027', # Saturday
+            '2034-01-01 10:42:00' => '2033', # Sunday
+          }.each do |date, exp|
+            assert_equal exp, t(@lucas, Arel.quoted(date).cast(:datetime).send(method, '%G'))
+          end
         end
       end
       def test_format_date_with_names
         skip "#{ENV['DB']} does not support a variety of word-based formatting for month and day names" if %w[mssql sqlite].include?(ENV['DB'])
-        assert_equal 'Mon, 03 Mar 14', t(@lucas, @updated_at.format('%a, %d %b %y'))
-        assert_equal 'Monday, 03 March 14', t(@lucas, @updated_at.format('%A, %d %B %y'))
+        %i[format format_date].each do |method|
+          assert_equal 'Mon, 03 Mar 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
+          assert_equal 'Monday, 03 March 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
+        end
         skip "#{ENV['DB']} does not support ALLCAPS month and day names" if ['mysql'].include?(ENV['DB'])
-        assert_equal 'Mon, 03 MAR 14', t(@lucas, @updated_at.format('%a, %d %^b %y'))
-        assert_equal 'Monday, 03 MARCH 14', t(@lucas, @updated_at.format('%A, %d %^B %y'))
+        %i[format format_date].each do |method|
+          assert_equal 'Mon, 03 MAR 14', t(@lucas, @updated_at.send(method, '%a, %d %^b %y'))
+          assert_equal 'Monday, 03 MARCH 14', t(@lucas, @updated_at.send(method, '%A, %d %^B %y'))
+        end
       end
       def switch_to_lang(lang)
@@ -580,28 +591,30 @@ module ArelExtensions
         #
         # Tests should assert one single thing in principle, but until we
         # refactor this whole thing, we'll have to do tricks of this sort.
-        begin
-          switch_to_lang(:en)
-          case ENV['DB']
-          when 'mysql', 'postgresql'
-            assert_equal 'Mon, 03 Mar 14', t(@lucas, @updated_at.format('%a, %d %b %y'))
-            assert_equal 'Monday, 03 March 14', t(@lucas, @updated_at.format('%A, %d %B %y'))
-          when 'mssql'
-            assert_equal 'Monday, 03 March 2014', t(@lucas, @updated_at.format('%A, %d %B %y'))
+        %i[format format_date].each do |method|
+          begin
+            switch_to_lang(:en)
+            case ENV['DB']
+            when 'mysql', 'postgresql'
+              assert_equal 'Mon, 03 Mar 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
+              assert_equal 'Monday, 03 March 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
+            when 'mssql'
+              assert_equal 'Monday, 03 March 2014', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
+            end
+            switch_to_lang(:fr)
+            case ENV['DB']
+            when 'mysql'
+              assert_equal 'lun, 03 mar 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
+              assert_equal 'lundi, 03 mars 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
+            when 'postgresql'
+              assert_equal 'Lun., 03 Mars 14', t(@lucas, @updated_at.send(method, '%a, %d %b %y'))
+              assert_equal 'Lundi, 03 Mars 14', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
+            when 'mssql'
+              assert_equal 'lundi, 03 mars 2014', t(@lucas, @updated_at.send(method, '%A, %d %B %y'))
+            end
+          ensure
+            switch_to_lang(:en)
           end
-          switch_to_lang(:fr)
-          case ENV['DB']
-          when 'mysql'
-            assert_equal 'lun, 03 mar 14', t(@lucas, @updated_at.format('%a, %d %b %y'))
-            assert_equal 'lundi, 03 mars 14', t(@lucas, @updated_at.format('%A, %d %B %y'))
-          when 'postgresql'
-            assert_equal 'Lun., 03 Mars 14', t(@lucas, @updated_at.format('%a, %d %b %y'))
-            assert_equal 'Lundi, 03 Mars 14', t(@lucas, @updated_at.format('%A, %d %B %y'))
-          when 'mssql'
-            assert_equal 'lundi, 03 mars 2014', t(@lucas, @updated_at.format('%A, %d %B %y'))
-          end
-        ensure
-          switch_to_lang(:en)
         end
       end
@@ -632,6 +645,7 @@ module ArelExtensions
         assert_equal 'Myung', t(@myung, @comments.coalesce_blank('', ' ', '   ').coalesce_blank('Myung'))
         assert_equal 'Myung', t(@myung, @comments.coalesce_blank('', ' ', '   ', 'Myung'))
         assert_equal '2016-05-23', t(@myung, @created_at.coalesce_blank(Date.new(2022, 1, 1)).format('%Y-%m-%d'))
+        assert_equal '2016-05-23', t(@myung, @created_at.coalesce_blank(Date.new(2022, 1, 1)).format_date('%Y-%m-%d'))
         assert_equal 'Laure', t(@laure, @comments.coalesce_blank('Laure'))
         assert_equal 100, t(@test, @age.coalesce_blank(100))
         assert_equal 20, t(@test, @age.coalesce_blank(20))
@@ -661,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
@@ -734,8 +755,10 @@ module ArelExtensions
                         t(@lucas, (@updated_at + Arel.duration('mn', (@updated_at.hour * 60 + @updated_at.minute))))
         assert_includes ['2024-03-03'], t(@lucas, (@updated_at + durPos).format('%Y-%m-%d'))
+        assert_includes ['2024-03-03'], t(@lucas, (@updated_at + durPos).format_date('%Y-%m-%d'))
         # puts (@updated_at - durPos).to_sql
         assert_includes ['2004-03-03'], t(@lucas, (@updated_at - durPos).format('%Y-%m-%d'))
+        assert_includes ['2004-03-03'], t(@lucas, (@updated_at - durPos).format_date('%Y-%m-%d'))
         # we test with the ruby object or the string because some adapters don't return an object Date
@@ -775,9 +798,11 @@ module ArelExtensions
         assert_equal 0, t(@myung, @comments.if_present.count)
         assert_equal 20.16, t(@myung, @score.if_present)
         assert_equal '2016-05-23', t(@myung, @created_at.if_present.format('%Y-%m-%d'))
+        assert_equal '2016-05-23', t(@myung, @created_at.if_present.format_date('%Y-%m-%d'))
         assert_nil t(@laure, @comments.if_present)
         assert_nil t(@nilly, @duration.if_present.format('%Y-%m-%d'))
+        assert_nil t(@nilly, @duration.if_present.format_date('%Y-%m-%d'))
         # NOTE: here we're testing the capacity to format a nil value,
         # however, @comments is a text field, and not a date/datetime field,
@@ -785,8 +810,10 @@ module ArelExtensions
         # we need to cast it first.
         if @env_db == 'postgresql'
           assert_nil t(@laure, @comments.cast(:date).if_present.format('%Y-%m-%d'))
+          assert_nil t(@laure, @comments.cast(:date).if_present.format_date('%Y-%m-%d'))
         else
           assert_nil t(@laure, @comments.if_present.format('%Y-%m-%d'))
+          assert_nil t(@laure, @comments.if_present.format_date('%Y-%m-%d'))
         end
       end

data/version_v1.rb CHANGED Viewed

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

data/version_v2.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.8
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-22 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
@@ -123,6 +125,7 @@ files:
 - lib/arel_extensions/nodes/find_in_set.rb
 - lib/arel_extensions/nodes/floor.rb
 - lib/arel_extensions/nodes/format.rb
+- lib/arel_extensions/nodes/formatted_date.rb
 - lib/arel_extensions/nodes/formatted_number.rb
 - lib/arel_extensions/nodes/function.rb
 - lib/arel_extensions/nodes/is_null.rb
@@ -207,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: Extending Arel