arel_extensions 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 292fe79fad9ac5f56c0ab194cdd8335eb632b6a97144138423dfe7f99b528dd3
-  data.tar.gz: 7924daff5fb2c08ed2f6c63ef99629aa43ce90ca310d175618f279f61b5ae85c
+  metadata.gz: 460764a1fc17c5359b553da4b62d75b2300cc4a0ead64ce1ddcf3e897d703045
+  data.tar.gz: 751125d207b3485e3220b6335cbd7050516ea7d8bb8cd88b3810e00c0a80fb86
 SHA512:
-  metadata.gz: bb981aed1c1d97a9584d000f75e9b446afbf65947ce95cd21af5e0ba85182994e55c3f6fc6b49e09897940d09714e89502585cfa844487d5ac64787c7ed6810b
-  data.tar.gz: 7816248c6ce60af5a5a24a5015b9d73f568d447806e7778b5adcc2570d5ebd344834fdd71db4d5c83c93fef727a3e1f8a6d02de81e75539547263a751c768a04
+  metadata.gz: a8781a647977d941173ed7dc68c256bb85ecf4c490908baa21ec1e36f32a35e4c175f5c51a69a50e3af4b4921c4575a5bacb8b3748ffe46a8852bac08bb1444c
+  data.tar.gz: 45dbf8f8537750c23ef4d7718cfed20a5e5618b86d84cd4f23154db6e9a92fdef9a4befec53ac29da230e21fbcf8c98f311a3ceef89532cc947cb0a9d3c39f31

data/.github/workflows/ruby.yml

@@ -148,32 +148,41 @@ jobs:
       matrix:
         ruby: [3.1, 3.0, 2.7, 2.5, jruby-9.2, jruby-9.3]
         rails: [7, 6_1, 6, 5_2]
-        exclude: [
-          {ruby: 3.1,       rails: 6  },
-          {ruby: 3.1,       rails: 5_2},
-          {ruby: 3.0,       rails: 6  },
-          {ruby: 3.0,       rails: 5_2},
-          {ruby: 2.7,       rails: 5_2},
-          {ruby: 2.5,       rails: 7 },
-          {ruby: jruby-9.2, rails: 7},
-          {ruby: jruby-9.3, rails: 7},
-        ]
-    services:
-      postgres:
-        image: postgres:11.6-alpine
-        env:
-          POSTGRES_DB: arelx_test
-          POSTGRES_PASSWORD: secret
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        options: >-
-          --health-cmd "pg_isready -d arelx_test -U postgres -p 5432"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+        exclude:
+          [
+            { ruby: 3.1, rails: 6 },
+            { ruby: 3.1, rails: 5_2 },
+            { ruby: 3.0, rails: 6 },
+            { ruby: 3.0, rails: 5_2 },
+            { ruby: 2.7, rails: 5_2 },
+            { ruby: 2.5, rails: 7 },
+            { ruby: jruby-9.2, rails: 7 },
+            { ruby: jruby-9.3, rails: 7 },
+          ]
     steps:
       - uses: actions/checkout@v2
+        # PostgreSQL requires locales to be installed on the system to be able
+        # to do time and currency conversions at runtime.
+        #
+        # That's why we're not launching it as a service; pre-built images
+        # lack loaclization.
+        #
+        # After we install locales, we'll install PostgreSQL binaries and start
+        # the service.
+      - name: setup locale
+        run: |
+          sudo locale-gen fr_FR.utf8
+          sudo update-locale
+      - name: setup postgres 11
+        run: |
+          curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc|sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
+          echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | sudo tee  /etc/apt/sources.list.d/pgdg.list
+          sudo apt update
+          sudo apt -y install postgresql-11
+          sudo systemctl enable postgresql
+          sudo systemctl start postgresql
+          sudo su -c "psql -c \"alter user postgres with password 'secret'\"" postgres
+          sudo su -c "createdb arelx_test" postgres
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -280,18 +289,19 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [3.1, 3.0, 2.7, 2.5, jruby-9.2, jruby-9.3]
-        rails: [7, 6_1, 6, 5_2]
+        rails: [6_1, 6, 5_2]
+        version: [2017, 2019]
         exclude: [
           {ruby: 3.1,       rails: 6  },
           {ruby: 3.1,       rails: 5_2 },
           {ruby: 3.0,       rails: 6   },
           {ruby: 3.0,       rails: 5_2 },
           {ruby: 2.7,       rails: 5_2 },
-          {ruby: 2.5,       rails: 7   },
-          {ruby: jruby-9.2, rails: 7   },
+          # {ruby: 2.5,       rails: 7   },
+          # {ruby: jruby-9.2, rails: 7   },
           {ruby: jruby-9.2, rails: 6_1 },
           {ruby: jruby-9.2, rails: 6   },
-          {ruby: jruby-9.3, rails: 7   },
+          # {ruby: jruby-9.3, rails: 7   },
           {ruby: jruby-9.3, rails: 6_1 },
           {ruby: jruby-9.3, rails: 6   },
         ]
