brick 1.0.133 → 1.0.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6804b443d939d24da85968d5b75c4c0603c8880dcc5ab4d07b20be0a52e5a349
-  data.tar.gz: 17ed154ec5f8ec1f351a83120673e9354f892217da76957fdc49a31e663e9eba
+  metadata.gz: 613c6296c56af562bc77d55d734b0a6e5bdad7e3942891db4dc939fe087fca7f
+  data.tar.gz: acc5873eeae8a0d9e9d4a86cc8b71ee12dc0699821dee132c40c569147156075
 SHA512:
-  metadata.gz: 1b4e53fe24d3de942a7388453d6ee732b0263097b08cbed104d7499842ffaa4eb7239b1bdb81b7300d08df9a628b2a99aad74f47de1fd3579b1eefbf0382b18a
-  data.tar.gz: 3eb38e2a8f1e5c12493ff6e3a524d42157dcae2781d6d39f339d098b04b12d936989f3974977df589419ca04663a4c27f6b7425e09b9695817d9103fb7fd543f
+  metadata.gz: 046bec9f177ec74aaa3bbba3ef1dd2afe54f43376068ed657ed0fec6d18ac353e8addfabad514fdf33cc6199d053ca1e23c0f46aa1a53cac96fe6e21f7a50796
+  data.tar.gz: 7d21817ea8774f65852be247ae72c341559c84b0a58228d019d5630036827a99988699752392bbc43330400761ea9e59292231bae5993fa0620240126fe7490e

data/lib/brick/extensions.rb

@@ -670,7 +670,6 @@ module ActiveRecord
       # Add derived table JOIN for the has_many counts
       nix = []
       klass._br_hm_counts.each do |k, hm|
-        num_bt_things = 0
         count_column = if hm.options[:through]
                          # Build the chain of JOINs going to the final destination HMT table
                          # (Usually just one JOIN, but could be many.)
@@ -691,7 +690,11 @@ module ActiveRecord
                          # Turn the last member of link_back into a foreign key
                          link_back << hmt_assoc.source_reflection.foreign_key
                          # If it's a HMT based on a HM -> HM, must JOIN the last table into the mix at the end
-                         through_sources.push(hm.source_reflection) unless hm.source_reflection.belongs_to?
+                         this_hm = hm
+                         while !(src_ref = this_hm.source_reflection).belongs_to? && (thr = src_ref.options[:through])
+                           through_sources.push(this_hm = src_ref.active_record.reflect_on_association(thr))
+                         end
+                         through_sources.push(src_ref) unless src_ref.belongs_to?
                          from_clause = +"#{through_sources.first.table_name} br_t0"
                          fk_col = through_sources.shift.foreign_key
 
@@ -700,9 +703,7 @@ module ActiveRecord
                          through_sources.map do |a|
                            from_clause << "\n LEFT OUTER JOIN #{a.table_name} br_t#{idx += 1} "
                            from_clause << if (src_ref = a.source_reflection).macro == :belongs_to
-                                            nm = hmt_assoc.source_reflection.inverse_of&.name
-                                            link_back << nm
-                                            num_bt_things += 1
+                                            link_back << (nm = hmt_assoc.source_reflection.inverse_of&.name)
                                             # puts "BT #{a.table_name}"
                                             "ON br_t#{idx}.#{a.active_record.primary_key} = br_t#{idx - 1}.#{a.foreign_key}"
                                           elsif src_ref.options[:as]
@@ -723,9 +724,8 @@ module ActiveRecord
                                             end
                                           else # Standard has_many or has_one
                                             # puts "HM #{a.table_name}"
-                                            # binding.pry unless (
                                             nm = hmt_assoc.source_reflection.inverse_of&.name
-                                            # )
+                                            # binding.pry unless nm
                                             link_back << nm # if nm
                                             "ON br_t#{idx}.#{a.foreign_key} = br_t#{idx - 1}.#{a.active_record.primary_key}"
                                           end
@@ -742,16 +742,8 @@ module ActiveRecord
                            nix << k
                            next
                          elsif src_ref.macro == :belongs_to # Traditional HMT using an associative table
-                           # binding.pry if link_back.length > 2
                            "br_t#{idx}.#{hm.foreign_key}"
                          else # A HMT that goes HM -> HM, something like Categories -> Products -> LineItems
-                           # %%% Currently flaky, so will revisit this soon, probably while implementing the whole link_back architecture
-                           if num_bt_things > 1
-                             # binding.pry
-                             nix << k
-                             next
-                           end
-
                            "br_t#{idx}.#{src_ref.active_record.primary_key}"
                          end
                        else

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 133
+    TINY = 134
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.133
+  version: 1.0.134
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord