ransack 2.4.2 → 3.0.0

data/spec/ransack/search_spec.rb

@@ -20,10 +20,42 @@ module Ransack
         Search.new(Person, name_eq: 'foobar')
       end
 
-      it 'strip leading & trailing whitespace before building' do
-        expect_any_instance_of(Search).to receive(:build)
-        .with({ 'name_eq' => 'foobar' })
-        Search.new(Person, name_eq: '   foobar     ')
+      context 'whitespace stripping' do
+        context 'when whitespace_strip option is true' do
+          before do
+            Ransack.configure { |c| c.strip_whitespace = true }
+          end
+
+          it 'strips leading & trailing whitespace before building' do
+            expect_any_instance_of(Search).to receive(:build)
+            .with({ 'name_eq' => 'foobar' })
+            Search.new(Person, name_eq: '   foobar     ')
+          end
+        end
+
+        context 'when whitespace_strip option is false' do
+          before do
+            Ransack.configure { |c| c.strip_whitespace = false }
+          end
+
+          it 'doesn\'t strip leading & trailing whitespace before building' do
+            expect_any_instance_of(Search).to receive(:build)
+            .with({ 'name_eq' => '   foobar     ' })
+            Search.new(Person, name_eq: '   foobar     ')
+          end
+        end
+
+        it 'strips leading & trailing whitespace when strip_whitespace search parameter is true' do
+          expect_any_instance_of(Search).to receive(:build)
+          .with({ 'name_eq' => 'foobar' })
+          Search.new(Person, { name_eq: '   foobar     ' }, { strip_whitespace: true })
+        end
+
+        it 'doesn\'t strip leading & trailing whitespace when strip_whitespace search parameter is false' do
+          expect_any_instance_of(Search).to receive(:build)
+          .with({ 'name_eq' => '   foobar     ' })
+          Search.new(Person, { name_eq: '   foobar     ' }, { strip_whitespace: false })
+        end
       end
 
       it 'removes empty suffixed conditions before building' do
@@ -280,6 +312,29 @@ module Ransack
         expect { Search.new(Person, params) }.not_to change { params }
       end
 
+      context "ransackable_scope" do
+        around(:each) do |example|
+          Person.define_singleton_method(:name_eq) do |name|
+            self.where(name: name)
+          end
+
+          begin
+            example.run
+          ensure
+            Person.singleton_class.undef_method :name_eq
+          end
+        end
+
+        it "is prioritized over base predicates" do
+          allow(Person).to receive(:ransackable_scopes)
+            .and_return(Person.ransackable_scopes + [:name_eq])
+
+          s = Search.new(Person, name_eq: "Johny")
+          expect(s.instance_variable_get(:@scope_args)["name_eq"]).to eq("Johny")
+          expect(s.base[:name_eq]).to be_nil
+        end
+      end
+
     end
 
     describe '#result' do
@@ -300,8 +355,6 @@ module Ransack
       end
 
       it 'use appropriate table alias' do
