baby_squeel 1.3.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31dea90feb497d7b2cc1f01a18a9ea8a6c7ab3819f003a660b44a2ce409f4b6
-  data.tar.gz: ae9a5da834fe1e917085c4d370543dd89de9ef5b44cc83c384c9268516c933ff
+  metadata.gz: 54dbc98299ab8f9909d8c312e9663cc615543ea6421b81f2aab6efdd2bd9fe59
+  data.tar.gz: 97cc39dced57e0bd6bf16c854859f47902a2d6550e71c4120643fb01d0de9529
 SHA512:
-  metadata.gz: 5883394797bdeb50a88fef7b3b5032c7cfcf7a3dd80c7de197aa763aadf2b019e5aa0e5a8d66967268cacc5b52e3dfc3aa0de02eb235939492c3ee41a50be078
-  data.tar.gz: ce1de58a03cb4a08e789e9c6ab9feb12333f45c477d3780b4eecb9d7acf9bb18c920fd632b5d74b059af95827cb5463bc82ee2fe8eee634ac47777a7015f1493
+  metadata.gz: 8f5e68cf4ac0e85d2dc8fce1741f2d64c2bd5b5ecc08c335d71ad3fae335fb3b580f5c3aa2c5f98053ec445d9a7fbc1d3ddec6c7218c99bcb9869a6767fa68c8
+  data.tar.gz: ca66ea54876dfb670177ccea3be1808c90b4d1affea3b7bc1cb5c515e6e8208a8b55fb9fcd06202c6411ea102a358ceb0aa7d0468f82ee7c857045fbc0c5e946

data/CHANGELOG.md

@@ -1,134 +1,224 @@
 ## [Unreleased]
 
