arel_extensions 2.1.11 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ed1c7c69dbce9930be558b479f990bc8fd02ef832636d6e85fb8f61e49e061
-  data.tar.gz: a21b33e04a82e151ea316b51c77fb2194651e50e17cdb59aa1aac4877ce1cc91
+  metadata.gz: 4aedfa89fd11432debf6ba61fb1e886d8f28eb7a294c997576726d9e37ca4686
+  data.tar.gz: 311b54b4b82336dcc62ac4b2637594219a9247f0a46f0b17d085670244e62a6b
 SHA512:
-  metadata.gz: 892869bfbd9decc4455adb28192ba6215b2e1233507511dcf7c11dc22c3e381bf78b71143de3696d2182b00db6db1d5f96576ce0e75185d46a8924146f78631a
-  data.tar.gz: 7977681161be54fc824bd359aa3bc684c3945b1129b323cc21bb2b82cb3955173f1c40e9096fa52ad28016235d45644bac2666fae3519c90b6635642820ab68e
+  metadata.gz: e218dc06b3c421472981e4a97db46bfdd29f1cf2ec9c4e0af1504032d604b542ed2c02bb97e5ea61e361f09f8c3726c34b07bfa7eeeb519728284a829d3c9978
+  data.tar.gz: fdb8f5763e31fd9c8aa59f66b95b2b2700049ecc0ee544d1f8880b659e0c48e6a6e091ee9788cd99f59a6d57c7d47b27140a4e64025add61c2697e17358d9ede

data/.github/workflows/ruby.yml