-        skip "Rails 6 regressed here, but it's fixed in 6-0-stable since https://github.com/rails/rails/commit/f9ba52477ca288e7effa5f6794ae3df3f4e982bc" if ENV["RAILS"] == "v6.0.3"
-
         s = Search.new(Person, {
           name_eq: "person_name_query",
           articles_title_eq: "person_article_title_query",
@@ -451,82 +504,109 @@ module Ransack
         expect(sort.dir).to eq 'asc'
       end
 
-      it 'creates sorts based on multiple attributes/directions in array format' do
-        @s.sorts = ['id desc', { name: 'name', dir: 'asc' }]
+      it 'creates sorts based on a single alias/direction' do
+        @s.sorts = 'daddy desc'
+        expect(@s.sorts.size).to eq(1)
+        sort = @s.sorts.first
+        expect(sort).to be_a Nodes::Sort
+        expect(sort.name).to eq 'parent_name'
+        expect(sort.dir).to eq 'desc'
+      end
+
+      it 'creates sorts based on a single alias and uppercase direction' do
+        @s.sorts = 'daddy DESC'
+        expect(@s.sorts.size).to eq(1)
+        sort = @s.sorts.first
+        expect(sort).to be_a Nodes::Sort
+        expect(sort.name).to eq 'parent_name'
+        expect(sort.dir).to eq 'desc'
+      end
+
+      it 'creates sorts based on a single alias and without direction' do
+        @s.sorts = 'daddy'
+        expect(@s.sorts.size).to eq(1)
+        sort = @s.sorts.first
+        expect(sort).to be_a Nodes::Sort
+        expect(sort.name).to eq 'parent_name'
+        expect(sort.dir).to eq 'asc'
+      end
+
+      it 'creates sorts based on attributes, alias and directions in array format' do
+        @s.sorts = ['id desc', { name: 'daddy', dir: 'asc' }]
         expect(@s.sorts.size).to eq(2)
         sort1, sort2 = @s.sorts
         expect(sort1).to be_a Nodes::Sort
         expect(sort1.name).to eq 'id'
         expect(sort1.dir).to eq 'desc'
         expect(sort2).to be_a Nodes::Sort
-        expect(sort2.name).to eq 'name'
+        expect(sort2.name).to eq 'parent_name'
         expect(sort2.dir).to eq 'asc'
       end
 
-      it 'creates sorts based on multiple attributes and uppercase directions in array format' do
-        @s.sorts = ['id DESC', { name: 'name', dir: 'ASC' }]
+      it 'creates sorts based on attributes, alias and uppercase directions in array format' do
+        @s.sorts = ['id DESC', { name: 'daddy', dir: 'ASC' }]
         expect(@s.sorts.size).to eq(2)
         sort1, sort2 = @s.sorts
         expect(sort1).to be_a Nodes::Sort
         expect(sort1.name).to eq 'id'
         expect(sort1.dir).to eq 'desc'
         expect(sort2).to be_a Nodes::Sort
-        expect(sort2.name).to eq 'name'
+        expect(sort2.name).to eq 'parent_name'
         expect(sort2.dir).to eq 'asc'
       end
 
-      it 'creates sorts based on multiple attributes and different directions
+      it 'creates sorts based on attributes, alias and different directions
         in array format' do
-        @s.sorts = ['id DESC', { name: 'name', dir: nil }]
+        @s.sorts = ['id DESC', { name: 'daddy', dir: nil }]
         expect(@s.sorts.size).to eq(2)
         sort1, sort2 = @s.sorts
         expect(sort1).to be_a Nodes::Sort
         expect(sort1.name).to eq 'id'
         expect(sort1.dir).to eq 'desc'
         expect(sort2).to be_a Nodes::Sort
-        expect(sort2.name).to eq 'name'
+        expect(sort2.name).to eq 'parent_name'
         expect(sort2.dir).to eq 'asc'
       end
 
-      it 'creates sorts based on multiple attributes/directions in hash format' do
+      it 'creates sorts based on attributes, alias and directions in hash format' do
         @s.sorts = {
           '0' => { name: 'id', dir: 'desc' },
-          '1' => { name: 'name', dir: 'asc' }
+          '1' => { name: 'daddy', dir: 'asc' }
         }
         expect(@s.sorts.size).to eq(2)
         expect(@s.sorts).to be_all { |s| Nodes::Sort === s }
         id_sort = @s.sorts.detect { |s| s.name == 'id' }
-        name_sort = @s.sorts.detect { |s| s.name == 'name' }
+        daddy_sort = @s.sorts.detect { |s| s.name == 'parent_name' }
         expect(id_sort.dir).to eq 'desc'
-        expect(name_sort.dir).to eq 'asc'
+        expect(daddy_sort.dir).to eq 'asc'
       end
 
-      it 'creates sorts based on multiple attributes and uppercase directions
+      it 'creates sorts based on attributes, alias and uppercase directions
         in hash format' do
         @s.sorts = {
           '0' => { name: 'id', dir: 'DESC' },
-          '1' => { name: 'name', dir: 'ASC' }
+          '1' => { name: 'daddy', dir: 'ASC' }
         }
         expect(@s.sorts.size).to eq(2)
         expect(@s.sorts).to be_all { |s| Nodes::Sort === s }
         id_sort = @s.sorts.detect { |s| s.name == 'id' }
-        name_sort = @s.sorts.detect { |s| s.name == 'name' }
+        daddy_sort = @s.sorts.detect { |s| s.name == 'parent_name' }
         expect(id_sort.dir).to eq 'desc'
-        expect(name_sort.dir).to eq 'asc'
+        expect(daddy_sort.dir).to eq 'asc'
       end
 
-      it 'creates sorts based on multiple attributes and different directions
+      it 'creates sorts based on attributes, alias and different directions
         in hash format' do
         @s.sorts = {
           '0' => { name: 'id', dir: 'DESC' },
-          '1' => { name: 'name', dir: nil }
+          '1' => { name: 'daddy', dir: nil }
         }
         expect(@s.sorts.size).to eq(2)
         expect(@s.sorts).to be_all { |s| Nodes::Sort === s }
         id_sort = @s.sorts.detect { |s| s.name == 'id' }
-        name_sort = @s.sorts.detect { |s| s.name == 'name' }
+        daddy_sort = @s.sorts.detect { |s| s.name == 'parent_name' }
         expect(id_sort.dir).to eq 'desc'
-        expect(name_sort.dir).to eq 'asc'
+        expect(daddy_sort.dir).to eq 'asc'
       end
 
       it 'overrides existing sort' do
@@ -554,6 +634,39 @@ module Ransack
 
         Ransack.options = default
       end
+
+      it "PG's sort option with double name", if: ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" do
+        default = Ransack.options.clone
+
+        s = Search.new(Person, s: 'doubled_name asc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" ASC"
+
+        Ransack.configure { |c| c.postgres_fields_sort_option = :nulls_first }
+        s = Search.new(Person, s: 'doubled_name asc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" ASC NULLS FIRST"
+        s = Search.new(Person, s: 'doubled_name desc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" DESC NULLS LAST"
+
+        Ransack.configure { |c| c.postgres_fields_sort_option = :nulls_last }
+        s = Search.new(Person, s: 'doubled_name asc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" ASC NULLS LAST"
+        s = Search.new(Person, s: 'doubled_name desc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" DESC NULLS FIRST"
+
+        Ransack.configure { |c| c.postgres_fields_sort_option = :nulls_always_first }
+        s = Search.new(Person, s: 'doubled_name asc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" ASC NULLS FIRST"
+        s = Search.new(Person, s: 'doubled_name desc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" DESC NULLS FIRST"
+
+        Ransack.configure { |c| c.postgres_fields_sort_option = :nulls_always_last }
+        s = Search.new(Person, s: 'doubled_name asc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" ASC NULLS LAST"
+        s = Search.new(Person, s: 'doubled_name desc')
+        expect(s.result.to_sql).to eq "SELECT \"people\".* FROM \"people\" ORDER BY \"people\".\"name\" || \"people\".\"name\" DESC NULLS LAST"
+
+        Ransack.options = default
+      end
     end
 
     describe '#method_missing' do

data/spec/support/schema.rb

@@ -138,6 +138,45 @@ class Article < ActiveRecord::Base
   alias_attribute :content, :body
 
   default_scope { where("'default_scope' = 'default_scope'") }
+  scope :latest_comment_cont, lambda { |msg|
+    join = <<-SQL
+      (LEFT OUTER JOIN (
+          SELECT
+            comments.*,
+            row_number() OVER (PARTITION BY comments.article_id ORDER BY comments.id DESC) AS rownum
+          FROM comments
+        ) AS latest_comment
+        ON latest_comment.article_id = article.id
+        AND latest_comment.rownum = 1
+      )
+    SQL
+    .squish
+
+    joins(join).where("latest_comment.body ILIKE ?", "%#{msg}%")
+  }
+
+  ransacker :title_type, formatter: lambda { |tuples|
+    title, type = JSON.parse(tuples)
+    Arel::Nodes::Grouping.new(
+      [
+        Arel::Nodes.build_quoted(title),
+        Arel::Nodes.build_quoted(type)
+      ]
+    )
+  } do |_parent|
+    articles = Article.arel_table
+    Arel::Nodes::Grouping.new(
+      %i[title type].map do |field|
+        Arel::Nodes::NamedFunction.new(
+          'COALESCE',
+          [
+            Arel::Nodes::NamedFunction.new('TRIM', [articles[field]]),
+            Arel::Nodes.build_quoted('')
+          ]
+        )
+      end
+    )
+  end
 end
 
 class StoryArticle < Article
@@ -176,6 +215,11 @@ class Note < ActiveRecord::Base
   belongs_to :notable, polymorphic: true
 end
 
+class Account < ActiveRecord::Base
+  belongs_to :agent_account, class_name: "Account"
+  belongs_to :trade_account, class_name: "Account"
+end
+
 module Schema
   def self.create
     ActiveRecord::Migration.verbose = false
@@ -234,6 +278,11 @@ module Schema
         t.integer  :target_person_id
         t.integer  :article_id
       end
+
+      create_table :accounts, force: true do |t|
+        t.belongs_to :agent_account
+        t.belongs_to :trade_account
+      end
     end
 
     10.times do

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Ernie Miller
 - Ryan Bigg
 - Jon Atack
 - Sean Carroll
-autorequire: 
+- David Rodríguez
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,28 +20,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +73,7 @@ files:
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".nojekyll"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -81,20 +83,68 @@ files:
 - Rakefile
 - bug_report_templates/test-ransack-scope-and-column-same-name.rb
 - bug_report_templates/test-ransacker-arel-present-predicate.rb
-- docs/img/create_release.png
-- docs/release_process.md
-- lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb
+- docs/.gitignore
+- docs/.nojekyll
+- docs/babel.config.js
+- docs/blog/2022-03-27-ransack-3.0.0.md
+- docs/docs/getting-started/_category_.json
+- docs/docs/getting-started/advanced-mode.md
+- docs/docs/getting-started/configuration.md
+- docs/docs/getting-started/search-matches.md
+- docs/docs/getting-started/simple-mode.md
+- docs/docs/getting-started/sorting.md
+- docs/docs/getting-started/using-predicates.md
+- docs/docs/going-further/_category_.json
+- docs/docs/going-further/associations.md
+- docs/docs/going-further/custom-predicates.md
+- docs/docs/going-further/documentation.md
+- docs/docs/going-further/exporting-to-csv.md
+- docs/docs/going-further/external-guides.md
+- docs/docs/going-further/form-customisation.md
+- docs/docs/going-further/i18n.md
+- docs/docs/going-further/img/create_release.png
+- docs/docs/going-further/merging-searches.md
+- docs/docs/going-further/other-notes.md
+- docs/docs/going-further/ransackers.md
+- docs/docs/going-further/release_process.md
+- docs/docs/going-further/saving-queries.md
+- docs/docs/going-further/searching-postgres.md
+- docs/docs/intro.md
+- docs/docusaurus.config.js
+- docs/package-lock.json
+- docs/package.json
+- docs/sidebars.js
+- docs/src/components/HomepageFeatures/index.js
+- docs/src/components/HomepageFeatures/styles.module.css
+- docs/src/css/custom.css
+- docs/src/pages/index.module.css
+- docs/src/pages/markdown-page.md
+- docs/static/.nojekyll
+- docs/static/img/docusaurus.png
+- docs/static/img/favicon.ico
+- docs/static/img/logo.svg
+- docs/static/img/tutorial/docsVersionDropdown.png
+- docs/static/img/tutorial/localeDropdown.png
+- docs/static/img/undraw_docusaurus_mountain.svg
+- docs/static/img/undraw_docusaurus_react.svg
+- docs/static/img/undraw_docusaurus_tree.svg
+- docs/static/logo/ransack-h.png
+- docs/static/logo/ransack-h.svg
+- docs/static/logo/ransack-v.png
+- docs/static/logo/ransack-v.svg
+- docs/static/logo/ransack.png
+- docs/static/logo/ransack.svg
+- docs/yarn.lock
+- lib/polyamorous.rb
 - lib/polyamorous/activerecord_6.0_ruby_2/join_association.rb
 - lib/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb
 - lib/polyamorous/activerecord_6.0_ruby_2/reflection.rb
 - lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
 - lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
 - lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
-- lib/polyamorous/activerecord_6.2_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_6.2_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_6.2_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_7.0_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_7.0_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_7.0_ruby_2/reflection.rb
 - lib/polyamorous/join.rb
 - lib/polyamorous/polyamorous.rb
 - lib/polyamorous/swapping_reflection_class.rb
@@ -137,6 +187,7 @@ files:
 - lib/ransack/locale/ro.yml
 - lib/ransack/locale/ru.yml
 - lib/ransack/locale/sk.yml
+- lib/ransack/locale/sv.yml
 - lib/ransack/locale/tr.yml
 - lib/ransack/locale/zh-CN.yml
 - lib/ransack/locale/zh-TW.yml
@@ -155,12 +206,6 @@ files:
 - lib/ransack/translate.rb
 - lib/ransack/version.rb
 - lib/ransack/visitor.rb
-- logo/ransack-h.png
-- logo/ransack-h.svg
-- logo/ransack-v.png
-- logo/ransack-v.svg
-- logo/ransack.png
-- logo/ransack.svg
 - ransack.gemspec
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
@@ -170,6 +215,7 @@ files:
 - spec/console.rb
 - spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
+- spec/polyamorous/activerecord_compatibility_spec.rb
 - spec/polyamorous/join_association_spec.rb
 - spec/polyamorous/join_dependency_spec.rb
 - spec/polyamorous/join_spec.rb
@@ -190,7 +236,7 @@ homepage: https://github.com/activerecord-hackery/ransack
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,10 +251,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
-summary: Object-based searching for Active Record and Mongoid (currently).
+summary: Object-based searching for Active Record.
 test_files:
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
@@ -218,6 +264,7 @@ test_files:
 - spec/console.rb
 - spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
+- spec/polyamorous/activerecord_compatibility_spec.rb
 - spec/polyamorous/join_association_spec.rb
 - spec/polyamorous/join_dependency_spec.rb
 - spec/polyamorous/join_spec.rb

data/docs/release_process.md

@@ -1,20 +0,0 @@
-## Release Process
-
-*For maintainers of Ransack.*
-
-To release a new version of Ransack and publish it to RubyGems, take the following steps:
-
-- Create a new release, marked `Prerelease`.
-<<<<<<< Updated upstream
-- Update the versions file to the new release, commit and push to `master`.
-=======
-- Update the [version.rb](../lib/ransack/version.rb) file to the new release, commit and push to `master`.
->>>>>>> Stashed changes
-- From the terminal, run the following commands
-
-```bash
-rake build
-rake release
-```
-
-![Create a Release](img/create_release.png)

data/lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb

@@ -1,24 +0,0 @@
-module Polyamorous
-  module JoinAssociationExtensions
-    include SwappingReflectionClass
-    def self.prepended(base)
-      base.class_eval { attr_reader :join_type }
-    end
-
-    def initialize(reflection, children, polymorphic_class = nil, join_type = Arel::Nodes::InnerJoin)
-      @join_type = join_type
-      if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
-        swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
-          super(reflection, children)
-          self.reflection.options[:polymorphic] = true
-        end
-      else
-        super(reflection, children)
-      end
-    end
-
-    def ==(other)
-      base_klass == other.base_klass
-    end
-  end
-end

data/lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb

@@ -1,79 +0,0 @@
-module Polyamorous
-  module JoinDependencyExtensions
-    # Replaces ActiveRecord::Associations::JoinDependency#build
-    def build(associations, base_klass)
-      associations.map do |name, right|
-        if name.is_a? Join
-          reflection = find_reflection base_klass, name.name
-          reflection.check_validity!
-          reflection.check_eager_loadable!
-
-          klass = if reflection.polymorphic?
-            name.klass || base_klass
-          else
-            reflection.klass
-          end
-          JoinAssociation.new(reflection, build(right, klass), name.klass, name.type)
-        else
-          reflection = find_reflection base_klass, name
-          reflection.check_validity!
-          reflection.check_eager_loadable!
-
-          if reflection.polymorphic?
-            raise ActiveRecord::EagerLoadPolymorphicError.new(reflection)
-          end
-          JoinAssociation.new(reflection, build(right, reflection.klass))
-        end
-      end
-    end
-
-    def join_constraints(joins_to_add, join_type, alias_tracker)
-      @alias_tracker = alias_tracker
-
-      construct_tables!(join_root)
-      joins = make_join_constraints(join_root, join_type)
-
-      joins.concat joins_to_add.flat_map { |oj|
-        construct_tables!(oj.join_root)
-        if join_root.match?(oj.join_root) && join_root.table.name == oj.join_root.table.name
-          walk join_root, oj.join_root
-        else
-          make_join_constraints(oj.join_root, join_type)
-        end
-      }
-    end
-
-    private
-      def make_constraints(parent, child, join_type = Arel::Nodes::OuterJoin)
-        foreign_table = parent.table
-        foreign_klass = parent.base_klass
-        join_type = child.join_type || join_type if join_type == Arel::Nodes::InnerJoin
-        joins = child.join_constraints(foreign_table, foreign_klass, join_type, alias_tracker)
-        joins.concat child.children.flat_map { |c| make_constraints(child, c, join_type) }
-      end
-
-    module ClassMethods
-      # Prepended before ActiveRecord::Associations::JoinDependency#walk_tree
-      #
-      def walk_tree(associations, hash)
-        case associations
-        when TreeNode
-          associations.add_to_tree(hash)
-        when Hash
-          associations.each do |k, v|
-            cache =
-              if TreeNode === k
-                k.add_to_tree(hash)
-              else
-                hash[k] ||= {}
-              end
-            walk_tree(v, cache)
-          end
-        else
-          super(associations, hash)
-        end
-      end
-    end
-
-  end
-end

data/lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb

@@ -1,11 +0,0 @@
-module Polyamorous
-  module ReflectionExtensions
-    def join_scope(table, foreign_table, foreign_klass)
-      if respond_to?(:polymorphic?) && polymorphic?
-        super.where!(foreign_table[foreign_type].eq(klass.name))
-      else
-        super
-      end
-    end
-  end
-end