baby_squeel 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c744d9857aadfec2192c82fef09f2fb3f1c67765852da080bfcf3a1f5aba72
-  data.tar.gz: d3dfb10bcf6496c530f29a87146a53039c925cc3dc86fe9cfbced8eb8d0afd6f
+  metadata.gz: 154cc7b5379993dfa67f76c182bfe810f5c9b941930ec69e386270e5751201da
+  data.tar.gz: 873324d4d500c03621c6a3fb20321a948f2b9ae9dadf098aff028b154dc57f36
 SHA512:
-  metadata.gz: 211d541b43c1117bf46f79f220c34fbe5959fbc3597440ccfc3b4565fe087192d23342d365f757bda6ed5f03ba80cfbe2b03eea6e40955489f53e5f5813bb688
-  data.tar.gz: 431218e9d183f1507095036417af43b3d80b2189bb0c9abab5dc9e99c995f44cd79a0965b249ae468442ce3fa7436c8b86db2258efa6531a5ed80d00f16495ee
+  metadata.gz: b29e8eb5d1225e3e8f00908af60da6b5deeebeb49467a52aa875fcad70972002d312dac0151be4d4ca7562012cc7c21593c630f1b44b2f20733cb43bdc997854
+  data.tar.gz: 3b3b9957bc49729ffdcf5bda14ef4446816cf8cbd12facf67a30ec8912bbb260e0a0543334a3e840a0d691ee8d990754dbe23e687129321b88a46360b2d60e76

data/CHANGELOG.md

@@ -1,149 +1,212 @@
 ## [Unreleased]
 
+## [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
+
 - Fixed a bug related to checking the Active Record version.
 
 ## [1.4.0] - 2021-06-17
-## Fixed
+
+### 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
+
+### 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
@@ -151,10 +214,13 @@
 - 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.4.1...HEAD
+[unreleased]: https://github.com/rzane/baby_squeel/compare/v1.4.2...HEAD
+[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
@@ -177,6 +243,5 @@
 [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/README.md

@@ -329,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=5.2.0`.
+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,11 +19,11 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '~> 5.2'
+  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
   spec.add_dependency 'ransack', '~> 2.3'
 
   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', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3'
 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)
@@ -36,12 +53,32 @@ module BabySqueel
 
       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.
-      def build_joins(manager, joins, aliases)
-        super manager, BabySqueel::JoinDependency::Injector.new(joins), aliases
+      if BabySqueel::ActiveRecord::VersionHelper.at_least_6_1?
+        # https://github.com/rails/rails/commit/c0c53ee9d28134757cf1418521cb97c4a135f140
+        def select_association_list(*args)
+          args[0].extend(BabySqueel::ActiveRecord::QueryMethods::Injector6_1)
+          super *args
+        end
+
+        def construct_join_dependency(associations, join_type)
+          super(associations, join_type).extend(BabySqueel::JoinDependency::Injector6_1)
+        end
+      elsif BabySqueel::ActiveRecord::VersionHelper.at_least_6_0?
+        # 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
+        # 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
   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
@@ -99,8 +100,13 @@ module BabySqueel
     def build_where_clause(other)
       if valid_where_clause?(other)
         relation = @parent._scope.all
-        factory = relation.send(:where_clause_factory)
-        factory.build({ _reflection.name => other }, [])
+
+        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 }, [])
+        end
       else
         raise AssociationComparisonError.new(_reflection.name, other)
       end

data/lib/baby_squeel/calculation.rb

@@ -15,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/join_dependency.rb

@@ -1,8 +1,10 @@
+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
@@ -20,6 +22,39 @@ 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
+        super(parent, child, join_type)
+      end
+    end
+
     class Builder # :nodoc:
       attr_reader :join_dependency
 
@@ -31,10 +66,19 @@ module BabySqueel
       # a list (in order of chaining) of associations and finding
       # the respective JoinAssociation at each level.
       def find_alias(associations)
-        # If we tell join_dependency to construct its tables, Active Record
-        # handles building the correct aliases and attaching them to its
-        # JoinDepenencies.
-        if at_least?("5.2.3")
+        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
 
@@ -69,7 +113,7 @@ module BabySqueel
       def collect_joins(relation)
         joins = []
         joins += relation.joins_values
-        joins += relation.left_outer_joins_values if at_least?("5")
+        joins += relation.left_outer_joins_values
 
         buckets = joins.group_by do |join|
           case join
@@ -103,11 +147,15 @@ module BabySqueel
         join_list = join_nodes + joins
 
         alias_tracker = Associations::AliasTracker.create(relation.klass.connection, relation.table.name, join_list)
-        if exactly?("5.2.0")
-          join_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, alias_tracker)
-        else
+        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
@@ -115,14 +163,6 @@ module BabySqueel
 
         join_dependency
       end
-
-      def exactly?(version)
-        ::ActiveRecord.gem_version == Gem::Version.new(version)
-      end
-
-      def at_least?(version)
-        ::ActiveRecord.gem_version >= Gem::Version.new(version)
-      end
     end
   end
 end

data/lib/baby_squeel/version.rb

@@ -1,3 +1,3 @@
 module BabySqueel
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ray Zane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         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: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +90,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: An expressive query DSL for Active Record 4 and 5.
 email:
 - ray@promptworks.com
@@ -110,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
@@ -149,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: An expressive query DSL for Active Record 4 and 5.