brick 1.0.78 → 1.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f0716e20661f909922bdcddf3401b79b87c33c7b118d1581dfdf9861dd702c
-  data.tar.gz: 45323c512a8c7490b0ac715595ead6e6299d06a442b9c723318b90bcdce6106d
+  metadata.gz: eedc546e7e9693459cf228ee376650cdf53c0325e55d50ef24bbf46d421f8738
+  data.tar.gz: c4feda4b5db8334363d05f3418dc172f0dbf408c21192222008a5b9a174ae448
 SHA512:
-  metadata.gz: 2ef6ac2089e1150bc9c74c6625fc3e7627f5ee06a42d1a2d5fe43790d99156abacc27ba2e042044ee42171f352718d99ae8b468ec9dca4350cd6631bead51ce7
-  data.tar.gz: 8c4da365eb99677930a9f35f0cd5981b91adc790a13ecf55b5369da03fdf1592cccd01f911457cf204aa8769767d5a8537d856ff7080dec75543524b3e680904
+  metadata.gz: 0c9713099c057b9c9041121576a4f38d5949213926a47d597f88f4a9021ce14cd3df2a30c14b8b929b92ba4549ec4492bdfd8de13cb0a4f710e911c00eab67b6
+  data.tar.gz: 27ca4aa6d40e165aaca5b09cf5b2ce97737b26adc8424b1d25d81b9813100679e9e06a61279c4fd8b96d750a89a4c4cb8eafbfe2d425a4d4c6868644820f297d

data/lib/brick/extensions.rb

@@ -614,15 +614,16 @@ module ActiveRecord
         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.)
-                         x = [hmt_assoc = hm]
+                         hmt_assoc = hm
+                         x = []
                          x.unshift(hmt_assoc) while hmt_assoc.options[:through] && (hmt_assoc = klass.reflect_on_association(hmt_assoc.options[:through]))
-                         from_clause = +"#{x.first.klass.table_name} br_t0"
+                         from_clause = +"#{x.first.table_name} br_t0"
                          fk_col = x.shift.foreign_key
                          link_back = [klass.primary_key] # %%% Inverse path back to the original object -- used to build out a link with a filter
                          idx = 0
                          bail_out = nil
-                         x[0..-2].map do |a|
-                           from_clause << "\n LEFT OUTER JOIN #{a.klass.table_name} br_t#{idx += 1} "
+                         x.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
                                             "ON br_t#{idx}.id = br_t#{idx - 1}.#{a.foreign_key}"
                                           elsif src_ref.options[:as]
@@ -637,18 +638,22 @@ module ActiveRecord
                                             "ON br_t#{idx}.#{a.foreign_key} = br_t#{idx - 1}.id"
                                           end
                            link_back.unshift(a.source_reflection.name)
-                           [a.klass.table_name, a.foreign_key, a.source_reflection.macro]
+                           [a.table_name, a.foreign_key, a.source_reflection.macro]
                          end
                          next if bail_out
-                         # count_column is determined from the last HMT member
-                         if (src_ref = x.last.source_reflection).macro == :belongs_to # Traditional HMT using an associative table
-                           "br_t#{idx}.#{x.last.foreign_key}"
+                         # count_column is determined from the originating HMT member
+                         if (src_ref = hm.source_reflection).nil?
+                           puts "*** Warning:  Could not determine destination model for this HMT association in model #{klass.name}:\n  has_many :#{hm.name}, through: :#{hm.options[:through]}"
+                           nix << k
+                           bail_out = true
+                         elsif src_ref.macro == :belongs_to # Traditional HMT using an associative table
+                           "br_t#{idx}.#{hm.foreign_key}"
                          else # A HMT that goes HM -> HM, something like Categories -> Products -> LineItems
                            "br_t#{idx}.#{src_ref.active_record.primary_key}"
                          end
                        else
-                         fk_col = hm.foreign_key
-                         poly_type = hm.inverse_of.foreign_type if hm.options.key?(:as)
+                         fk_col = (inv = hm.inverse_of)&.foreign_key || hm.foreign_key
+                         poly_type = inv.foreign_type if hm.options.key?(:as)
                          pk = hm.klass.primary_key
                          (pk.is_a?(Array) ? pk.first : pk) || '*'
                        end
@@ -684,11 +689,11 @@ module ActiveRecord
         end
         unless from_clause
           hm_table_name = if is_mysql
-                            "`#{hm.klass.table_name}`"
+                            "`#{hm.table_name}`"
                           elsif is_postgres || is_mssql
