baby_squeel 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 154cc7b5379993dfa67f76c182bfe810f5c9b941930ec69e386270e5751201da
-  data.tar.gz: 873324d4d500c03621c6a3fb20321a948f2b9ae9dadf098aff028b154dc57f36
+  metadata.gz: e317da76921bc04f342b3cd1f219fa6585f642c4b96e936a18a442a1eb51c18b
+  data.tar.gz: 6a25d3d64d518f5b43124b4dd9083636f10ac0fad1e0ba4e9634f0dded17cb23
 SHA512:
-  metadata.gz: b29e8eb5d1225e3e8f00908af60da6b5deeebeb49467a52aa875fcad70972002d312dac0151be4d4ca7562012cc7c21593c630f1b44b2f20733cb43bdc997854
-  data.tar.gz: 3b3b9957bc49729ffdcf5bda14ef4446816cf8cbd12facf67a30ec8912bbb260e0a0543334a3e840a0d691ee8d990754dbe23e687129321b88a46360b2d60e76
+  metadata.gz: f1bcaadbb4fc5894a5cd1e4c797ac3d6cfbbaee0cad994caf360fc2ac347f9a30019c297bcd254cae7642574b56bd22d927ea492bad76be02905379847af5330
+  data.tar.gz: 012e06a95f564e7502a4aa73a5629969f82e76a4abf475fa7364f25891f3345710334848313d6c3fc4c3842da29c5fc3220d95d58a1829258445886be8ac143e

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
 
+- AR 6.1: fix - FrozenError: can't modify frozen object: []
+- Drop support for ActiveRecord older than 6.0.
+
+## [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
@@ -219,7 +234,9 @@
 
 - Initial support for selects, orders, wheres, and joins.
 
-[unreleased]: https://github.com/rzane/baby_squeel/compare/v1.4.2...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

data/ISSUE_TEMPLATE.md

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

data/baby_squeel.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
-  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
+  spec.add_dependency 'activerecord', '>= 6.0', '< 7.1'
   spec.add_dependency 'ransack', '~> 2.3'
 
   spec.add_development_dependency 'bundler', '~> 2'

data/lib/baby_squeel/active_record/query_methods.rb

@@ -51,19 +51,27 @@ 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)
+          if args[0].any? { |join| join.is_a?(BabySqueel::Join) }
+            args[0].extend(BabySqueel::ActiveRecord::QueryMethods::Injector6_1)
+          end
           super *args
         end
+      else
+        private
 
-        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.
@@ -71,14 +79,6 @@ module BabySqueel
           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

@@ -7,15 +7,6 @@ module BabySqueel
         ::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/join_dependency.rb

@@ -2,26 +2,6 @@ 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 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
-      # like typical join hashes until Polyamorous can
-      # deal with them.
-      def group_by
-        super do |join|
-          case join
-          when BabySqueel::Join
-            :association_join
-          else
-            yield join
-          end
-        end
-      end
-    end
-
     # This class allows BabySqueel to slip custom
     # joins_values into Active Record's JoinDependency
     class Injector6_0 < Array # :nodoc:
@@ -50,7 +30,7 @@ module BabySqueel
     # 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
+        join_type = child.join_type if child.join_type == Arel::Nodes::OuterJoin
         super(parent, child, join_type)
       end
     end
@@ -75,7 +55,7 @@ module BabySqueel
           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?
+        else
           # If we tell join_dependency to construct its tables, Active Record
           # handles building the correct aliases and attaching them to its
           # JoinDepenencies.
@@ -147,16 +127,9 @@ module BabySqueel
         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_dependency = Associations::JoinDependency.new(relation.klass, relation.table, association_joins, Arel::Nodes::InnerJoin)
+        join_dependency.instance_variable_set(:@alias_tracker, alias_tracker)
+
         join_nodes.each do |join|
           join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
         end

data/lib/baby_squeel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_squeel
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ray Zane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: An expressive query DSL for Active Record 4 and 5.