@@ -305,9 +315,10 @@ jobs:
         run: |
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
-      - name: Install MSSQL 2019
-        uses: potatoqualitee/mssqlsuite@v1
+      - name: Install MSSQL ${{ matrix.version }}
+        uses: potatoqualitee/mssqlsuite@v1.5.1
         with:
+          version: ${{ matrix.version }}
           install: sqlengine, sqlclient, sqlpackage, localdb
           sa-password: Password12!
       - name: Update system-wide gems
@@ -328,62 +339,3 @@ jobs:
           bundle install
       - name: Run test mssql
         run: bundle exec rake test:mssql
-
-  job_test_windows:
-    name: test mssql on windows
-    needs: job_build_gem
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [3.1, 3.0, 2.7, 2.5]
-        rails: [7, 6_1, 6, 5_2]
-        exclude: [
-          {ruby: 3.1,       rails: 6   },
-          {ruby: 3.1,       rails: 5_2 },
-          {ruby: 3.0,       rails: 6   },
-          {ruby: 3.0,       rails: 5_2 },
-          {ruby: 2.7,       rails: 5_2 },
-          {ruby: 2.5,       rails: 7   },
-          {ruby: jruby-9.2, rails: 7   },
-          {ruby: jruby-9.2, rails: 6_1 },
-          {ruby: jruby-9.2, rails: 6   },
-          {ruby: jruby-9.3, rails: 7   },
-          {ruby: jruby-9.3, rails: 6_1 },
-          {ruby: jruby-9.3, rails: 6   },
-        ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install mssql
-        uses: potatoqualitee/mssqlsuite@v1
-        with:
-          install: sqlengine, sqlclient, sqlpackage, localdb
-          sa-password: Password12!
-      - name: Set up Ruby
-        uses: MSP-Greg/ruby-setup-ruby@win-ucrt-1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Install required packages on Windows
-        shell: cmd
-        run: |
-          ridk exec sh -c "pacman --sync --needed --noconfirm  ${MINGW_PACKAGE_PREFIX}-gcc"
-      - name: Update system-wide gems
-        run: gem update --system
-      - name: Setup Gemfile
-        if: ${{ matrix.rails != '5_2' }}
-        run: |
-          cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
-          cp ./version_v2.rb lib/arel_extensions/version.rb
-          cp ./gemfiles/rails${{ matrix.rails }}.gemfile ./Gemfile
-      - name: bundle install
-        run: |
-          bundle config set gemfile .\gemfiles\rails${{ matrix.rails }}.gemfile
-          bundle install --verbose
-      - name: Download gem from build job
-        uses: actions/download-artifact@v2
-        with:
-          name: ${{ matrix.ruby }}-${{ matrix.rails }}-gem
-      - name: Install downloaded gem
-        run: gem install --local *.gem --verbose
-      - name: Run test mssql
-        run: bundle exec rake test:mssql

data/.gitignore

@@ -1,9 +1,10 @@
-coverage/*
-config/database.yml
-spec/support/fixtures/*database*
 *.DS_Store
+*.swp
+.bundle
+Gemfile.lock
+config/database.yml
+coverage/*
 debug.log
 pkg
-.bundle
-*.swp
-Gemfile.lock
+spec/support/fixtures/*database*
+vendor/

data/.rubocop.yml

@@ -24,6 +24,10 @@ Layout/SpaceAroundEqualsInParameterDefault:
 Layout/SpaceAroundOperators:
   Enabled: true
 
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+  EnforcedStyle: no_space
+
 Layout/TrailingEmptyLines:
   Enabled: true
 
@@ -51,6 +55,10 @@ Style/EmptyElse:
 Style/Encoding:
   Enabled: true
 
+Style/HashSyntax:
+  Enabled: true
+  EnforcedStyle: ruby19
+
 Style/MethodCallWithArgsParentheses:
   Enabled: false
 
@@ -60,9 +68,32 @@ Style/MethodCallWithoutArgsParentheses:
 Style/NegatedIf:
   Enabled: false
 
+Style/NumericLiterals:
+  Enabled: true
+
+Style/RedundantParentheses:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: true
+
+# Even when conservative, this is unsafe.
+#Style/StringConcatenation:
+#  Enabled: true
+#  Mode: 'conservative'
+
 Style/StringLiterals:
   Enabled: true
 
+Style/SymbolArray:
+  Enabled: true
+
+Style/WordArray:
+  Enabled: true
+
 # Performance cops have been transferred to rubocop-performance gem.
 require: rubocop-performance
 
@@ -71,3 +102,9 @@ Performance/DoubleStartEndWith:
 
 Performance/RedundantMerge:
   Enabled: true
+
+Performance/RegexpMatch:
+  Enabled: true
+
+Performance/StringReplacement:
+  Enabled: true

data/Gemfile

@@ -12,10 +12,10 @@ group :development, :test do
   gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
   gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
 
-  gem 'tiny_tds', '~> 2.1', require: false, platforms: [:mri, :mingw, :x64_mingw, :mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 6.0', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem 'tiny_tds', '~> 2.1', require: false, platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 6.0', platforms: %i[mri mingw x64_mingw mswin]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :x64_mingw, :mingw]
+  gem 'ruby-oci8', platforms: %i[mri mswin x64_mingw mingw]
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
 
   gem 'activesupport', '~> 6.0'

data/README.md

@@ -1,6 +1,7 @@
 # Arel Extensions
 
 ![GitHub workflow](https://github.com/Faveod/arel-extensions/actions/workflows/ruby.yml/badge.svg)
+[![AppVeyor Build Status](https://img.shields.io/appveyor/ci/yazfav/arel-extensions.svg?label=AppVeyor%20build)](https://ci.appveyor.com/project/yazfav/arel-extensions)
 [![Security](https://hakiri.io/github/Faveod/arel-extensions/master.svg)](https://hakiri.io/github/Faveod/arel-extensions/master)
 ![](http://img.shields.io/badge/license-MIT-brightgreen.svg)
 

data/appveyor.yml

@@ -0,0 +1,73 @@
+image: Visual Studio 2015
+
+version: "{build}"
+
+cache:
+  - vendor/bundle
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25-x64
+      RAILS: 5_2
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 5_2
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 5_2
+      SQL: MSSQL$SQL2016
+    - RUBY_VERSION: 25-x64
+      RAILS: 6
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 6
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 6
+      SQL: MSSQL$SQL2016
+    - RUBY_VERSION: 25-x64
+      RAILS: 6_1
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 6_1
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 6_1
+      SQL: MSSQL$SQL2016
+
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - gem update --system
+  - gem install rubygems-update && update_rubygems
+  - bundle config --local path vendor/bundle
+  - cp ./gemfiles/rails%RAILS%.gemfile ./Gemfile
+  - bundle config set gemfile ./gemfiles/rails%RAILS%.gemfile
+  - bundle install
+
+build: off
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - ps: Get-Service '*SQL*'
+  - net start %SQL%
+  - bundle exec rake test:mssql
+
+for:
+-
+  matrix:
+    except:
+      - RAILS: 5_2
+  install:
+    - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+    - cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+    - cp ./version_v2.rb lib/arel_extensions/version.rb
+    - cp ./gemfiles/rails%RAILS%.gemfile ./Gemfile
+    - gem update --system
+    - gem install rubygems-update && update_rubygems
+    - bundle config --local path vendor/bundle
+    - bundle config set gemfile ./gemfiles/rails%RAILS%.gemfile
+    - bundle install

data/gemfiles/rails3.gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 gem 'arel', '~> 3.0' # too old...
 
 group :development, :test do
-  gem 'sqlite3', '<= 1.3.13', platform: [:ruby, :mswin, :mingw]
-  gem 'mysql2', '0.4.10', platform: [:ruby, :mswin, :mingw]
-  gem 'activerecord-mysql2-adapter', platform: [:ruby, :mswin, :mingw]
-  gem 'pg', platform: [:ruby, :mswin, :mingw]
+  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
@@ -17,4 +17,4 @@ group :development, :test do
   gem 'activerecord', '~> 3.2'
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/gemfiles/rails4.gemfile

@@ -7,14 +7,14 @@ group :development, :test do
   gem 'activemodel', '~> 4.0'
   gem 'activerecord', '~> 4.0'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: [:mri, :mswin, :mingw]
-  gem 'mysql2', '0.4.10', platforms: [:mri, :mswin, :mingw]
-  gem 'pg', '< 1.0.0', platforms: [:mri, :mingw]
+  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: [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
-  gem 'activerecord-sqlserver-adapter', '~> 4.2.0', platforms: [:mri, :mingw, :mswin] if RUBY_PLATFORM =~ /windows/
+  gem 'tiny_tds', platforms: %i[mri mingw mswin] if RUBY_PLATFORM.match?(/windows/)
+  gem 'activerecord-sqlserver-adapter', '~> 4.2.0', platforms: %i[mri mingw mswin] if RUBY_PLATFORM.match?(/windows/)
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  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
@@ -26,4 +26,4 @@ group :development, :test do
   gem 'activerecord-jdbcmssql-adapter', platforms: :jruby
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/gemfiles/rails5_0.gemfile

@@ -7,14 +7,14 @@ group :development, :test do
   gem 'activemodel', '~> 5.0'
   gem 'activerecord', '5.0.6'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: [:mri, :mswin, :mingw]
-  gem 'mysql2', '0.4.10', platforms: [:mri, :mswin, :mingw]
-  gem 'pg', '< 1.0.0', platforms: [:mri, :mingw]
+  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: [:mri, :mingw] if RUBY_PLATFORM =~ /windows/
+  gem 'tiny_tds', platforms: %i[mri mingw] if RUBY_PLATFORM.match?(/windows/)
   # gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.7' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
@@ -26,4 +26,4 @@ group :development, :test do
   gem 'activerecord-jdbcmssql-adapter', platforms: :jruby
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/gemfiles/rails5_1_4.gemfile

@@ -8,14 +8,14 @@ group :development, :test do
   gem 'activemodel', '5.1.4'
   gem 'activerecord', '5.1.4'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: [:mri, :mswin, :mingw]
-  gem 'mysql2', '0.4.10', platforms: [:mri, :mswin, :mingw]
-  gem 'pg', '< 1.0.0', platforms: [:mri, :mingw]
+  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: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  gem 'tiny_tds', platforms: %i[mri mingw]  if RUBY_PLATFORM.match?(/windows/)
   # gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.8' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
@@ -27,4 +27,4 @@ group :development, :test do
   gem 'activerecord-jdbcmssql-adapter', platforms: :jruby
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/gemfiles/rails5_2.gemfile

@@ -4,7 +4,7 @@ gem 'rails', '~> 5.2.0'
 gem 'arel', '~> 9'
 
 group :development, :test do
-  gem 'bigdecimal', '1.3.5', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem 'bigdecimal', '1.3.5', platforms: %i[mri mingw x64_mingw mswin]
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
   gem 'activerecord', '~> 5.2.0'
@@ -13,10 +13,11 @@ group :development, :test do
   gem 'mysql2', '0.4.10', platforms: [:mri]
   gem 'pg', '< 1.0.0', platforms: [:mri]
 
-  gem 'tiny_tds', platforms: [:mri, :mingw, :x64_mingw, :mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 5.2', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 5.2', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
@@ -28,4 +29,4 @@ group :development, :test do
   gem 'activerecord-jdbcsqlserver-adapter', '~> 52.0', platforms: :jruby
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/gemfiles/rails6.gemfile

@@ -12,10 +12,11 @@ group :development, :test do
   gem 'mysql2', '0.5.2', platforms: [:mri]
   gem 'pg', '< 1.0.0', platforms: [:mri]
 
-  gem 'tiny_tds', platforms: [:mri, :mingw, :x64_mingw, :mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 6.0', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 6.0', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
@@ -26,4 +27,4 @@ group :development, :test do
   gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/gemfiles/rails6_1.gemfile

@@ -12,10 +12,11 @@ group :development, :test do
   gem 'mysql2', '0.5.2', platforms: [:mri]
   gem 'pg', '~> 1.1', platforms: [:mri]
 
-  gem 'tiny_tds', platforms: [:mri, :mingw, :x64_mingw, :mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 6.1.0', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 6.1.0', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
@@ -26,4 +27,4 @@ group :development, :test do
   gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/gemfiles/rails7.gemfile

@@ -12,11 +12,12 @@ group :development, :test do
   gem 'mysql2', '0.5.2', platforms: [:mri]
   gem 'pg', '~> 1.1', platforms: [:mri]
 
-  gem 'tiny_tds', platforms: [:mri, :mingw, :x64_mingw, :mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 7.0.0.0', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 7.0.0.0', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
 end
 
-gemspec path: '../'
+gemspec path: Dir.pwd

data/lib/arel_extensions/common_sql_functions.rb

@@ -38,8 +38,8 @@ module ArelExtensions
 
     def add_sql_functions(env_db = nil)
       env_db ||= @cnx.adapter_name
-      env_db = 'mysql' if env_db =~ /mysql/i
-      if env_db =~ /sqlite/i
+      env_db = 'mysql' if /mysql/i.match?(env_db)
+      if /sqlite/i.match?(env_db)
         begin
           add_sqlite_functions
         rescue => e

data/lib/arel_extensions/helpers.rb

@@ -17,11 +17,11 @@ module ArelExtensions
 
   def self.column_of_via_arel_table(table_name, column_name)
     Arel::Table.engine.connection.schema_cache.columns_hash(table_name)[column_name]
-    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}")
-      nil
+  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}")
+    nil
   end
 
   def self.column_of(table_name, column_name)
@@ -40,12 +40,12 @@ module ArelExtensions
         column_of_via_arel_table(table_name, column_name)
       end
     end
-    rescue ActiveRecord::ConnectionNotEstablished
-      column_of_via_arel_table(table_name, column_name)
-    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}")
-      nil
+  rescue ActiveRecord::ConnectionNotEstablished
+    column_of_via_arel_table(table_name, column_name)
+  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}")
+    nil
   end
 end