arel_extensions 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1001f3712bc329382b77345bde00ff5c1a074a6ea757841b40fcaa230f9c08
-  data.tar.gz: de6cb9e86796ac091ae148f80888a4093ecbe0df9312ad5cbbcd16f7efc6b8f4
+  metadata.gz: 297d1d9b84e726d164e0e001cbe2402c81f3cb1491aa15f10854e508a65d0a8b
+  data.tar.gz: 23697fa470d0524218097318b9f89a0d78e029e16bdeac5e23b24b6610369f6e
 SHA512:
-  metadata.gz: f225335f190b18b56c88e64cea0eef39771f6e937bebd57d814a6c4562c96236e2708f905eef4ec80801c9d6c475aebc717b99c265c2cbccbda46b30e0798786
-  data.tar.gz: e89e25e2336dee7d1f617f05ceb30df609dfdca52ff65e73e86fc2baaff91c1ae8d51e8d50510ba0981cc8bac9d62327164204957afbf18a1cf1c43728a3bf5d
+  metadata.gz: 2e4bffd39e53121a46cf1aacc279747aae8e44119c6cdb3eba1e633e823ee2b3c13596f20139799be6a2ef619b7394aa1e0659569b63643bf08a8516777c84ac
+  data.tar.gz: 1dc5fadc6064410bff969f77ab61b52308b0c60b2a2009868a40a6055b4194440763fd82a409c9a1b05911106b863ca1cc94066d954db0faf895caa7ce5516ed

data/.github/workflows/publish.yml

@@ -0,0 +1,29 @@
+name: "Publish Gems"
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish_gems:
+    name: Publish to Rubygems
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: setup ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+      - name: Fetch Github Release Asset
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          file: "arel_extensions.*.gem"
+          regex: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: List gems
+        run: ls -l *.gem
+      - name: Release Gems
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: bin/publish

data/.github/workflows/release.yml

@@ -0,0 +1,30 @@
+name: Release
+on:
+  workflow_run:
+    workflows: ["Build and Test"]
+    branches: [master]
+    types:
+      - completed
+
+jobs:
+  build_gems:
+    name: Build Gemfiles
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: setup ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+      - name: build gems
+        run: |
+          bin/build
+      - name: release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.ref }}-${{ steps.vars.outputs.sha_short }}
+          draft: true
+          files: |
+            ./arel_extensions-*.gem
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/ruby.yml

@@ -49,9 +49,6 @@ jobs:
         run: |
           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 }}
         run: |
@@ -109,9 +106,6 @@ jobs:
         run: |
           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 }}
         run: |
@@ -191,9 +185,6 @@ jobs:
         run: |
           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 }}
         run: |
@@ -268,9 +259,6 @@ jobs:
         run: |
           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 }}
         run: |
@@ -337,9 +325,6 @@ jobs:
           version: ${{ matrix.mssql }}
           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 }}
         run: |

data/NEWS.md

@@ -1,6 +1,36 @@
 # News
 
-## Current Release
+## Release v2.1.9/v1.3.9
+
+### Bug Fixes
+
+- Postgres:
+  - Datetime formatting in postgres now behaves like mysql: if the target
+    timezone is a string, we automatically consider that you're trying to
+    convert from `UTC`.
+  - Datetime casting will now automatically ask for a
+    `timestamp without timezone`, also aligning with the expected befavior
+    in mysql. This also makes casting work better with timezone conversion,
+    especially if you don't pass the timezone from which you're converting
+    to.
+    ```ruby
+    scope
+      .select(Arel.quoted('2022-02-01 10:42:00')
+      .cast(:datetime)
+      .format_date('%Y/%m/%d %H:%M:%S', 'Europe/Paris')
+      .as('res'))
+    ```
+    Will produce:
+    ```sql
+    SELECT TO_CHAR(
+        CAST('2022-02-01 10:42:00' AS timestamp without time zone) AT TIME ZONE 'UTC' AT TIME ZONE 'Europe/Paris',
+        'YYYY/MM/DD HH24:MI:SS'
+      )
+      AS "res"
+    -- …
+    ```
+
+## Release v2.1.7/v1.3.7
 
 ### New Features
 
@@ -8,11 +38,11 @@
   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

data/README.md

