arel_toolkit 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85f00fe708ffd879f590ca295d142d1f3cfa600455bd470cb92d167e95bf838
-  data.tar.gz: 457b2e9b32edc91701ccb18605422581ee2413a53e7552ed77016d4de8f1edf9
+  metadata.gz: 8b20aac1b2e004c7d251e7e48aadbacc223df6fae248bbbfc4fba309e8135d66
+  data.tar.gz: dcb21b38da506edbcd72caafb15d6e5d911c86049abc5c61479d41d31930f193
 SHA512:
-  metadata.gz: 1a6e1f095fda8a0f1c0bdd59996610ea3f4547a9abff88ba716a06dcb4beea86c66e5da6ba824eb3eae2ae9b63a049c45a4ec93e5ef4885039b9bc90651cb4d9
-  data.tar.gz: ce81c70c0ee865f421cbc3be78fcc3b3fd31464ad836aed8f8f4b67e37b7092c0533cc5e2e899fbcab700fe7fb916c01ec919716c2fcd50f5605d3a148167e2d
+  metadata.gz: 572619fe51e9d76cad9a26e58c8205f132996a81f9e7a15dcd2692ef6bfb3d6553c2f6563eb2deaa8589fca7a1d710ea95647f2d5496f180b5a4152e77cffa50
+  data.tar.gz: 9aa9885eff763f559225a75f701205b6d6de6d5671bf4203917e7cd4cb420c0dfcdc273cf471309136b971840de458bdc8afd624995966380834280fd5b10f6d

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Exclude:
     - 'gemfiles/active_record_6.gemfile'
+    - 'gemfiles/active_record_6_1.gemfile'
     - 'gemfiles/arel_gems.gemfile'
     - 'gemfiles/default.gemfile'
 

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.3
+ruby 2.7.4

data/Appraisals

@@ -11,3 +11,7 @@ end
 appraise 'active_record_6' do
   gem 'activerecord', '~> 6.0.0'
 end