@@ -20,13 +20,16 @@ jobs:
       matrix:
         versions:
           [
+            { ruby: "3.3", rails: 7_2, arelx: 2 },
             { ruby: "3.3", rails: 7_1, arelx: 2 },
             { ruby: "3.3", rails: 7, arelx: 2 },
             { ruby: "3.3", rails: 6_1, arelx: 2 },
+            { ruby: "3.2", rails: 7_2, arelx: 2 },
             { ruby: "3.2", rails: 7_1, arelx: 2 },
             { ruby: "3.2", rails: 7, arelx: 2 },
             { ruby: "3.2", rails: 6, arelx: 2 },
             { ruby: "3.2", rails: 6_1, arelx: 2 },
+            { ruby: "3.1", rails: 7_2, 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 },
@@ -61,11 +64,10 @@ jobs:
         run: |
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
-      - name: Setup Gemfile for arelx 2.x
-        if: ${{ matrix.versions.arelx == 2 }}
+      - name: Setup Gemfile
         run: |
-          cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
-          cp ./version_v2.rb lib/arel_extensions/version.rb
+          cp ./gemspecs/arel_extensions-v${{ matrix.versions.arelx }}.gemspec ./arel_extensions.gemspec
+          cp ./version_v${{ matrix.versions.arelx }}.rb lib/arel_extensions/version.rb
           cp ./gemfiles/rails${{ matrix.versions.rails }}.gemfile ./Gemfile
       - name: bundle install
         run: |
@@ -82,13 +84,16 @@ jobs:
       matrix:
         versions:
           [
+            { ruby: "3.3", rails: 7_2, arelx: 2 },
             { ruby: "3.3", rails: 7_1, arelx: 2 },
             { ruby: "3.3", rails: 7, arelx: 2 },
             { ruby: "3.3", rails: 6_1, arelx: 2 },
+            { ruby: "3.2", rails: 7_2, arelx: 2 },
             { 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.2", rails: 6, arelx: 2 },
+            { ruby: "3.1", rails: 7_2, arelx: 2 },
             { ruby: "3.1", rails: 7_1, arelx: 2 },
             { ruby: "3.1", rails: 7, arelx: 2 },
             { ruby: "3.1", rails: 6, arelx: 2 },
@@ -125,10 +130,9 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
       - name: Setup Gemfile
-        if: ${{ matrix.versions.arelx == 2 }}
         run: |
-          cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
-          cp ./version_v2.rb lib/arel_extensions/version.rb
+          cp ./gemspecs/arel_extensions-v${{ matrix.versions.arelx }}.gemspec ./arel_extensions.gemspec
+          cp ./version_v${{ matrix.versions.arelx }}.rb lib/arel_extensions/version.rb
           cp ./gemfiles/rails${{ matrix.versions.rails }}.gemfile ./Gemfile
       - name: bundle install
         run: |
@@ -144,13 +148,16 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
+            { ruby: "3.3", rails: 7_2, arelx: 2 },
             { ruby: "3.3", rails: 7_1, arelx: 2 },
             { ruby: "3.3", rails: 7, arelx: 2 },
             { ruby: "3.3", rails: 6_1, arelx: 2 },
+            { ruby: "3.2", rails: 7_2, arelx: 2 },
             { 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.2", rails: 6, arelx: 2 }, # cannot test > undefined symbol: rb_tainted_str_new2
+            { ruby: "3.1", rails: 7_2, 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 },
@@ -209,10 +216,9 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
       - name: Setup Gemfile
-        if: ${{ matrix.versions.arelx == 2 }}
         run: |
-          cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
-          cp ./version_v2.rb lib/arel_extensions/version.rb
+          cp ./gemspecs/arel_extensions-v${{ matrix.versions.arelx }}.gemspec ./arel_extensions.gemspec
+          cp ./version_v${{ matrix.versions.arelx }}.rb lib/arel_extensions/version.rb
           cp ./gemfiles/rails${{ matrix.versions.rails }}.gemfile ./Gemfile
       - name: bundle install
         run: |
@@ -231,13 +237,16 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
+            { ruby: "3.3", rails: 7_2, arelx: 2 },
             { ruby: "3.3", rails: 7_1, arelx: 2 },
             { ruby: "3.3", rails: 7, arelx: 2 },
             { ruby: "3.3", rails: 6_1, arelx: 2 },
+            { ruby: "3.2", rails: 7_2, arelx: 2 },
             { 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.2", rails: 6, arelx: 2 }, # cannot test > undefined symbol: rb_tainted_str_new2
+            { ruby: "3.1", rails: 7_2, 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 },
@@ -288,10 +297,9 @@ jobs:
           sudo apt-get update -q
           sudo apt-get install -y freetds-dev
       - name: Setup Gemfile
-        if: ${{ matrix.versions.arelx == 2 }}
         run: |
-          cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
-          cp ./version_v2.rb lib/arel_extensions/version.rb
+          cp ./gemspecs/arel_extensions-v${{ matrix.versions.arelx }}.gemspec ./arel_extensions.gemspec
+          cp ./version_v${{ matrix.versions.arelx }}.rb lib/arel_extensions/version.rb
           cp ./gemfiles/rails${{ matrix.versions.rails }}.gemfile ./Gemfile
       - name: bundle install
         run: |
@@ -373,10 +381,9 @@ jobs:
           install: sqlengine, sqlclient, sqlpackage, localdb
           sa-password: Password12!
       - name: Setup Gemfile
-        if: ${{ matrix.versions.arelx == 2 }}
         run: |
-          cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
-          cp ./version_v2.rb lib/arel_extensions/version.rb
+          cp ./gemspecs/arel_extensions-v${{ matrix.versions.arelx }}.gemspec ./arel_extensions.gemspec
+          cp ./version_v${{ matrix.versions.arelx }}.rb lib/arel_extensions/version.rb
           cp ./gemfiles/rails${{ matrix.versions.rails }}.gemfile ./Gemfile
       - name: bundle install
         run: |

data/CONTRIBUTING.md

@@ -0,0 +1,102 @@
+# Contributing
+
+Your PRs are welcome.
+
+## Local Development
+
+Let's say you want to develop/test for `ruby 2.7.5` and `rails 5.2`.
+
+You will need to fix your ruby version:
+
+```bash
+rbenv install 2.7.5
+rbenv local 2.7.5
+```
+
+Fix your gemfiles:
+
+```bash
+bundle config set --local gemfile ./gemfiles/rails6.gemfile
+cp gemspecs/arel_extensions-v2.gemspec arel_extensions.gemspec
+```
+
+Or by copying:
+
+```bash
+cp gemfiles/gemfiles/rails6.gemfile Gemfiles
+cp gemspecs/arel_extensions-v2.gemspec arel_extensions.gemspec
+```
+
+Install dependencies:
+```bash
+bundle install
+```
+
+> [!IMPORTANT]
+> Sometimes you might need to delete `vendor` dirs.
+> If you use `bundle config set --local gemfile`, it will be in `gemfiles/vendor`.
+> If you just `cp gemfiles/…`, it will be in `vendor`.
+
+Develop, then test:
+
+```bash
+bundle exec rake test:to_sql
+```
+
+Refer to the [Version Compatibility](#version-compatibility) section to correctly
+set your gemfile.
+
+## Testing many DBs without installing them
+
+We provide a `docker compose` to set up some databases for testing:
+
+```bash
+docker compose -f dev/compose.yaml up --exit-code-from arelx
+```
+
+Or simply call `bin/compose`.
+
+The databases, versions of arelx, and versions of ruby are all read from the
+matrixes defined in `.github/workflow/ruby.yml`. To test a specific
+configuration, all you have to do is comment the versions you're not
+insterested in.
+
+> [!IMPORTANT]
+> This methods conflicts with the [Local development](#local-development) method.
+> If you find yourself jumping between both, make sure you delete `Gemfile.lock`
+> and `vendor/`.
+
+### VSCode
+
+You can use the following `launch.json` to debug:
+
+```json
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "rdbg",
+      "name": "Debug DB",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "script": "test/with_ar/all_agnostic_test.rb",
+      "command": "bundle exec ruby -Ilib -Itest",
+      "env": {
+        "DB": "postgresql"
+      },
+      "useBundler": false,
+      "askParameters": false
+    },
+    {
+      "type": "rdbg",
+      "name": "Debug to_sql",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "script": "test/visitors/test_to_sql.rb",
+      "command": "bundle exec ruby -Ilib -Itest",
+      "useBundler": false,
+      "askParameters": false
+    }
+  ]
+}
+```

data/Gemfile

@@ -1,24 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
-
-group :development, :test do
-  gem 'sqlite3', '<= 1.3.13', platforms: [:mri]
-  gem 'mysql2', '0.4.10', platforms: [:mri]
-  gem 'pg', '< 1', platforms: [:mri]
-
-  gem 'jdbc-sqlite3', platforms: :jruby
-  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
-  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
-  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
-
-  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: %i[mri mswin x64_mingw mingw]
-  gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
-
-  gem 'activesupport', '~> 6.0'
-  gem 'activemodel', '~> 6.0'
-  gem 'activerecord', '~> 6.0'
-end
+gemspec path: Dir.pwd

data/NEWS.md

@@ -1,5 +1,13 @@
 # News
 
+## Release v2.2.0/v1.4.0
+
+- MS SQL: restrict date-quoting to Arel <= 6 (Rails 4.2)
+- MS SQL: turn on warnings on requires only when gem is found
+- Rails: 7.2 support for mysql, postgres, and sqlite.
+- Attributes: deprecate `==` and `!=`. They're causing issues with
+  `active_record`, and they're not sanitary.
+
 ## Release v2.1.11/v1.3.11
 
 - MS SQL: turn on warnings on requires only when necessary.

data/README.md

@@ -740,46 +740,3 @@ User.connection.execute(insert_manager.to_sql)
   <tr><td>2.5</td>  <td>6.1, 6.0</td> <td>2</td></tr>
   <tr><td>2.5</td>  <td>5.2</td>      <td>1</td></tr>
 </table>
-
-## Development
-
-Let's say you want to develop/test for `ruby 2.7.5` and `rails 5.2`.
-
-You will need to fix your ruby version:
-
-```bash
-rbenv install 2.7.5
-rbenv local 2.7.5
-```
-
-Fix your gemfiles:
-
-```bash
-bundle config set --local gemfile ./gemfiles/rails6.gemfile
-```
-
-Install dependencies:
-```bash
-bundle install
-```
-
-Develop, then test:
-
-```bash
-bundle exec rake test:to_sql
-```
-
-Refer to the [Version Compatibility](#version-compatibility) section to correctly
-set your gemfile.
-
-### Testing databases locally
-
-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/bin/compose

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+IFS=$'\n\t'
+set -euo pipefail
+
+docker compose -f dev/compose.yaml up --exit-code-from arelx

data/dev/arelx.dockerfile

@@ -0,0 +1,44 @@
+FROM ubuntu:22.04
+
+ENV RBENV_ROOT=/opt/rbenv
+ENV PATH=${RBENV_ROOT}/shims:${RBENV_ROOT}/bin:${PATH}
+ENV APP_HOME=/app
+# I know there's a more reliable way, but this is simpler.
+ENV IN_DOCKER=true
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN mkdir -p $APP_HOME
+
+RUN apt-get update -q && apt-get install -y \
+  curl bundler build-essential git gnupg locales \
+  libbz2-dev libffi-dev liblzma-dev lsb-release libsqlite3-dev libyaml-dev \
+  make openjdk-17-jdk-headless ruby-dev ruby-full tzdata zlib1g-dev \
+  && ln -fs /usr/share/zoneinfo/UTC /etc/localtime \
+  && dpkg-reconfigure --frontend noninteractive tzdata
+
+RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg \
+  && echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee  /etc/apt/sources.list.d/pgdg.list \
+  && curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc \
+  && curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | tee /etc/apt/sources.list.d/mssql-release.list \
+  && apt-get update -q
+
+RUN ACCEPT_EULA=y DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  freetds-dev libmysqlclient-dev mysql-client msodbcsql18 mssql-tools18 unixodbc-dev libpq-dev \
+  && echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* \
+  && locale-gen en_US.UTF-8
+
+RUN /bin/bash -c "source ~/.bashrc"
+
+RUN mkdir -p ${RBENV_ROOT} \
+  && git clone https://github.com/rbenv/rbenv.git ${RBENV_ROOT} \
+  && git clone --depth 1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build \
+  && rbenv init - \
+  && rbenv global system
+
+WORKDIR $APP_HOME
+COPY ./dev/rbenv ./dev/rbenv
+COPY ./.github/workflows/ruby.yml ./.github/workflows/ruby.yml
+RUN /usr/bin/gem install colorize psych toml-rb
+RUN ./dev/rbenv install && rm ./dev/rbenv ./.github/workflows/ruby.yml

data/dev/compose.yaml

@@ -1,5 +1,21 @@
-name: arelx-dbs
+name: arelx
 services:
+  arelx:
+    container_name: arelx-build
+    build:
+      context: ..
+      dockerfile: dev/arelx.dockerfile
+    volumes:
+      - ../:/app
+    entrypoint: ["/usr/bin/ruby", "dev/rbenv", "test"]
+    network_mode: "host"
+    depends_on:
+      mariadb:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+      mssql:
+        condition: service_healthy
   mariadb:
     image: mariadb:11.0
     container_name: mariadb
@@ -8,13 +24,16 @@ services:
       MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true
     ports:
       - "3306:3306"
+    network_mode: "host"
     healthcheck:
       test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
       interval: 10s
       timeout: 5s
       retries: 3
   postgres:
-    image: postgres:15
+    build:
+      context: ..
+      dockerfile: dev/postgres.dockerfile
     container_name: postgres
     environment:
       POSTGRES_USER: postgres
@@ -22,6 +41,7 @@ services:
       POSTGRES_DB: arelx_test
     ports:
       - "5432:5432"
+    network_mode: "host"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
       interval: 10s
@@ -35,3 +55,17 @@ services:
       ACCEPT_EULA: Y
     ports:
       - "1433:1433"
+    network_mode: "host"
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $${MSSQL_SA_PASSWORD} -Q 'SELECT 1'",
+        ]
+      interval: 30s
+      retries: 5
+      timeout: 10s
+
+networks:
+  default:
+    name: arelx-network

data/dev/postgres.dockerfile

@@ -0,0 +1,5 @@
+FROM postgres:16
+
+RUN locale-gen fr_FR.utf8 && update-locale
+RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8
+# ENV LANG fr_FR.utf8

data/dev/rbenv

@@ -0,0 +1,189 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'colorize'
+require 'etc'
+require 'open3'
+require 'pathname'
+require 'stringio'
+require 'toml-rb'
+require 'psych'
+
+workflow = Pathname('.github/workflows/ruby.yml').read.gsub!(/rails: (\d(_\d)?)/, 'rails: "\1"')
+jobs = Psych.load(workflow, symbolize_names: true)[:jobs]
+data = {}
+jobs.each do |name, details|
+  details[:strategy][:matrix][:versions].each do |entry|
+    db = name.to_s.gsub(/\Ajob_test_/, '').to_sym
+    ruby = entry[:ruby]
+    rails = entry[:rails]
+    arelx = entry[:arelx]
+    gemspec = :"arel_extensions-v#{arelx}"
+    gemfile = :"rails#{rails}"
+
+    data[db] ||= {}
+    data[db][gemspec] ||= {}
+    data[db][gemspec][gemfile] ||= []
+    data[db][gemspec][gemfile] << ruby
+    data[db][gemspec][gemfile].sort!
+  end
+end
+
+MATRIX = data.freeze
+
+def sh(command, exit_on_fail: true, stealth: false)
+  cmd, args = command.split(' ', 2)
+  puts "#{'$'.green.bold} #{cmd.blue} #{args&.yellow}"
+  Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+    stdin.close
+    out, err =
+      if stealth
+        [StringIO.new, StringIO.new]
+      else
+        [$stdout, $stderr]
+      end
+    th_out = Thread.new do
+      stdout.each_line { |line| out.puts line }
+    end
+    th_err = Thread.new do
+      stderr.each_line { |line| err.puts line }
+    end
+
+    th_out.join
+    th_err.join
+    wait_thr.join
+    exit_status = wait_thr.value.exitstatus
+    if exit_status.nonzero?
+      warn "'#{command}' failed with exit status #{exit_status}. Aborting …".red
+      warn stderr if !stealth
+      exit exit_status if exit_on_fail
+    end
+
+    if stealth
+      [out.string, err.string, (exit_status if !exit_on_fail)].compact
+    end
+  end
+end
+
+module RBEnv
+  RBENV_ROOT =
+    if (root = ENV['RBENV_ROOT']) && root && !root.strip.empty?
+      Pathname(root)
+    else
+      Pathname(Dir.home).join('.rbenv')
+    end.freeze
+  RBENV_BUILD = RBENV_ROOT.join('plugins').join('ruby-build').freeze
+  SHELL = Pathname(Etc.getpwuid.shell).basename.to_s.downcase.to_sym
+
+  def self.available_versions
+    out, _ = sh "rbenv versions --bare", stealth: true
+    res = out.lines.map(&:strip)
+    warn res
+    res
+  end
+
+  def self.ensure(ruby_version)
+    version = RBEnv.resolve_to_latest(ruby_version)
+    if self.installed?(version)
+      puts "#{version.yellow} already installed. Skipping …"
+    else
+      puts "Installing #{version.yellow}"
+      sh "rbenv install #{version}"
+    end
+    version
+  end
+
+  def self.install
+    if RBENV_ROOT.exist?
+      puts "#{RBENV_ROOT} exists. Skipping …"
+    else
+      sh "git clone --depth 1 https://github.com/rbenv/rbenv.git #{RBENV_ROOT}"
+      puts "Setup your shell to recognize rbenv. Check github.com/rbenv/rbenv."
+    end
+
+    if RBENV_BUILD.exist?
+      puts "#{RBENV_BUILD} exists. Skipping …"
+    else
+      sh "git clone --depth 1 https://github.com/rbenv/ruby-build.git #{RBENV_BUILD}"
+    end
+  end
+
+  def self.installed?(version)
+    installed = available_versions
+    puts "installed? = #{installed}"
+    installed && !installed.empty? && installed.include?(version)
+  end
+
+  def self.resolve_to_latest(version)
+    out, _ = sh "rbenv install --list-all", stealth: true
+    out
+      .lines
+      .map(&:strip)
+      .select { |v| v.match(/^#{Regexp.escape(version)}\.\d+/) }
+      .max_by { |v| v.split('.').map(&:to_i) }
+  end
+
+  def self.set(version)
+    sh "rbenv local #{version}"
+  end
+end
+
+module CI
+  def self.help(*_args)
+    puts "Usage:"
+    puts "    #{$0} [#{CI.singleton_class.instance_methods(false).sort.join(' | ')}]"
+    puts
+    puts "You can ask for many commands."
+  end
+
+  def self.install(*_args)
+    RBEnv.install
+    MATRIX
+      .flat_map { |_, db|
+        db.flat_map { |_, arelx|
+          arelx.flat_map { |rails, rubies|
+            rails.start_with?("rails") ? rubies : []
+          }
+        }
+      }
+      .uniq
+      .sort
+      .each do |version|
+        RBEnv.ensure(version)
+      end
+  end
+
+  # @param args [Array<String>] a list of databases to test
+  def self.test(*args)
+    puts "Requested DBs: #{args.inspect}"
+    MATRIX.each do |db, arelx|
+      puts "db = #{db}; #{!args.empty? && args.include?(db)}"
+      if args.empty? || args.include?(db)
+        puts "Testing #{db}"
+      else
+        puts "Skipping #{db}"
+        next
+      end
+      arelx.each do |arelx_version, rails|
+        sh "cp ./gemspecs/#{arelx_version}.gemspec ./arel_extensions.gemspec"
+        rails.each do |rails_version, ruby|
+          sh "cp ./gemfiles/#{rails_version}.gemfile ./Gemfile"
+          ruby.each do |ruby_version|
+            full_version = RBEnv.ensure(ruby_version)
+            RBEnv.set(full_version)
+            sh "ruby --version"
+            sh "which ruby"
+            sh "rm -rf Gemfile.lock vendor"
+            sh "bundle config set --local path vendor"
+            sh "bundle install"
+            sh "bundle exec rake test:#{db}"
+          end
+        end
+      end
+    end
+  end
+end
+
+# main
+command = ARGV.size.nonzero? ? ARGV : %w[help]
+CI.send(command[0], *command[1..])

data/gemfiles/rails6.gemfile

@@ -2,8 +2,10 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 6.0.0'
 
-
 group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
   gem 'activesupport', '~> 6.0.0'
   gem 'activemodel', '~> 6.0.0'
   gem 'activerecord', '~> 6.0.0'

data/gemfiles/rails6_1.gemfile

@@ -2,8 +2,10 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 6.1.0'
 
-
 group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
   gem 'activesupport', '~> 6.1.0'
   gem 'activemodel', '~> 6.1.0'
   gem 'activerecord', '~> 6.1.0'

data/gemfiles/rails7.gemfile

@@ -2,8 +2,10 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 7.0.1'
 
-
 group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
   gem 'activesupport', '~> 7.0.1'
   gem 'activemodel', '~> 7.0.1'
   gem 'activerecord', '~> 7.0.1'

data/gemfiles/rails7_1.gemfile

@@ -3,6 +3,9 @@ source 'https://rubygems.org'
 gem 'rails', '~> 7.1'
 
 group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
   gem 'activesupport', '~> 7.1'
   gem 'activemodel', '~> 7.1'
   gem 'activerecord', '~> 7.1'

data/gemfiles/rails7_2.gemfile

@@ -0,0 +1,33 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.2'
+
+group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
+  gem 'activesupport', '~> 7.2'
+  gem 'activemodel', '~> 7.2'
+  gem 'activerecord', '~> 7.2'
+
+  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.2', 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'
+
+  # for JRuby
+  gem 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platform: :jruby
+  # gem 'activerecord-jdbc-alt-adapter', '~> 71.0.0.alpha1', platform: :jruby, require: true
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+gemspec path: Dir.pwd

data/lib/arel_extensions/attributes.rb

@@ -18,11 +18,22 @@ module ArelExtensions
     include ArelExtensions::StringFunctions
     include ArelExtensions::Predications
 
+    @@warn_eqeq = true
+    @@warn_noteq = true
+
     def ==(other)
+      if Gem::Version.create(ArelExtensions::VERSION) >= Gem::Version.create('2.2') && @@warn_eqeq
+        warn('arel_extensions: `==` is now deprecated and will be removed soon. Use `.eq` instead.')
+        @@warn_eqeq = false
+      end
       Arel::Nodes::Equality.new self, Arel.quoted(other, self)
     end
 
     def !=(other)
+      if Gem::Version.create(ArelExtensions::VERSION) >= Gem::Version.create('2.2') && @@warn_noteq
+        warn('arel_extensions: `!=` is now deprecated and will be removed soon. Use `.not_eq` instead.')
+        @@warn_noteq = false
+      end
       Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
     end
   end

data/lib/arel_extensions/helpers.rb

@@ -35,7 +35,11 @@ module ArelExtensions
     else
       if pool.respond_to?(:pool_config)
         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]
+          if ActiveRecord.version >= Gem::Version.create('7.2')
+            pool.pool_config.schema_reflection.columns_hash(pool, table_name)[column_name]
+          else
+            pool.pool_config.schema_reflection.columns_hash(ActiveRecord::Base.connection, table_name)[column_name]
+          end
         else # activerecord < 7.1
           pool.pool_config.schema_cache.columns_hash(table_name)[column_name]
         end
@@ -50,7 +54,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}")
+    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of`")
+    warn(e)
     warn(e.backtrace)
     nil
   end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.1.11'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -76,7 +76,7 @@ module ArelExtensions
       # The following is adapted from
       # https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
       #
-      if RUBY_PLATFORM == 'java'
+      if RUBY_PLATFORM == 'java' && Arel::VERSION.to_i <= 6
         def quote_string(s)
           s.gsub('\\', '\&\&').gsub("'", "''") # ' (for ruby-mode)
         end

data/lib/arel_extensions/visitors.rb

@@ -13,7 +13,9 @@ if RUBY_PLATFORM == 'java' \
   rescue LoadError
     warn 'arel/visitors/sqlserver not found: MSSQL might not work correctly.'
   end
-elsif RUBY_PLATFORM != 'java' && Arel::VERSION.to_i < 10
+elsif RUBY_PLATFORM != 'java' \
+  && Arel::VERSION.to_i < 10 \
+  && Gem::Specification.find { |g| g.name == 'activerecord-sqlserver-adapter' }
   begin
     require 'arel_sqlserver'
   rescue LoadError

data/lib/arel_extensions.rb

@@ -321,3 +321,25 @@ class Arel::Nodes::Node
     Arel::Nodes::RollUp.new([self])
   end
 end
+
+require 'active_record'
+if ActiveRecord.version >= Gem::Version.create('7.2')
+  class ActiveRecord::Relation::WhereClause
+    def except_predicates(columns)
+      attrs = columns.extract! { |node| node.is_a?(Arel::Attribute) }
+      non_attrs = columns.extract! { |node| node.is_a?(Arel::Predications) }
+
+      predicates.reject do |node|
+        if !non_attrs.empty? && node.equality? && node.left.is_a?(Arel::Predications)
+          non_attrs.include?(node.left)
+        end || Arel.fetch_attribute(node) do |attr|
+          attrs.find { |v| v.eql? attr } || columns.include?(attr.name.to_s) # 👈 replces
+          # attrs.include?(attr) || columns.include?(attr.name.to_s)         # 👈 this
+          #
+          # And that's because our attributes override `==`, so `attrs.include?(attr)` always
+          # passes because it returns an equality node.
+        end
+      end
+    end
+  end
+end

data/test/support/fake_record.rb

@@ -145,5 +145,11 @@ module FakeRecord
     def connection
       connection_pool.connection
     end
+
+    if ActiveRecord.version >= Gem::Version.create('7.2')
+      def with_connection(*args, **kwargs, &block)
+        connection_pool.with_connection(*args, **kwargs, &block)
+      end
+    end
   end
 end

data/test/with_ar/all_agnostic_test.rb

@@ -4,7 +4,6 @@ require 'date'
 module ArelExtensions
   module WithAr
     class ListTest < Minitest::Test
-      require 'minitest/pride'
       def connect_db
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx') || (RUBY_PLATFORM == 'java')) # not supported

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '1.3.11'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.1.11'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.2.0
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,6 +72,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE.txt
 - NEWS.md
@@ -82,8 +83,12 @@ files:
 - appveyor.yml
 - arel_extensions.gemspec
 - bin/build
+- bin/compose
 - bin/publish
+- dev/arelx.dockerfile
 - dev/compose.yaml
+- dev/postgres.dockerfile
+- dev/rbenv
 - functions.html
 - gemfiles/rails3.gemfile
 - gemfiles/rails4_2.gemfile
@@ -94,6 +99,7 @@ files:
 - gemfiles/rails6_1.gemfile
 - gemfiles/rails7.gemfile
 - gemfiles/rails7_1.gemfile
+- gemfiles/rails7_2.gemfile
 - gemspecs/arel_extensions-v1.gemspec
 - gemspecs/arel_extensions-v2.gemspec
 - generate_gems.sh