-Nothing to see here.
+## [1.4.4] - 2022-02-07
+
+### Fixed
+
+- Nested merge-joins query causes NoMethodError with ActiveRecord 6.1.4.4 (#119)
+
+## [1.4.3] - 2022-02-04
+
+### Fixed
+
+- ActiveRecord::Relation#left_joins performs INNER JOIN on Active Record 6.1 (#118)
+
+## [1.4.2] - 2022-01-24
+
+### Fixed
+
+- Added support for activerecord 7.0 (#116)
+- Added support for activerecord 6.1 (#116)
+- Added support for activerecord 6.0 (#116)
+
+## [1.4.1] - 2021-06-17
+
+### Fixed
+
+- Fixed a bug related to checking the Active Record version.
+
+## [1.4.0] - 2021-06-17
+
+### Fixed
+
+- Fix table alias when joining a polymorphic table twice (#108)
+- Removed internal class `BabySqueel::Pluck`. You can still use `plucking`. For example, `Post.joining { author }.plucking { author.name }`
+- Removed old code from Active Record < 5.2
+- Removed dependency `join_dependency`
+
+## [1.4.0.beta1] - 2021-04-21
+
+### Fixed
+
+- Add Support for activerecord '>= 5.2.3'
+- Drop Support for Active Record versions that have reached EOL (activerecord < 5.2)
+- Use polyamorous from ransack '~> 2.3'
 
 ## [1.3.1] - 2018-05-15
-## Fixed
+
+### Fixed
+
 - Upgraded `join_dependency` requirement, which fixes [issue #1](https://github.com/rzane/join_dependency/issues/1).
 
 ## [1.3.0] - 2018-05-04
-## Added
+
+### Added
+
 - The ability to use `plucking` with an array of nodes. For example, `User.plucking { [id, name] }`.
 
 ## [1.2.1] - 2018-04-25
-## Fixed
+
+### Fixed
+
 - Added support for Active Record 5.2
 
 ## [1.2.0] - 2017-10-20
+
 ### Added
+
 - `reordering`, which is just a BabySqueel version of Active Record's `reorder`.
 - `on` expressions can now be given a block that will yield the current node (#77).
 
 ## [1.1.5] - 2017-05-26
+
 ### Fixed
+
 - Returning an empty hash from a `where.has {}` block would generate invalid SQL (#69).
 
 ## [1.1.4] - 2017-04-13
+
 ### Fixed
+
 - Nodes::Attribute#in and #not_in generate valid SQL when given ActiveRecord::NullRelations.
 
 ## [1.1.3] - 2017-03-31
+
 ### Fixed
+
 - Nodes::Attribute#in was not returning BabySqueel node. As a result, you couldn't chain on it. This fixes #61.
 
 ## [1.1.2] - 2017-03-21
+
 ### Fixed
+
 - Check if a reflection has a parent reflection before comparing them. This fixes #56.
 
 ### Refactored
+
 - The logic encapsulated in `#method_missing` and `#respond_to_missing?` was difficult to follow, because it was falling back to `super`, sometimes going up the inheritance tree multiple levels. The addition of `BabySqueel::Resolver` now handles this a little more gracefully.
 
 ## [1.1.1] - 2017-02-14
+
 ### Fixed
+
 - There is a bug in Active Record where the `AliasTracker` initializes `Arel::Table`s use the wrong `type_caster`. To address this, BabySqueel must re-initialize the `Arel::Table` with the correct `type_caster` (#54).
 
 ## [1.1.0] - 2017-02-10
+
 > This version drops support for Active Record 4.1. If you're stil on 4.1, you should seriously consider upgrading to at least 4.2.
 
 ### Added
+
 - DSLs for ActiveRecord::Relation::Calculations. You can now use `plucking`, `counting`, `summing`, `averaging`, `minimizing`, and `maximizing`.
 
 ## [1.0.3] - 2017-02-09
+
 ### Added
+
 - Support for `pluck`.
 - Support for `not_in`.
 
 ## [1.0.2] - 2017-02-07
+
 ### Added
+
 - `BabySqueel::Association` now has `#==` and `#!=`. This is only supported for Rails 5+. Example: `Post.where { author: Author.last }`.
 
 ### Fixed
+
 - Incorrect alias detection caused by not tracking the full path to a join (#37).
 
 ## [1.0.1] - 2016-11-07
+
 ### Added
-- Add DSL#_ for wrapping expressions in Arel::Node::Grouping. Thanks to [@odedniv].
+
+- Add DSL#\_ for wrapping expressions in Arel::Node::Grouping. Thanks to [@odedniv].
 
 ### Fixed
+
 - Use strings for attribute names like Rails does. Symbols were preventing things like `unscope` from working. Thanks to [@chewi].
 - `where.has {}` will now accept `nil`.
 - Arel::Nodes::Function did not previously include Arel::Math, so now you can do math operations on the result of SQL functions.
 - Arel::Nodes::Binary did not previously include Arel::AliasPredication. Binary nodes can now be aliased using `as`.
 
 ## [1.0.0] - 2016-09-09
+
 ### Added
-- Polyamorous. Unfortunately, this *does* monkey-patch Active Record internals, but there just isn't any other reliable way to generate outer joins. Baby Squeel, itself, will still keep monkey patching to an absolute minimum.
+
+- Polyamorous. Unfortunately, this _does_ monkey-patch Active Record internals, but there just isn't any other reliable way to generate outer joins. Baby Squeel, itself, will still keep monkey patching to an absolute minimum.
 - Within DSL blocks, you can use `exists` and `not_exists` with Active Record relations. For example: `Post.where.has { exists Post.where(title: 'Fun') }`.`
 - Support for polymorphic associations.
 
 ### Deprecations
+
 - Removed support for Active Record 4.0.x
 
 ### Changed
+
 - BabySqueel::JoinDependency is no longer a class responsible for creating Arel joins. It is now a namespace for utilities used when working with the ActiveRecord::Association::JoinDependency class.
 - BabySqueel::Nodes::Generic is now BabySqueel::Nodes::Node.
 - Arel nodes are only extended with the behaviors they need. Previously, all Arel nodes were being extended with `Arel::AliasPredication`, `Arel::OrderPredications`, and `Arel::Math`.
 
 ### Fixed
+
 - Fixed deprecation warnings on Active Record 5 when initializing an Arel::Table without a type caster.
 - No more duplicate joins. Previously, Baby Squeel did a very poor job of ensuring that you didn't join an association twice.
-- Alias detection should now *actually* work. The previous implementation was naive.
+- Alias detection should now _actually_ work. The previous implementation was naive.
 
 ## [0.3.1] - 2016-08-02
+
 ### Added
+
 - Ported backticks and #my from Squeel
 
 ### Changed
+
 - DSL#sql now returns a node wrapped in a BabySqueel proxy.
 
 ## [0.3.0] - 2016-06-26
+
 ### Added
+
 - Added Squeel compatibility mode that allows `select`, `order`, `joins`, `group`, `where`, and `having` to accept DSL blocks.
 - Added the ability to query tables that aren't backed by Active Record models.
 - Added `BabySqueel::[]`, which provides a `BabySqueel::Relation` for models, or a `BabySqueel::Table` for symbols/strings.
 
 ### Changed
+
 - Renamed `BabySqueel::Association::AliasingError` to `BabySqueel::AssociationAliasingError`.
 
 ## [0.2.2] - 2016-03-30
+
 ### Added
+
 - Support for `group` (`grouping`) and `having` (`when_having`).
 - Support for sifters.
 - Added `quoted` and `sql` helpers for quoting strings and SQL literals.
 - More descriptive error messages when a column or association is not found.
 
 ### Fixed
+
 - `Arel::Nodes::Grouping` does not include `Arel::Math`, so operations like `(id + 5) + 3` would fail unexpectedly.
 - Fix missing bind values When joining through associations with default scope.
 - Removed `ActiveRecord::VERSION` specific handling of the `WhereChain`.
 
 ## [0.2.1] - 2016-03-27
+
 ### Added
+
 - Support for subqueries.
 
 ### Fixed
+
 - Some Arel nodes did not have access to `as` expressions.
 
 ## [0.2.0] - 2016-03-25
+
 ### Added
+
 - References to aliased joins in a `select`, `where`, or `order` expression now use the aliased table name.
 
 ### Changed
+
 - Rely on `ActiveRecord::Relation#join_sources` for the implicit construction of join nodes, rather than using the `ActiveRecord::Associations::JoinDependency` directly.
 
 ### Fixed
@@ -136,10 +226,18 @@ Nothing to see here.
 - Associations referencing the same table weren't being aliased.
 
 ## [0.1.0] - 2016-03-16
+
 ### Added
+
 - Initial support for selects, orders, wheres, and joins.
 
-[Unreleased]: https://github.com/rzane/baby_squeel/compare/v1.3.1...HEAD
+[unreleased]: https://github.com/rzane/baby_squeel/compare/v1.4.4...HEAD
+[1.4.4]: https://github.com/rzane/baby_squeel/compare/v1.4.3...v1.4.4
+[1.4.3]: https://github.com/rzane/baby_squeel/compare/v1.4.2...v1.4.3
+[1.4.2]: https://github.com/rzane/baby_squeel/compare/v1.4.1...v1.4.2
+[1.4.1]: https://github.com/rzane/baby_squeel/compare/v1.4.0...v1.4.1
+[1.4.0]: https://github.com/rzane/baby_squeel/compare/v1.4.0.beta1...v1.4.0
+[1.4.0.beta1]: https://github.com/rzane/baby_squeel/compare/v1.3.1...v1.4.0.beta1
 [1.3.1]: https://github.com/rzane/baby_squeel/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/rzane/baby_squeel/compare/v1.2.1...v1.3.0
 [1.2.1]: https://github.com/rzane/baby_squeel/compare/v1.2.0...v1.2.1
@@ -159,6 +257,5 @@ Nothing to see here.
 [0.2.2]: https://github.com/rzane/baby_squeel/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/rzane/baby_squeel/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/rzane/baby_squeel/compare/v0.1.0...v0.2.0
-
 [@chewi]: https://github.com/chewi
 [@odedniv]: https://github.com/odedniv

data/ISSUE_TEMPLATE.md

@@ -11,7 +11,7 @@ require 'minitest/autorun'
 
 gemfile true do
   source 'https://rubygems.org'
-  gem 'activerecord', '~> 5.0.0' # which Active Record version?
+  gem 'activerecord', '~> 5.2.0' # which Active Record version?
   gem 'sqlite3'
   gem 'baby_squeel', github: 'rzane/baby_squeel'
 end

data/README.md

@@ -1,10 +1,7 @@
-# BabySqueel
+# BabySqueel 🐷
 
-[![Build Status](https://travis-ci.org/rzane/baby_squeel.svg?branch=master)](https://travis-ci.org/rzane/baby_squeel)
-[![Code Climate](https://codeclimate.com/github/rzane/baby_squeel/badges/gpa.svg)](https://codeclimate.com/github/rzane/baby_squeel)
-[![Coverage Status](https://coveralls.io/repos/github/rzane/baby_squeel/badge.svg?branch=master)](https://coveralls.io/github/rzane/baby_squeel?branch=master)
-
-<img align="right" src="http://static.thefrisky.com/uploads/2010/07/01/pig_in_boots_070110_m.jpg" alt="biddy piggy">
+![Build](https://github.com/rzane/baby_squeel/workflows/Build/badge.svg)
+![Version](https://img.shields.io/gem/v/baby_squeel)
 
 Have you ever used the [Squeel](https://github.com/activerecord-hackery/squeel) gem? It's a really nice way to build complex queries. However, Squeel monkeypatches Active Record internals, because it was aimed at enhancing the existing API with the aim of inclusion into Rails. However, that inclusion never happened, and it left Squeel susceptible to breakage from arbitrary changes in Active Record, eventually burning out the maintainer.
 
@@ -219,6 +216,21 @@ Post.joins(:author).where.has {
 # )
 ```
 
+##### Exists
+
+```ruby
+Post.where.has {
+  exists Post.where.has { author_id == 1 }
+}
+# SELECT "posts".* FROM "posts"
+# WHERE (
+#   EXISTS(
+#     SELECT "posts".* FROM "posts"
+#     WHERE "posts"."author_id" = 1
+#   )
+# )
+```
+
 ##### Custom SQL Operators
 
 ```ruby
@@ -240,6 +252,26 @@ Post.joining {
 }
 ```
 
+##### Polymorphism
+
+Given this polymorphism:
+
+```ruby
+# app/models/picture.rb
+belongs_to :imageable, polymorphic: true
+
+# app/models/post.rb
+has_many :pictures, as: :imageable
+```
+
+The query might look like this:
+
+```ruby
+Picture.
+  joining { imageable.of(Post) }.
+  selecting { imageable.of(Post).id }
+```
+
 ##### Helpers
 
 ```ruby
@@ -283,7 +315,7 @@ Post.joins(:author).where.has {
 The following methods give you access to BabySqueel's DSL:
 
 | BabySqueel    | Active Record Equivalent |
-|---------------|--------------------------|
+| ------------- | ------------------------ |
 | `selecting`   | `select`                 |
 | `ordering`    | `order`                  |
 | `joining`     | `joins`                  |
@@ -297,7 +329,7 @@ Check out the [migration guide](https://github.com/rzane/baby_squeel/wiki/Migrat
 
 ## Development
 
-1. Pick an Active Record version to develop against, then export it: `export AR=4.2.6`.
+1. Pick an Active Record version to develop against, then export it: `export AR=6.1.4`.
 2. Run `bin/setup` to install dependencies.
 3. Run `rake` to run the specs.
 

data/baby_squeel.gemspec

@@ -19,12 +19,11 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '>= 4.2.0'
-  spec.add_dependency 'polyamorous', '~> 1.3'
-  spec.add_dependency 'join_dependency', '~> 0.1.2'
+  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
+  spec.add_dependency 'ransack', '~> 2.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4.0'
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/baby_squeel/active_record/calculations.rb

@@ -1,12 +1,10 @@
 require 'baby_squeel/calculation'
-require 'baby_squeel/pluck'
 
 module BabySqueel
   module ActiveRecord
     module Calculations
       def plucking(&block)
         nodes = Array.wrap(DSL.evaluate(self, &block))
-        nodes = nodes.map { |node| Pluck.decorate(node) }
         pluck(*nodes)
       end
 
@@ -40,17 +38,6 @@ module BabySqueel
           super
         end
       end
-
-      if ::ActiveRecord::VERSION::MAJOR < 5
-        # @override
-        def type_for(field)
-          if field.kind_of? Calculation
-            field
-          else
-            super
-          end
-        end
-      end
     end
   end
 end

data/lib/baby_squeel/active_record/query_methods.rb

@@ -1,9 +1,26 @@
 require 'baby_squeel/dsl'
 require 'baby_squeel/join_dependency'
+require 'baby_squeel/active_record/version_helper'
 
 module BabySqueel
   module ActiveRecord
     module QueryMethods
+      # This class allows BabySqueel to slip custom
+      # joins_values into Active Record's JoinDependency
+      module Injector6_1
+        def each(&block)
+          super do |join|
+            if join.is_a?(BabySqueel::Join)
+              result = block.binding.local_variables.include?(:result) && block.binding.local_variable_get(:result)
+              result << join if result
+              join
+            else
+              block.call(join)
+            end
+          end
+        end
+      end
+
       # Constructs Arel for ActiveRecord::QueryMethods#joins using the DSL.
       def joining(&block)
         joins DSL.evaluate(self, &block)
@@ -34,19 +51,41 @@ module BabySqueel
         having DSL.evaluate(self, &block)
       end
 
-      private
+      if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
+        def construct_join_dependency(associations, join_type)
+          result = super(associations, join_type)
+          if associations.any? { |assoc| assoc.is_a?(BabySqueel::Join) }
+            result.extend(BabySqueel::JoinDependency::Injector6_1)
+          end
+          result
+        end
+
+        private
+
+        # https://github.com/rails/rails/commit/c0c53ee9d28134757cf1418521cb97c4a135f140
+        def select_association_list(*args)
+          args[0].extend(BabySqueel::ActiveRecord::QueryMethods::Injector6_1)
+          super *args
+        end
+      elsif BabySqueel::ActiveRecord::VersionHelper.at_least_6_0?
+        private
 
-      # This is a monkey patch, and I'm not happy about it.
-      # Active Record will call `group_by` on the `joins`. The
-      # Injector has a custom `group_by` method that handles
-      # BabySqueel::Join nodes.
-      if ::ActiveRecord::VERSION::MAJOR >= 5 && ::ActiveRecord::VERSION::MINOR >= 2
-        def build_joins(manager, joins, aliases)
-          super manager, BabySqueel::JoinDependency::Injector.new(joins), aliases
+        # Active Record will call `each` on the `joins`. The
+        # Injector has a custom `each` method that handles
+        # BabySqueel::Join nodes.
+        def build_joins(*args)
+          args[1] = BabySqueel::JoinDependency::Injector6_0.new(args.second)
+          super(*args)
         end
       else
-        def build_joins(manager, joins)
-          super manager, BabySqueel::JoinDependency::Injector.new(joins)
+        private
+
+        # Active Record will call `group_by` on the `joins`. The
+        # Injector has a custom `group_by` method that handles
+        # BabySqueel::Join nodes.
+        def build_joins(*args)
+          args[1] = BabySqueel::JoinDependency::Injector5_2.new(args.second)
+          super(*args)
         end
       end
     end

data/lib/baby_squeel/active_record/version_helper.rb

@@ -0,0 +1,21 @@
+require 'baby_squeel/dsl'
+
+module BabySqueel
+  module ActiveRecord
+    class VersionHelper
+      def self.at_least_6_1?
+        ::ActiveRecord::VERSION::MAJOR > 6 ||
+          ::ActiveRecord::VERSION::MAJOR == 6 && ::ActiveRecord::VERSION::MINOR >= 1
+      end
+
+      def self.at_least_6_0?
+        ::ActiveRecord::VERSION::MAJOR >= 6
+      end
+
+      def self.at_least_5_2_3?
+        at_least_6_0? ||
+          ::ActiveRecord::VERSION::MAJOR >= 5 && ::ActiveRecord::VERSION::MINOR >= 2 && ::ActiveRecord::VERSION::TINY >= 3
+      end
+    end
+  end
+end

data/lib/baby_squeel/association.rb

@@ -1,4 +1,5 @@
 require 'baby_squeel/relation'
+require 'baby_squeel/active_record/version_helper'
 
 module BabySqueel
   class Association < Relation
@@ -96,19 +97,18 @@ module BabySqueel
 
     private
 
-    if ActiveRecord::VERSION::MAJOR >= 5
-      def build_where_clause(other)
-        if valid_where_clause?(other)
-          relation = @parent._scope.all
+    def build_where_clause(other)
+      if valid_where_clause?(other)
+        relation = @parent._scope.all
+
+        if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
+          relation.send(:build_where_clause, { _reflection.name => other }, [])
+        else
           factory = relation.send(:where_clause_factory)
           factory.build({ _reflection.name => other }, [])
-        else
-          raise AssociationComparisonError.new(_reflection.name, other)
         end
-      end
-    else
-      def build_where_clause(_)
-        raise AssociationComparisonNotSupportedError.new(_reflection.name)
+      else
+        raise AssociationComparisonError.new(_reflection.name, other)
       end
     end
 

data/lib/baby_squeel/calculation.rb

@@ -6,12 +6,6 @@ module BabySqueel
       @node = node
     end
 
-    # This is only used in 4.2. We're just pretending to be
-    # a database column to fake the casting here.
-    def type_cast_from_database(value)
-      value
-    end
-
     # In Active Record 5, we don't *need* this class to make
     # calculations work. They happily accept arel. However,
     # when grouping with a calculation, there's a really,
@@ -21,15 +15,19 @@ module BabySqueel
     # caching because the alias would have a unique name every
     # time.
     def to_s
-      names = node.map do |child|
-        if child.kind_of?(String) || child.kind_of?(Symbol)
-          child.to_s
-        elsif child.respond_to?(:name)
-          child.name.to_s
+      if node.respond_to?(:map)
+        names = node.map do |child|
+          if child.kind_of?(String) || child.kind_of?(Symbol)
+            child.to_s
+          elsif child.respond_to?(:name)
+            child.name.to_s
+          end
         end
+        names.compact.uniq.join('_')
+      else
+        # fix for https://github.com/rails/rails/commit/fc38ff6e4417295c870f419f7c164ab5a7dbc4a5
+        node.to_sql.split('"').map { |v| v.tr('^A-Za-z0-9_', '').presence }.compact.uniq.join('_')
       end
-
-      names.compact.uniq.join('_')
     end
   end
 end

data/lib/baby_squeel/errors.rb

@@ -62,14 +62,4 @@ module BabySqueel
       super "You can't compare association '#{name}' to #{other}."
     end
   end
-
-  class AssociationComparisonNotSupportedError < StandardError # :nodoc:
-    MESSAGE =
-      "Querying association '%{name}' with '==' and '!=' " \
-      "is only supported for ActiveRecord >=5."
-
-    def initialize(name)
-      super format(MESSAGE, name: name)
-    end
-  end
 end

data/lib/baby_squeel/join_dependency.rb

@@ -1,10 +1,10 @@
-require 'join_dependency'
+require 'baby_squeel/active_record/version_helper'
 
 module BabySqueel
   module JoinDependency
     # This class allows BabySqueel to slip custom
     # joins_values into Active Record's JoinDependency
-    class Injector < Array # :nodoc:
+    class Injector5_2 < Array # :nodoc:
       # Active Record will call group_by on this object
       # in ActiveRecord::QueryMethods#build_joins. This
       # allows BabySqueel::Joins to be treated
@@ -22,56 +22,146 @@ module BabySqueel
       end
     end
 
+    # This class allows BabySqueel to slip custom
+    # joins_values into Active Record's JoinDependency
+    class Injector6_0 < Array # :nodoc:
+      # https://github.com/rails/rails/pull/36805/files
+      # This commit changed group_by to each
+      def each(&block)
+        super do |join|
+          if block.binding.local_variables.include?(:buckets)
+            buckets = block.binding.local_variable_get(:buckets)
+
+            case join
+            when BabySqueel::Join
+              buckets[:association_join] << join
+            else
+              block.call(join)
+            end
+          else
+            block.call(join)
+          end
+        end
+      end
+    end
+
+    # This is a 'fix' for the left outer joins
+    # rails way would be to call left_outer_joins so the join_type gets set to Arel::Nodes::OuterJoin
+    # Maybe this could be fixed in joining but I do not know how.
+    module Injector6_1 # :nodoc:
+      def make_constraints(parent, child, join_type) # :nodoc:
+        join_type = child.join_type if child.join_type == Arel::Nodes::OuterJoin
+        super(parent, child, join_type)
+      end
+    end
+
     class Builder # :nodoc:
       attr_reader :join_dependency
 
       def initialize(relation)
-        @join_dependency = ::JoinDependency.from_relation(relation) do |join|
-          :association_join if join.kind_of? BabySqueel::Join
-        end
+        @join_dependency = build(relation, collect_joins(relation))
       end
 
       # Find the alias of a BabySqueel::Association, by passing
       # a list (in order of chaining) of associations and finding
       # the respective JoinAssociation at each level.
       def find_alias(associations)
-        table = find_join_association(associations).table
-        reconstruct_with_type_caster(table, associations)
+        if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
+          # construct_tables! got removed by rails
+          # https://github.com/rails/rails/commit/590b045ee2c0906ff162e6658a184afb201865d7
+          #
+          # construct_tables_for_association! is a method from the polyamorous (ransack) gem
+          join_root = join_dependency.send(:join_root)
+          join_root.each_children do |parent, child|
+            join_dependency.construct_tables_for_association!(parent, child)
+          end
+        elsif BabySqueel::ActiveRecord::VersionHelper.at_least_5_2_3?
+          # If we tell join_dependency to construct its tables, Active Record
+          # handles building the correct aliases and attaching them to its
+          # JoinDepenencies.
+          join_dependency.send(:construct_tables!, join_dependency.send(:join_root))
+        end
+
+        join_association = find_join_association(associations)
+        join_association.table
       end
 
       private
 
+      Associations = ::ActiveRecord::Associations
+
       def find_join_association(associations)
-        associations.inject(join_dependency.send(:join_root)) do |parent, assoc|
-          parent.children.find do |join_association|
-            reflections_equal?(
-              assoc._reflection,
-              join_association.reflection
-            )
-          end
+        current = join_dependency.send(:join_root)
+
+        associations.each do |association|
+          name = association._reflection.name
+          current = current.children.find { |c| c.reflection.name == name && klass_equal?(association, c) }
+          break if current.nil?
         end
+
+        current
       end
 
-      # Compare two reflections and see if they're the same.
-      def reflections_equal?(a, b)
-        comparable_reflection(a) == comparable_reflection(b)
+      # If association is not polymorphic return true.
+      # If association is polymorphic compare the association polymorphic class with the join association base_klass
+      def klass_equal?(assoc, join_association)
+        return true unless assoc._reflection.polymorphic?
+
+        assoc._polymorphic_klass == join_association.base_klass
       end
 
-      # Get the parent of the reflection if it has one.
-      # In AR4, #parent_reflection returns [name, reflection]
-      # In AR5, #parent_reflection returns just a reflection
-      def comparable_reflection(reflection)
-        [*reflection.parent_reflection].last || reflection
+      def collect_joins(relation)
+        joins = []
+        joins += relation.joins_values
+        joins += relation.left_outer_joins_values
+
+        buckets = joins.group_by do |join|
+          case join
+          when String
+            :string_join
+          when Hash, Symbol, Array
+            :association_join
+          when Associations::JoinDependency
+            :stashed_join
+          when Arel::Nodes::Join
+            :join_node
+          when BabySqueel::Join
+            :association_join
+          else
+            raise("unknown class: %s" % join.class.name)
+          end
+        end
       end
 
-      # Active Record 5's AliasTracker initializes Arel tables
-      # with the type_caster belonging to the wrong model.
-      #
-      # See: https://github.com/rails/rails/pull/27994
-      def reconstruct_with_type_caster(table, associations)
-        return table if ::ActiveRecord::VERSION::MAJOR < 5
-        type_caster = associations.last._scope.type_caster
-        ::Arel::Table.new(table.name, type_caster: type_caster)
+      def build(relation, buckets)
+        buckets.default = []
+        association_joins         = buckets[:association_join]
+        stashed_association_joins = buckets[:stashed_join]
+        join_nodes                = buckets[:join_node].uniq
+        string_joins              = buckets[:string_join].map(&:strip).uniq
+
+        joins = string_joins.map do |join|
+          relation.table.create_string_join(Arel.sql(join)) unless join.blank?
+        end.compact
+
+        join_list = join_nodes + joins
+
+        alias_tracker = Associations::AliasTracker.create(relation.klass.connection, relation.table.name, join_list)
+        if BabySqueel::ActiveRecord::VersionHelper.at_least_6_0?
+          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, Arel::Nodes::InnerJoin)
+          join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
+        elsif BabySqueel::ActiveRecord::VersionHelper.at_least_5_2_3?
+          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins)
+          join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
+        else
+          # Rails 5.2.0 - 5.2.2
+          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, alias_tracker)
+        end
+        join_nodes.each do |join|
+          join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
+        end
+
+        join_dependency
       end
     end
   end

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.4.4'.freeze
 end

data/lib/baby_squeel.rb

@@ -1,6 +1,11 @@
 require 'active_record'
 require 'active_record/relation'
-require 'polyamorous'
+begin
+  require 'polyamorous'
+rescue LoadError
+  # Trying loading from 'ransack' as of commit c9cc20de9 (post v2.3.2)
+  require 'polyamorous/polyamorous'
+end
 require 'baby_squeel/version'
 require 'baby_squeel/errors'
 require 'baby_squeel/active_record/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Ray Zane
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,84 +16,76 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: polyamorous
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: join_dependency
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +116,7 @@ files:
 - lib/baby_squeel/active_record/base.rb
 - lib/baby_squeel/active_record/calculations.rb
 - lib/baby_squeel/active_record/query_methods.rb
+- lib/baby_squeel/active_record/version_helper.rb
 - lib/baby_squeel/active_record/where_chain.rb
 - lib/baby_squeel/association.rb
 - lib/baby_squeel/calculation.rb
@@ -140,7 +133,6 @@ files:
 - lib/baby_squeel/nodes/node.rb
 - lib/baby_squeel/nodes/proxy.rb
 - lib/baby_squeel/operators.rb
-- lib/baby_squeel/pluck.rb
 - lib/baby_squeel/relation.rb
 - lib/baby_squeel/resolver.rb
 - lib/baby_squeel/table.rb
@@ -149,7 +141,7 @@ homepage: https://github.com/rzane/baby_squeel
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,9 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: An expressive query DSL for Active Record 4 and 5.
 test_files: []

data/lib/baby_squeel/pluck.rb

@@ -1,25 +0,0 @@
-module BabySqueel
-  class Pluck # :nodoc:
-    # In Active Record 4.2, #pluck chokes when you give it
-    # Arel. It calls #to_s on whatever you pass in. So the
-    # hacky solution is to wrap the node in a class that
-    # returns the node when you call #to_s. Then, it works!
-    #
-    # In Active Record 5, #pluck accepts Arel, so we won't
-    # bother to use this there.
-
-    if ::ActiveRecord::VERSION::MAJOR >= 5
-      def self.decorate(node); node; end
-    else
-      def self.decorate(node); new(node); end
-    end
-
-    def initialize(node)
-      @node = node
-    end
-
-    def to_s
-      @node
-    end
-  end
-end