-                            "\"#{(hm.klass.table_name).gsub('.', '"."')}\""
+                            "\"#{(hm.table_name).gsub('.', '"."')}\""
                           else
-                            hm.klass.table_name
+                            hm.table_name
                           end
         end
         group_bys = ::Brick.is_oracle || is_mssql ? selects : (1..selects.length).to_a
@@ -1383,7 +1388,7 @@ class Object
           ordering = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
           order_by, _ = model._brick_calculate_ordering(ordering, true) # Don't do the txt part
 
-          @_brick_params = (ar_relation = model.all).brick_select(params, (selects = []), nil,
+          @_brick_params = (ar_relation = model.all).brick_select(params, (selects = []), order_by,
                                                                   translations = {},
                                                                   join_array = ::Brick::JoinArray.new)
           # %%% Add custom HM count columns
@@ -1658,7 +1663,10 @@ module ActiveRecord::ConnectionHandling
       # .default_schema are specified then we can work with non-tenanted models more appropriately
       if (apartment = Object.const_defined?('Apartment')) &&
          File.exist?(apartment_initializer = ::Rails.root.join('config/initializers/apartment.rb'))
-        load apartment_initializer
+        unless @_apartment_loaded
+          load apartment_initializer
+          @_apartment_loaded = true
+        end
         apartment_excluded = Apartment.excluded_models
       end
       # Only for Postgres  (Doesn't work in sqlite3 or MySQL)

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

@@ -813,6 +813,24 @@ erDiagram
                  hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
                  "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
                end.join(', ')}}
+     # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
+     @#{table_name} ||= if dym_list = instance_variables.reject do |entry|
+                             entry.to_s.start_with?('@_') ||
+                             ['@cache_hit', '@marked_for_same_origin_verification', '@view_renderer', '@view_flow', '@output_buffer', '@virtual_path'].include?(entry.to_s)
+                           end
+                          msg = \"Can't find resource \\\"#{table_name}\\\".\"
+                           # Can't be sure otherwise of what is up, so check DidYouMean and offer a suggestion.
+                          if (dym = DidYouMean::SpellChecker.new(dictionary: dym_list).correct('@#{table_name}')).present?
+                            msg << \"\nIf you meant \\\"#\{found_dym = dym.first[1..-1]}\\\" then to avoid this message add this entry into inflections.rb:\n\"
+                            msg << \"  inflect.singular('#\{found_dym}', '#{obj_name}')\"
+                            puts
+                            puts \"WARNING:  #\{msg}\"
+                            puts
+                            @#{table_name} = instance_variable_get(dym.first.to_sym)
+                          else
+                            raise ActiveRecord::RecordNotFound.new(msg)
+                          end
+                        end
      col_keys = @#{table_name}.columns.each_with_object([]) do |col, s|
        col_name = col.name
        next if @_brick_incl&.exclude?(col_name) ||

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -179,13 +179,21 @@ module Brick
 
         case a.macro
         when :belongs_to
-          s.first[a.foreign_key] = if a.polymorphic?
-                                     primary_tables = relations[model.table_name][:fks].find { |_k, fk| fk[:assoc_name] == a.name.to_s }&.last&.fetch(:inverse_table, [])
-                                     models = primary_tables&.map { |table| table.singularize.camelize.constantize }
-                                     [a.name, models, true]
-                                   else
-                                     [a.name, a.klass]
-                                   end
+          if a.polymorphic?
+            rel_poly_bt = relations[model.table_name][:fks].find { |_k, fk| fk[:assoc_name] == a.name.to_s }
+            if (primary_tables = rel_poly_bt&.last&.fetch(:inverse_table, [])).is_a?(Array)
+              models = primary_tables&.map { |table| table.singularize.camelize.constantize }
+              s.first[a.foreign_key] = [a.name, models, true]
+            else
+              # This will come up when using Devise invitable when invited_by_class_name is not
+              # specified because in that circumstance it adds a polymorphic :invited_by association,
+              # along with appropriate invited_by_type and invited_by_id columns.
+              puts "Missing any real indication as to which models \"has_many\" this polymorphic BT in model #{a.active_record.name}:"
+              puts "  belongs_to :#{a.name}, polymorphic: true"
+            end
+          else
+            s.first[a.foreign_key] = [a.name, a.klass]
+          end
         when :has_many, :has_one # This gets has_many as well as has_many :through
           # %%% weed out ones that don't have an available model to reference
           s.last[a.name] = a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.78
+  version: 1.0.79
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord