brick 1.0.140 → 1.0.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995f6ed970029309b465f80193521b91c63335e12400cbb21e0ef0d60fe60dd2
-  data.tar.gz: c610df65f26a9e9bf4f081c8d0172fea6fc69cda350d26cf5287362237e7ceca
+  metadata.gz: 4e907aa4b41603045845a12d80de47e9ad714768929225b8bec209ddd9b92212
+  data.tar.gz: 227137ba8ec83040eec6dbf76c3541f6438b7427c586690f7430572cdd59eb8a
 SHA512:
-  metadata.gz: 534bde690d45d11d8371d0e666df86badc47879242bcf67a219aeff6dc71fb1ac668b02bba5059f2fceafa63ddb6312cf3e42e993c5ba1de47ebf276abd9bb7c
-  data.tar.gz: 18e0c976540749fbc93fd89be05735d2e9544db37d04a3738bc06e82fdc2811d9478398fa66881d17e9e18cb44e78720f66cc8db74660ddd6b5e23e523ea2db7
+  metadata.gz: b68b20ad2ef66293dd7bdfd329c1ea341fb535e6240128beb1d5cd0dec99503ecc95b44b1adfde24f1493e4d7edb20ea61c7a4c9a1e5f6502b95c3c512261208
+  data.tar.gz: 45722aa4054d96a858bab394a0e207e37d92ab415eb2a5832807e95d855e1c662139074bde9cf545d662a062fbe834ccd228d9595061c1dfde73990e6a3b3feb

data/lib/brick/config.rb

@@ -348,7 +348,7 @@ module Brick
     end
 
     def always_load_fields
-      @mutex.synchronize { @always_load_fields || Hash.new { |h, k| h[k] = [] } }
+      @mutex.synchronize { @always_load_fields || {} }
     end
 
     def always_load_fields=(field_set)

data/lib/brick/extensions.rb

@@ -296,7 +296,7 @@ module ActiveRecord
 
     # Providing a relation object allows auto-modules built from table name prefixes to work
     def self._brick_index(mode = nil, separator = '_', relation = nil)
-      return if abstract_class
+      return if abstract_class?
 
       tbl_parts = ((mode == :singular) ? table_name.singularize : table_name).split('.')
       tbl_parts.shift if ::Brick.apartment_multitenant && tbl_parts.length > 1 && tbl_parts.first == ::Brick.apartment_default_tenant
@@ -574,9 +574,14 @@ module ActiveRecord
                        "'<#{typ.end_with?('_TYP') ? typ[0..-5] : typ}>' AS #{col.name}"
                      end
         end
-      else # Having some select columns chosen, add any missing always_load_fields for this model
-        ::Brick.config.always_load_fields.fetch(klass.name, nil)&.each do |alf|
-          selects << alf unless selects.include?(alf)
+      else # Having some select columns chosen, add any missing always_load_fields for this model ...
+        this_model = klass
+        loop do
+          ::Brick.config.always_load_fields.fetch(this_model.name, nil)&.each do |alf|
+            selects << alf unless selects.include?(alf)
+          end
+          # ... plus any and all STI superclasses it may inherit from
+          break if (this_model = this_model.superclass).abstract_class? || this_model == ActiveRecord::Base
         end
       end
 
@@ -637,7 +642,8 @@ module ActiveRecord
           col_prefix = 'br_cc_' if brick_col_names
           if (cc_part_idx = cc_part.length - 1).zero?
             col_alias = "#{col_prefix}#{k}__#{table_name.tr('.', '_')}_#{cc_part.first}"
-          else
+          elsif brick_col_names ||
+                used_col_aliases.key?(col_alias = k.to_s) # This sets a simpler custom column name if possible
             while cc_part_idx > 0 &&
                   (col_alias = "#{col_prefix}#{k}__#{cc_part[cc_part_idx..-1].map(&:to_s).join('__').tr('.', '_')}") &&
                   used_col_aliases.key?(col_alias)
@@ -965,19 +971,36 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
       [self.select(selects), descrip_cols]
     end
 
