brick 1.0.129 → 1.0.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b46bf80d393c0d6e4ffea3e8bfc1fbc03dc667902077efc9a887c8ab046a817
-  data.tar.gz: 927828e46dfd9ae6b7c14aced0f814bbc1d876e5af14aa872a13d2c13af85083
+  metadata.gz: 902948e0d502bc9c1b604f3e99b975ab8c7d42c378888280d84dac6aef2aa7d0
+  data.tar.gz: 82988754dcae3ccc67eb5997531b3fa218ecf364f076ecf221fac201412baff0
 SHA512:
-  metadata.gz: 49073fb48479c8df6805a35632ef321efa3144556feb1e2da701044ce110aa6cfcb8ced12186408929b8c3d6280ca6e393e886ba54eea87f0a622a58f9216e8e
-  data.tar.gz: eaccf857c54a108c764e786b5e8abd0f54ff5abbcadec558138dc947a5d7e3015fc1a5510a311301947cee815d086018e535a15958357abd3463ab59ee375908
+  metadata.gz: 780184ebc02c020389bc2239e115e885df056fa6895ed32bd35b5315f2e55f86deb679f2966e7290118bc54f4d50478b4240d7d77470d27a5902af22948d83f1
+  data.tar.gz: 39c37a9db2c7c392209491e1609f8ab4c2b64d27371452b60310d326bd462b5e653196697d0faf8f4bf801793400e073bf73f2ed72a38e9c66bd9b8e98d1e778

data/lib/brick/extensions.rb

@@ -148,7 +148,8 @@ module ActiveRecord
                 translations[parts[0..-2].join('.')] = klass
               end
               if klass&.column_names.exclude?(parts.last) &&
-                 (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
+                 (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.last&.to_sym)&.klass)
+                parts.pop
                 if prefix.empty? # Custom columns start with an empty prefix
                   prefix << parts.shift until parts.empty?
                 end
@@ -162,6 +163,7 @@ module ActiveRecord
                 if emit_dsl
                   dsl3 << "[#{prefix[1..-1].map { |p| "#{p.to_s}." }.join if prefix.length > 1}#{bracket_name}]"
                 end
+                parts[-1] = column_names.first if parts[-1].nil? # No primary key to be found?  Grab something to display!
                 members << parts
               end
             end
@@ -231,7 +233,8 @@ module ActiveRecord
                         if this_obj.is_a?(ActiveRecord::Base) && (obj_descrip = this_obj.class.brick_descrip(this_obj))
                           this_obj = obj_descrip
                         end
-                        if this_obj.is_a?(ActiveStorage::Filename) && this_obj.instance_variable_get(:@filename).nil?
+                        if Object.const_defined?('ActiveStorage') && this_obj.is_a?(::ActiveStorage::Filename) &&
+                           this_obj.instance_variable_get(:@filename).nil?
                           this_obj.instance_variable_set(:@filename, '')
                         end
                         this_obj&.to_s || ''
@@ -741,12 +744,20 @@ module ActiveRecord
                          end
                        else
                          fk_col = (inv = hm.inverse_of)&.foreign_key || hm.foreign_key
-                         poly_type = inv.foreign_type if hm.options.key?(:as)
+                         # %%% Might only need hm.type and not the first part :)
+                         poly_type = inv&.foreign_type || hm.type if hm.options.key?(:as)
                          pk = hm.klass.primary_key
                          (pk.is_a?(Array) ? pk.first : pk) || '*'
                        end
         next unless count_column # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
 
+        pri_tbl = hm.active_record
+        pri_key = hm.options[:primary_key] || pri_tbl.primary_key
+        unless hm.klass.column_names.include?(pri_key)
+          nix << k
+          next
+        end
+
         tbl_alias = if is_mysql
                       "`b_r_#{hm.name}`"
                     elsif is_postgres
@@ -754,7 +765,6 @@ module ActiveRecord
                     else
                       "b_r_#{hm.name}"
                     end
-        pri_tbl = hm.active_record
         pri_tbl_name = is_mysql ? "`#{pri_tbl.table_name}`" : "\"#{pri_tbl.table_name.gsub('.', '"."')}\""
         pri_tbl_name = if is_mysql
                          "`#{pri_tbl.table_name}`"
@@ -765,10 +775,10 @@ module ActiveRecord
                        end
         on_clause = []
         hm_selects = if fk_col.is_a?(Array) # Composite key?
-                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_tbl.primary_key[idx]}" }
+                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_key[idx]}" }
                        fk_col.dup
                      else
-                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_tbl.primary_key}"
+                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_key}"
                        [fk_col]
                      end
         if poly_type
@@ -1869,7 +1879,7 @@ class Object
               # Convert any Filename objects with nil into an empty string so that #encode can be called on them
               new_obj.serializable_hash.each do |k, v|
                 new_obj.send("#{k}=", ActiveStorage::Filename.new('')) if v.is_a?(ActiveStorage::Filename) && !v.instance_variable_get(:@filename)
-              end
+              end if Object.const_defined?('ActiveStorage')
             end
             instance_variable_set("@#{singular_table_name}".to_sym, new_obj)
           end
@@ -2441,7 +2451,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         singular = rel_name.last
       end
       name_parts = if (tnp = ::Brick.config.table_name_prefixes
-                                    .find { |k1, _v1| singular.start_with?(k1) && singular.length > k1.length }
+                                    &.find { |k1, _v1| singular.start_with?(k1) && singular.length > k1.length }
                       ).present?
                      v[:auto_prefixed_schema] = tnp.first
                      v[:resource] = rel_name.last[(tnp_length = tnp.first.length)..-1]

data/lib/brick/frameworks/rails/engine.rb

@@ -652,7 +652,9 @@ window.addEventListener(\"popstate\", linkSchemas);
                             else
                               hm_assoc.active_record.name
                             end
-                keys << [hm_assoc.inverse_of.foreign_type, poly_type]
+                # %%% Might only need hm_assoc.type and not the first part :)
+                type_col = hm_assoc.inverse_of&.foreign_type || hm_assoc.type
+                keys << [type_col, poly_type]
               end
               keys.to_h
             end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1661,7 +1661,8 @@ module ActiveRecord
               relation.brick_links[link_path] = if child.table.is_a?(Arel::Nodes::TableAlias)
                                                   child.table.right
                                                 else
-                                                  result.first&.left&.table_alias || child.table_name
+                                                  # Was:  result.first&.left&.table_alias || child.table_name
+                                                  child.table.table_alias || child.table_name
                                                 end
             end
             result

metadata

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