@@ -173,9 +173,9 @@ The second form accepts 2 kinds of values:
 
 ```ruby
 t[:birthdate].format('%Y/%m/%d %H:%M:%S', 'posix/Pacific/Tahiti')
-# => DATE_FORMAT(CONVERT_TZ(CAST(my_table.birthdate AS datetime), 'UTC', 'posix/Pacific/Tahiti'), '%Y/%m/%d %H:%i:%S')          ## MySQL
-# => TO_CHAR(CAST(my_table.birthdate AS timestamp with time zone) AT TIME ZONE 'posix/Pacific/Tahiti', 'YYYY/MM/DD HH24:MI:SS') ## PostgreSQL
-# => CONVERT(datetime, my_table.birthdate) AT TIME ZONE 'UTC' AT TIME ZONE N'posix/Pacific/Tahiti'                              ## SQL Server (& truncated for clarity)
+# => DATE_FORMAT(CONVERT_TZ(CAST(my_table.birthdate AS datetime), 'UTC', 'posix/Pacific/Tahiti'), '%Y/%m/%d %H:%i:%S')                             ## MySQL
+# => TO_CHAR(CAST(my_table.birthdate AS timestamp with time zone) AT TIME ZONE 'UTC' AT TIME ZONE 'posix/Pacific/Tahiti', 'YYYY/MM/DD HH24:MI:SS') ## PostgreSQL
+# => CONVERT(datetime, my_table.birthdate) AT TIME ZONE 'UTC' AT TIME ZONE N'posix/Pacific/Tahiti'                                                 ## SQL Server (& truncated for clarity)
 #                                                                            ^^^^^^^^^^^^^^^^^^^^ 🚨 Invalid timezone for SQL Server. Explanation below.
 ```
 

data/bin/build

@@ -0,0 +1,15 @@
+#! /usr/bin/env sh
+set -e
+
+# VERSION ~> 1
+echo "Packaging v1"
+cp ./version_v1.rb lib/arel_extensions/version.rb
+cp ./gemspecs/arel_extensions-v1.gemspec ./arel_extensions.gemspec
+gem build ./arel_extensions.gemspec
+
+# VERSION ~> 2
+echo "Packaging v2"
+cp ./version_v2.rb lib/arel_extensions/version.rb
+cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+gem build ./arel_extensions.gemspec
+

data/bin/publish

@@ -0,0 +1,8 @@
+#! /usr/bin/env sh
+set -e
+
+find . -name "arel_extensions*.gem" | while read packaged_gem ; do
+  echo "Publishing $packaged_gem"
+  gem push "$packaged_gem"
+done
+

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/postgresql.rb

@@ -190,7 +190,7 @@ module ArelExtensions
           collector << ' AT TIME ZONE '
           collector = visit Arel.quoted(dst_tz), collector
         when String
-          collector << ') AT TIME ZONE '
+          collector << ") AT TIME ZONE 'UTC' AT TIME ZONE "
           collector = visit Arel.quoted(o.time_zone), collector
         end
         collector << COMMA
@@ -392,7 +392,7 @@ module ArelExtensions
           when :number, :decimal, :float
             'numeric'
           when :datetime
-            'timestamp with time zone'
+            'timestamp without time zone'
           when :date
             'date'
           when :binary

data/lib/arel_extensions.rb

@@ -121,6 +121,26 @@ module Arel
     )
   end
 
+  def self.json_true
+    res = Arel.grouping(Arel.quoted('true'))
+    res.instance_eval {
+      def return_type
+        :boolean
+      end
+    }
+    res
+  end
+
+  def self.json_false
+    res = Arel.grouping(Arel.quoted('false'))
+    res.instance_eval {
+      def return_type
+        :boolean
+      end
+    }
+    res
+  end
+
   # The NULL literal.
   def self.null
     Arel.quoted(nil)

data/test/with_ar/all_agnostic_test.rb

@@ -501,7 +501,7 @@ module ArelExtensions
           #
           # 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'])
+          refute_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.send(method, '%Y/%m/%d %H:%M:%S', tz['paris'])) if !%w[mysql postgresql].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']}))

data/version_v1.rb

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

data/version_v2.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -67,6 +67,8 @@ extra_rdoc_files:
 - functions.html
 files:
 - ".codeclimate.yml"
+- ".github/workflows/publish.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -79,6 +81,8 @@ files:
 - TODO
 - appveyor.yml
 - arel_extensions.gemspec
+- bin/build
+- bin/publish
 - dev/compose.yaml
 - functions.html
 - gemfiles/rails3.gemfile
@@ -210,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Extending Arel