+
+appraise 'active_record_6_1' do
+  gem 'activerecord', '~> 6.1.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [v0.4.7](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.7) (2022-02-01)
+
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.6...v0.4.7)
+
+**Implemented enhancements:**
+
+- Bump google-protobuf from 3.17.3 to 3.19.2 [\#190](https://github.com/mvgijssel/arel_toolkit/pull/190) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.11.7 to 1.12.5 [\#189](https://github.com/mvgijssel/arel_toolkit/pull/189) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Add Rails 6.1 support [\#188](https://github.com/mvgijssel/arel_toolkit/pull/188) ([Willianvdv](https://github.com/Willianvdv))
+
 ## [v0.4.6](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.6) (2021-07-29)
 
 [Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.5...v0.4.6)

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    arel_toolkit (0.4.6)
-      activerecord (>= 5.0.0, < 6.0.4)
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
       pg_query (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activesupport (6.0.3.7)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
@@ -31,24 +31,24 @@ GEM
       nokogiri (~> 1.8)
       thor (~> 1.0)
     ast (2.4.2)
-    async (1.29.1)
+    async (1.30.1)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.56.3)
-      async (~> 1.25)
-      async-io (~> 1.28)
-      async-pool (~> 0.2)
+    async-http (0.56.5)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
       protocol-http (~> 0.22.0)
       protocol-http1 (~> 0.14.0)
       protocol-http2 (~> 0.14.0)
     async-http-faraday (0.11.0)
       async-http (~> 0.42)
       faraday
-    async-io (1.32.1)
-      async (~> 1.14)
-    async-pool (0.3.7)
-      async (~> 1.25)
+    async-io (1.32.2)
+      async
+    async-pool (0.3.8)
+      async (>= 1.25)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     coderay (1.1.3)
@@ -60,7 +60,7 @@ GEM
     diff-lcs (1.4.4)
     docile (1.4.0)
     dpl (1.10.16)
-    faraday (1.5.1)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -68,6 +68,7 @@ GEM
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -79,7 +80,8 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
-    ffi (1.15.3)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
     fiber-local (1.0.0)
     formatador (0.3.0)
     github_changelog_generator (1.16.4)
@@ -91,7 +93,7 @@ GEM
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-    google-protobuf (3.17.3)
+    google-protobuf (3.19.4)
     guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -118,20 +120,20 @@ GEM
     interception (0.5)
     jaro_winkler (1.5.4)
     json (2.5.1)
-    listen (3.5.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     memory_profiler (0.9.14)
     method_source (0.9.2)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -139,15 +141,15 @@ GEM
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     pg (1.1.4)
-    pg_query (2.1.0)
-      google-protobuf (>= 3.17.1)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     protocol-hpack (1.4.2)
     protocol-http (0.22.5)
-    protocol-http1 (0.14.1)
+    protocol-http1 (0.14.2)
       protocol-http (~> 0.22)
     protocol-http2 (0.14.2)
       protocol-hpack (~> 1.4)
@@ -158,7 +160,7 @@ GEM
     pry-alias (0.0.1)
       binding_of_caller
       pry
-    pry-doc (1.1.0)
+    pry-doc (1.2.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
     pry-nav (0.3.0)
@@ -199,7 +201,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -215,10 +217,9 @@ GEM
     simplecov-html (0.10.2)
     stackprof (0.2.17)
     thor (1.1.0)
-    thread_safe (0.3.6)
     timers (4.3.3)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
     yard (0.9.26)
     zeitwerk (2.4.2)
@@ -254,4 +255,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.2.23
+   2.3.6

data/arel_toolkit.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/pg_result_init/extconf.rb']
 
-  spec.add_dependency 'activerecord', '>= 5.0.0', '< 6.0.4'
+  spec.add_dependency 'activerecord', '>= 5.0.0'
   spec.add_dependency 'pg', '~> 1.1.4'
   spec.add_dependency 'pg_query', '~> 2.1'
 

data/gemfiles/active_record_6.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.6)
-      activerecord (>= 5.0.0, < 6.0.4)
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
       pg_query (~> 2.1)
 
@@ -55,7 +55,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
-    google-protobuf (3.17.3)
+    google-protobuf (3.19.4-x86_64-darwin)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -105,8 +105,8 @@ GEM
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.1.4)
-    pg_query (2.1.0)
-      google-protobuf (>= 3.17.1)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -209,4 +209,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.2.23
+   2.3.6

data/gemfiles/active_record_6_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/active_record_6_1.gemfile.lock

@@ -0,0 +1,263 @@
+PATH
+  remote: ..
+  specs:
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
+      pg (~> 1.1.4)
+      pg_query (~> 2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    approvals (0.0.25)
+      nokogiri (~> 1.8)
+      thor (~> 1.0)
+    ast (2.4.2)
+    async (1.30.1)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.56.5)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
+      protocol-http (~> 0.22.0)
+      protocol-http1 (~> 0.14.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-faraday (0.11.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.32.2)
+      async
+    async-pool (0.3.8)
+      async (>= 1.25)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    console (1.13.1)
+      fiber-local
+    database_cleaner (1.7.0)
+    debug_inspector (1.1.0)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    dpl (1.10.16)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
+    fiber-local (1.0.0)
+    formatador (0.3.0)
+    github_changelog_generator (1.16.4)
+      activesupport
+      async (>= 1.25.0)
+      async-http-faraday
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+    google-protobuf (3.19.4-x86_64-darwin)
+    guard (2.17.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rake (1.0.0)
+      guard
+      rake
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.3.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    hirb (0.7.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    interception (0.5)
+    jaro_winkler (1.5.4)
+    json (2.5.1)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    memory_profiler (0.9.14)
+    method_source (0.9.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    nenv (0.3.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.4)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.4-x86_64-darwin)
+      racc (~> 1.4)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (4.21.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pg (1.1.4)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
+    protocol-hpack (1.4.2)
+    protocol-http (0.22.5)
+    protocol-http1 (0.14.2)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-alias (0.0.1)
+      binding_of_caller
+      pry
+    pry-doc (1.2.0)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rescue (1.5.2)
+      interception (>= 0.5)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    rake-compiler (1.1.1)
+      rake
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (0.71.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    shellany (0.0.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-console (0.4.2)
+      ansi
+      hirb
+      simplecov
+    simplecov-html (0.10.2)
+    stackprof (0.2.17)
+    thor (1.1.0)
+    timers (4.3.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.6.1)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  aarch64-linux
+  x86_64-darwin-20
+  x86_64-darwin-21
+
+DEPENDENCIES
+  activerecord (~> 6.1.0)
+  appraisal (~> 2.4.1)
+  approvals (~> 0.0.24)
+  arel_toolkit!
+  bundler (~> 2.0)
+  database_cleaner (~> 1.7.0)
+  dpl (~> 1.10.11)
+  github_changelog_generator (~> 1.15)
+  guard (~> 2.15)
+  guard-rake (~> 1.0.0)
+  guard-rspec (~> 4.7)
+  guard-rubocop (~> 1.3.0)
+  memory_profiler (~> 0.9)
+  pry
+  pry-alias
+  pry-doc
+  pry-nav
+  pry-rescue
+  pry-stack_explorer
+  rake (~> 13.0)
+  rake-compiler (~> 1.0)
+  rspec (~> 3.8)
+  rubocop (= 0.71.0)
+  simplecov (~> 0.16.1)
+  simplecov-console (~> 0.4.2)
+  stackprof (~> 0.2)
+
+BUNDLED WITH
+   2.3.6

data/gemfiles/arel_gems.gemfile.lock

@@ -31,8 +31,8 @@ GIT
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.6)
-      activerecord (>= 5.0.0, < 6.0.4)
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
       pg_query (~> 2.1)
 
@@ -101,7 +101,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
-    google-protobuf (3.17.3)
+    google-protobuf (3.19.4-x86_64-darwin)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -155,8 +155,8 @@ GEM
       ast (~> 2.4.0)
     pg (1.1.4)
     pg_array_parser (0.0.9)
-    pg_query (2.1.0)
-      google-protobuf (>= 3.17.1)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -283,4 +283,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.2.23
+   2.3.6

data/gemfiles/default.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.6)
-      activerecord (>= 5.0.0, < 6.0.4)
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
       pg_query (~> 2.1)
 
@@ -55,7 +55,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
-    google-protobuf (3.17.3)
+    google-protobuf (3.19.4-x86_64-darwin)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -105,8 +105,8 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     pg (1.1.4)
-    pg_query (2.1.0)
-      google-protobuf (>= 3.17.1)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -207,4 +207,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.2.23
+   2.3.6

data/lib/arel/enhance/context_enhancer/arel_table.rb

@@ -22,6 +22,10 @@ module Arel
                 node.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
             context[:range_variable] = true
 
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
+            context[:range_variable] = true
+
           # Using Arel::Table as SELECT ... FROM [<table>]
           elsif parent_object.is_a?(Array) &&
                 node.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
@@ -35,10 +39,26 @@ module Arel
                 node.parent.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
             context[:range_variable] = true
 
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.object.is_a?(Arel::Attributes::Attribute)
+            context[:column_reference] = true
+
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.parent.object.is_a?(Arel::Attributes::Attribute)
+            context[:column_reference] = true
+
           # Using Arel::Table as SELECT ... INNER JOIN <table> ON TRUE
           elsif parent_object.is_a?(Arel::Nodes::Join)
             context[:range_variable] = true
 
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.object.is_a?(Arel::Nodes::Join)
+            context[:range_variable] = true
+
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.parent.object.is_a?(Arel::Nodes::Join)
+            context[:range_variable] = true
+
           # Using Arel::Table as an attribute SELECT <table>.id ...
           elsif parent_object.is_a?(Arel::Attributes::Attribute)
             context[:column_reference] = true

data/lib/arel/enhance/node.rb

@@ -217,6 +217,8 @@ module Arel
           else
             parent_object[local_path.value] = new_arel_node
           end
+        elsif parent_object.is_a?(Arel::Nodes::TableAlias) && local_path.value == 'relation'
+          parent_object.instance_variable_set('@left', new_arel_node)
         else
           raise "Don't know how to replace `#{local_path.value}` in #{parent_object.inspect}"
         end

data/lib/arel/enhance/visitor.rb

@@ -14,7 +14,7 @@ module Arel
         @context_enhancers = context_enhancers
 
         root_node = Arel::Enhance::Node.new(object)
-        accept_with_root(object, root_node)
+        accept_with_root(object, root_node, context_enhancers)
       end
 
       def accept_with_root(object, root_node, context_enhancers = DEFAULT_CONTEXT_ENHANCERS)

data/lib/arel/enhance.rb

@@ -9,9 +9,9 @@ module Arel
   module Enhance
   end
 
-  def self.enhance(object)
+  def self.enhance(object, context_enhancers = Arel::Enhance::Visitor::DEFAULT_CONTEXT_ENHANCERS)
     return object if object.is_a?(Arel::Enhance::Node)
 
-    Arel::Enhance::Visitor.new.accept(object)
+    Arel::Enhance::Visitor.new.accept(object, context_enhancers)
   end
 end

data/lib/arel/extensions/overlaps.rb

@@ -4,7 +4,13 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/10/functions-string.html
-    class Overlaps < Arel::Nodes::Node
+    inheritance_class = if Gem.loaded_specs['activerecord'].version < Gem::Version.new('6.1.0')
+                          Arel::Nodes::Node
+                        else
+                          Arel::Nodes::InfixOperation
+                        end
+
+    class Overlaps < inheritance_class
       attr_reader :start1
       attr_reader :end1
       attr_reader :start2

data/lib/arel/extensions/table.rb

@@ -15,7 +15,8 @@ module Arel
       def initialize(
         name,
         as: nil,
-        type_caster: nil,
+        klass: nil,
+        type_caster: klass&.type_caster,
         only: false,
         schema_name: nil,
         relpersistence: 'p'
@@ -24,7 +25,11 @@ module Arel
         @schema_name = schema_name
         @relpersistence = relpersistence
 
-        super(name, as: as, type_caster: type_caster)
+        if Gem.loaded_specs['activerecord'].version < Gem::Version.new('6.1.0')
+          super(name, as: as, type_caster: type_caster)
+        else
+          super(name, klass: klass, as: as, type_caster: type_caster)
+        end
       end
     end
 

data/lib/arel/extensions/tree_manager.rb

@@ -1,11 +1,6 @@
 module Arel
   class TreeManager
     # Iterate through AST, nodes will be yielded depth-first
-    def each(&block)
-      return enum_for(:each) unless block_given?
-
-      ::Arel::Visitors::DepthFirst.new(block).accept ast
-    end
 
     def to_sql_and_binds(engine = Arel::Table.engine)
       collector = engine.connection.send(:collector)

data/lib/arel/sql_to_arel/pg_query_visitor.rb

@@ -630,7 +630,7 @@ module Arel
         select_core.projections = visit(attribute.target_list, :select) if attribute.target_list
 
         if attribute.where_clause
-          where_clause = visit(attribute.where_clause)
+          where_clause = visit(attribute.where_clause, :select)
           where_clause = if where_clause.is_a?(Arel::Nodes::And)
                            where_clause
                          else

data/lib/arel/transformer.rb

@@ -1,6 +1,5 @@
 require_relative './transformer/prefix_schema_name'
 require_relative './transformer/replace_table_with_subquery'
-require_relative './transformer/remove_active_record_info'
 
 module Arel
   module Transformer

data/lib/arel_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ArelToolkit
-  VERSION = '0.4.6'.freeze
+  VERSION = '0.4.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - maarten
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +427,8 @@ files:
 - gemfiles/.bundle/config
 - gemfiles/active_record_6.gemfile
 - gemfiles/active_record_6.gemfile.lock
+- gemfiles/active_record_6_1.gemfile
+- gemfiles/active_record_6_1.gemfile.lock
 - gemfiles/arel_gems.gemfile
 - gemfiles/arel_gems.gemfile.lock
 - gemfiles/default.gemfile
@@ -578,7 +574,6 @@ files:
 - lib/arel/sql_to_arel/result.rb
 - lib/arel/transformer.rb
 - lib/arel/transformer/prefix_schema_name.rb
-- lib/arel/transformer/remove_active_record_info.rb
 - lib/arel/transformer/replace_table_with_subquery.rb
 - lib/arel_toolkit.rb
 - lib/arel_toolkit/version.rb

data/lib/arel/transformer/remove_active_record_info.rb

@@ -1,40 +0,0 @@
-module Arel
-  module Transformer
-    class RemoveActiveRecordInfo
-      class << self
-        def call(arel, next_middleware)
-          tree = Arel.enhance(arel)
-
-          tree.query(class: Arel::Table).each do |node|
-            node['type_caster'].remove
-          end
-
-          tree.query(class: Arel::Nodes::BindParam).each do |node|
-            node.replace(
-              cast_for_database(node.object.value.value_for_database),
-            )
-          end
-
-          next_middleware.call tree.object
-        end
-
-        private
-
-        def cast_for_database(value)
-          case value
-          when String
-            Arel::Nodes.build_quoted(value)
-          when Integer
-            value
-          when TrueClass
-            Arel::Nodes::TypeCast.new(Arel::Nodes::Quoted.new('t'), 'bool')
-          when FalseClass
-            Arel::Nodes::TypeCast.new(Arel::Nodes::Quoted.new('f'), 'bool')
-          else
-            raise "Unknown value cast `#{value}` with class `#{value.class}`"
-          end
-        end
-      end
-    end
-  end
-end