-    def brick_uniq
+    # Accommodate when a relation gets queried for a model, and in that model it has an #after_initialize block
+    # which references attributes that were not originally included as part of the select_values.
+    def brick_(method, *args, brick_orig_relation: nil, **kwargs, &block)
       begin
-        uniq
+        send(method, *args, **kwargs, &block) # method will be something like :uniq or :each
       rescue ActiveModel::MissingAttributeError => e
-        # If this model has an #after_initialize then it might try to reference attributes we haven't brought in
         if (err_msg = e.message).start_with?('missing attribute: ') &&
            klass.column_names.include?(col_name = e.message[19..-1])
           (dup_rel = dup).select_values << col_name
-          ret = dup_rel.brick_uniq
-          puts "*** WARNING: Missing field!
-  Might want to add this in your brick.rb:
-    ::Brick.always_load_fields = { #{klass.name.inspect} => [#{col_name.inspect}]}"
-          ::Brick.config.always_load_fields[klass.name] << col_name
+          ret = dup_rel.brick_(method, *args, brick_orig_relation: (brick_orig_relation ||= self), **kwargs, &block)
+          always_loads = (::Brick.config.always_load_fields ||= {})
+
+          # Find the most parent STI superclass for this model, and apply an always_load_fields entry for this missing column
+          has_field = false
+          this_model = klass
+          loop do
+            has_field = true if always_loads.key?(this_model.name) && always_loads[this_model.name]&.include?(col_name)
+            break if has_field || (next_model = this_model.superclass).abstract_class? || next_model == ActiveRecord::Base
+            this_model = next_model
+          end
+          unless has_field
+            (brick_orig_relation || self).instance_variable_set(:@brick_new_alf, ((always_loads[this_model.name] ||= []) << col_name))
+          end
+
+          if self.object_id == brick_orig_relation.object_id
+            puts "*** WARNING: Missing field#{'s' if @brick_new_alf.length > 1}!
+Might want to add this in your brick.rb:
+  ::Brick.always_load_fields = { #{klass.name.inspect} => #{@brick_new_alf.inspect} }"
+            remove_instance_variable(:@brick_new_alf)
+          end
           ret
         else
           []

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

@@ -658,11 +658,11 @@ window.addEventListener(\"popstate\", linkSchemas);
                      else
                        [[fk_name, pk.length == 1 ? pk.first : pk.inspect]]
                      end
-              if hm_assoc.options.key?(:as)
-                poly_type = if hm_assoc.active_record.column_names.include?(hm_assoc.active_record.inheritance_column)
+              if hm_assoc.options.key?(:as) && !(hmaar = hm_assoc.active_record).abstract_class?
+                poly_type = if hmaar.column_names.include?(hmaar.inheritance_column)
                               '[sti_type]'
                             else
-                              hm_assoc.active_record.name
+                              hmaar.name
                             end
                 # %%% Might only need hm_assoc.type and not the first part :)
                 type_col = hm_assoc.inverse_of&.foreign_type || hm_assoc.type
@@ -1649,7 +1649,7 @@ end
           bt << (option_detail = [[\"(No #\{bt_name\} chosen)\", '^^^brick_NULL^^^']])
           # %%% Accommodate composite keys for obj.pk at the end here
           collection, descrip_cols = bt_class&.order(Arel.sql(\"#\{bt_class.table_name}.#\{obj_pk = bt_class.primary_key}\"))&.brick_list
-          collection&.each do |obj|
+          collection&.brick_(:each) do |obj|
             option_detail << [
               obj.brick_descrip(
                 descrip_cols&.first&.map { |col| obj.send(col.last) },
@@ -1729,7 +1729,7 @@ end
         else # We get an array back when AR < 4.2
           collection2 = collection.to_a.compact
         end
-        collection2 = collection2.brick_uniq
+        collection2 = collection2.brick_(:uniq)
         if collection2.empty? %>
           <tr><td>(none)</td></tr>
      <% else

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 140
+    TINY = 142
 
     # 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.140
+  version: 1.0.142
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord