brick 1.0.26 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922a55ec392e2ea9cef11c7297e4c2e4883e918130a23e49102b5a7e2442140e
-  data.tar.gz: 7cda213ec2e7cdccae096ef4ad8091a53a91359a1e6fabeb753cc2b579ac5c16
+  metadata.gz: 1a312c2fd5baf0793b4bb4143167b4399c70a514991206a611d525d0784de95b
+  data.tar.gz: bb1af47d2d073dab2c046ff9757fb5db9447f02dd0688330ad7ac8ad678d6751
 SHA512:
-  metadata.gz: 7b817257f9c2aedd47bc2471b12e13edc8b370b71920258755f0f9a7594060e065d022e8d4b2b360cdc41f2a60def02cfc406889d526d80088670bd64acd58be
-  data.tar.gz: 1ea923301103dcc53853940770861ab5c2635f1280026e0740287274c0e9bb7d566ddcf96db0d3858467b788bc9ee4b73e7bcfc61145be1bbb43775cfb859b80
+  metadata.gz: dbfabaf60608b2094e9903cb538bab00706f434f94289b9647320bb128adf0b34317a6404ace34897cf4b2f91700ebd7c028a12b4072ba1ebf9de3380f75add3
+  data.tar.gz: 6e5444ac763c71de71fc1aca64cdb41db6276f1df57f5b556b03bad0b743373f2720865ba7c6ce36f9887d77ffee3b091f32d233121742c4786ca21e8d512705

data/lib/brick/config.rb

@@ -130,6 +130,14 @@ module Brick
       @mutex.synchronize { @schema_to_analyse = schema }
     end
 
+    def default_route_fallback
+      @mutex.synchronize { @default_route_fallback }
+    end
+
+    def default_route_fallback=(resource_name)
+      @mutex.synchronize { @default_route_fallback = resource_name }
+    end
+
     def skip_database_views
       @mutex.synchronize { @skip_database_views }
     end

data/lib/brick/extensions.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# Some future enhancement ideas:
+
 # Have markers on HM relationships to indicate "load this one every time" or "lazy load it" or "don't bother"
 # Others on BT to indicate "this is a lookup"
 
@@ -18,7 +20,7 @@
 # Sensitive stuff -- make a lock icon thing so people don't accidentally edit stuff
 
 # Static text that can go on pages - headings and footers and whatever
-# Eventually some indication about if it should be a paginated table / unpaginated / a list of just some fields / etc
+# Eventually some indication about if it should be a paginated table / unpaginated / a list of just some fields / columns shown in a different sequence / etc
 
 # Grid where each cell is one field and then when you mouse over then it shows a popup other table of detail inside
 
@@ -32,6 +34,9 @@
 
 # Currently quadrupling up routes
 
+# Modal pop-up things for editing large text / date ranges / hierarchies of data
+
+# For recognised self-references, have the show page display all related objects up to the parent (or the start of a circular reference)
 
 # ==========================================================
 # Dynamically create model or controller classes when needed
@@ -62,6 +67,18 @@ module ActiveRecord
       false
     end
 
+    def self._brick_primary_key(relation = nil)
+      return instance_variable_get(:@_brick_primary_key) if instance_variable_defined?(:@_brick_primary_key)
+
+      pk = primary_key.is_a?(String) ? [primary_key] : primary_key || []
+      # Just return [] if we're missing any part of the primary key.  (PK is usually just "id")
+      if relation && pk.present?
+        @_brick_primary_key ||= pk.any? { |pk_part| !relation[:cols].key?(pk_part) } ? [] : pk
+      else # No definitive key yet, so return what we can without setting the instance variable
+        pk
+      end
+    end
+
     # Used to show a little prettier name for an object
     def self.brick_get_dsl
       # If there's no DSL yet specified, just try to find the first usable column on this model
@@ -290,7 +307,7 @@ module ActiveRecord
       # %%% Skip the metadata columns
       if selects&.empty? # Default to all columns
         columns.each do |col|
-          selects << "#{table.name}.#{col.name}"
+          selects << "\"#{table.name}\".\"#{col.name}\""
         end
       end
 
@@ -344,23 +361,19 @@ module ActiveRecord
             next if chains[k1].nil?
 
             tbl_name = field_tbl_names[v.first][k1] ||= shift_or_first(chains[k1])
-            # if (col_name = v1[1].last&.last) # col_name is weak when there are multiple, using sel_col.last instead
             field_tbl_name = nil
-            v1.map { |x|
-                    [translations[x[0..-2].map(&:to_s).join('.')], x.last]
-                  }.each_with_index do |sel_col, idx|
-              field_tbl_name ||= field_tbl_names[v.first][sel_col.first] ||= shift_or_first(chains[sel_col.first])
+            v1.map { |x| [translations[x[0..-2].map(&:to_s).join('.')], x.last] }.each_with_index do |sel_col, idx|
+              field_tbl_name = field_tbl_names[v.first][sel_col.first] ||= shift_or_first(chains[sel_col.first])
 
-              selects << "#{"#{field_tbl_name}.#{sel_col.last}"} AS \"#{(col_alias = "_brfk_#{v.first}__#{sel_col.last}")}\""
+              selects << "#{"\"#{field_tbl_name}\".\"#{sel_col.last}\""} AS \"#{(col_alias = "_brfk_#{v.first}__#{sel_col.last}")}\""
               v1[idx] << col_alias
             end
-            # end
 
             unless id_for_tables.key?(v.first)
               # Accommodate composite primary key by allowing id_col to come in as an array
               ((id_col = k1.primary_key).is_a?(Array) ? id_col : [id_col]).each do |id_part|
                 id_for_tables[v.first] << if id_part
-                                            selects << "#{"#{tbl_name}.#{id_part}"} AS \"#{(id_alias = "_brfk_#{v.first}__#{id_part}")}\""
+                                            selects << "#{"\"#{tbl_name}\".\"#{id_part}\""} AS \"#{(id_alias = "_brfk_#{v.first}__#{id_part}")}\""
                                             id_alias
                                           end
               end
@@ -385,7 +398,8 @@ module ActiveRecord
                        else
                          fk_col = hm.foreign_key
                          poly_type = hm.inverse_of.foreign_type if hm.options.key?(:as)
-                         hm.klass.primary_key || '*'
+                         pk = hm.klass.primary_key
+                         (pk.is_a?(Array) ? pk.first : pk) || '*'
                        end
         tbl_alias = "_br_#{hm.name}"
         pri_tbl = hm.active_record
@@ -523,7 +537,7 @@ class Object
                  singular_table_name = ActiveSupport::Inflector.underscore(model_name)
  
                  # Adjust for STI if we know of a base model for the requested model name
-                 table_name = if (base_model = ::Brick.sti_models[model_name]&.fetch(:base, ::Brick.existing_stis[model_name]&.constantize))
+                 table_name = if (base_model = ::Brick.sti_models[model_name]&.fetch(:base, nil) || ::Brick.existing_stis[model_name]&.constantize)
                                 base_model.table_name
                               else
                                 ActiveSupport::Inflector.pluralize(singular_table_name)
@@ -564,7 +578,7 @@ class Object
         return
       end
 
-      if (base_model = ::Brick.sti_models[model_name]&.fetch(:base, ::Brick.existing_stis[model_name]&.constantize))
+      if (base_model = ::Brick.sti_models[model_name]&.fetch(:base, nil) || ::Brick.existing_stis[model_name]&.constantize)
         is_sti = true
       else
         base_model = ::Brick.config.models_inherit_from || ActiveRecord::Base
@@ -584,16 +598,14 @@ class Object
           code << "  def self.is_view?; true; end\n"
         end
 
-        # Missing a primary key column?  (Usually "id")
-        ar_pks = primary_key.is_a?(String) ? [primary_key] : primary_key || []
         db_pks = relation[:cols]&.map(&:first)
-        has_pk = ar_pks.length.positive? && (db_pks & ar_pks).sort == ar_pks.sort
+        has_pk = _brick_primary_key(relation).length.positive? && (db_pks & _brick_primary_key).sort == _brick_primary_key.sort
         our_pks = relation[:pkey].values.first
         # No primary key, but is there anything UNIQUE?
         # (Sort so that if there are multiple UNIQUE constraints we'll pick one that uses the least number of columns.)
         our_pks = relation[:ukeys].values.sort { |a, b| a.length <=> b.length }.first unless our_pks&.present?
         if has_pk
-          code << "  # Primary key: #{ar_pks.join(', ')}\n" unless ar_pks == ['id']
+          code << "  # Primary key: #{_brick_primary_key.join(', ')}\n" unless _brick_primary_key == ['id']
         elsif our_pks&.present?
           if our_pks.length > 1 && respond_to?(:'primary_keys=') # Using the composite_primary_keys gem?
             new_model_class.primary_keys = our_pks
@@ -602,6 +614,7 @@ class Object
             new_model_class.primary_key = (pk_sym = our_pks.first.to_sym)
             code << "  self.primary_key = #{pk_sym.inspect}\n"
           end
+          _brick_primary_key(relation) # Set the newly-found PK in the instance variable
         else
           code << "  # Could not identify any column(s) to use as a primary key\n" unless is_view
         end
@@ -613,10 +626,13 @@ class Object
             # The key in each hash entry (fk.first) is the constraint name
             inverse_assoc_name = (assoc = fk.last)[:inverse]&.fetch(:assoc_name, nil)
             if (invs = assoc[:inverse_table]).is_a?(Array)
-              invs.each { |inv| build_bt_or_hm(relations, model_name, relation, hmts, assoc, inverse_assoc_name, inv, code) }
-            else
-              build_bt_or_hm(relations, model_name, relation, hmts, assoc, inverse_assoc_name, invs, code)
+              if assoc[:is_bt]
+                invs = invs.first # Just do the first one of what would be multiple identical polymorphic belongs_to
+              else
+                invs.each { |inv| build_bt_or_hm(relations, model_name, relation, hmts, assoc, inverse_assoc_name, inv, code) }
+              end
             end
+            build_bt_or_hm(relations, model_name, relation, hmts, assoc, inverse_assoc_name, invs, code) unless invs.is_a?(Array)
             hmts
           end
           hmts.each do |hmt_fk, fks|
@@ -643,7 +659,7 @@ class Object
           # # Not NULLables
           # # %%% For the minute we've had to pull this out because it's been troublesome implementing the NotNull validator
           # relation[:cols].each do |col, datatype|
-          #   if (datatype[3] && ar_pks.exclude?(col) && ::Brick.config.metadata_columns.exclude?(col)) ||
+          #   if (datatype[3] && _brick_primary_key.exclude?(col) && ::Brick.config.metadata_columns.exclude?(col)) ||
           #      ::Brick.config.not_nullables.include?("#{matching}.#{col}")
           #     code << "  validates :#{col}, not_null: true\n"
           #     self.send(:validates, col.to_sym, { not_null: true })
@@ -740,13 +756,14 @@ class Object
     def build_controller(class_name, plural_class_name, model, relations)
       table_name = ActiveSupport::Inflector.underscore(plural_class_name)
       singular_table_name = ActiveSupport::Inflector.singularize(table_name)
+      pk = model._brick_primary_key(relations.fetch(table_name, nil))
 
       code = +"class #{class_name} < ApplicationController\n"
       built_controller = Class.new(ActionController::Base) do |new_controller_class|
         Object.const_set(class_name.to_sym, new_controller_class)
 
         code << "  def index\n"
-        code << "    @#{table_name} = #{model.name}#{model.primary_key ? ".order(#{model.primary_key.inspect})" : '.all'}\n"
+        code << "    @#{table_name} = #{model.name}#{pk&.present? ? ".order(#{pk.inspect})" : '.all'}\n"
         code << "    @#{table_name}.brick_select(params)\n"
         code << "  end\n"
         self.protect_from_forgery unless: -> { self.request.format.js? }
@@ -764,7 +781,8 @@ class Object
             return
           end
 
-          ar_relation = model.primary_key ? model.order("#{model.table_name}.#{model.primary_key}") : model.all
+          order = pk.each_with_object([]) { |pk_part, s| s << "#{model.table_name}.#{pk_part}" }
+          ar_relation = order.present? ? model.order("#{order.join(', ')}") : model.all
           @_brick_params = ar_relation.brick_select(params, (selects = []), (bt_descrip = {}), (hm_counts = {}), (join_array = ::Brick::JoinArray.new))
           # %%% Add custom HM count columns
           # %%% What happens when the PK is composite?
@@ -779,11 +797,15 @@ class Object
 
         if model.primary_key
           code << "  def show\n"
-          code << (find_by_id = "    @#{singular_table_name} = #{model.name}.find(params[:id].split(','))\n")
+          code << (find_by_id = "    id = params[:id]&.split(/[\\/,_]/)
+    id = id.first if id.is_a?(Array) && id.length == 1
+    @#{singular_table_name} = #{model.name}.find(id)\n")
           code << "  end\n"
           self.define_method :show do
             ::Brick.set_db_schema(params)
-            instance_variable_set("@#{singular_table_name}".to_sym, model.find(params[:id].split(',')))
+            id = params[:id]&.split(/[\/,_]/)
+            id = id.first if id.is_a?(Array) && id.length == 1
+            instance_variable_set("@#{singular_table_name}".to_sym, model.find(id))
           end
         end
 
@@ -792,6 +814,10 @@ class Object
           code << "  # (Define :new, :create)\n"
 
           if model.primary_key
+            if (schema = ::Brick.config.schema_to_analyse) && ::Brick.db_schemas&.include?(schema)
+              ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?;", schema)
+            end
+
             is_need_params = true
             # code << "  # (Define :edit, and :destroy)\n"
             code << "  def update\n"
@@ -866,12 +892,12 @@ module ActiveRecord::ConnectionHandling
   def _brick_reflect_tables
     if (relations = ::Brick.relations).empty?
     # Only for Postgres?  (Doesn't work in sqlite3)
-    # puts ActiveRecord::Base.connection.execute("SELECT current_setting('SEARCH_PATH')").to_a.inspect
+    # puts ActiveRecord::Base.execute_sql("SELECT current_setting('SEARCH_PATH')").to_a.inspect
 
     schema_sql = 'SELECT NULL AS table_schema;'
     case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL'
-        schema = 'public'
+        schema = 'public' # Too early at this point to be able to pick up:  Brick.config.schema_to_analyse
         schema_sql = 'SELECT DISTINCT table_schema FROM INFORMATION_SCHEMA.tables;'
       when 'Mysql2'
         schema = ActiveRecord::Base.connection.current_database
@@ -915,7 +941,7 @@ module ActiveRecord::ConnectionHandling
       measures = []
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'SQLite' # These bring back a hash for each row because the query uses column aliases
-        ActiveRecord::Base.connection.execute(sql).each do |r|
+        ActiveRecord::Base.execute_sql(sql).each do |r|
           # next if internal_views.include?(r['relation_name']) # Skip internal views such as v_all_assessments
           relation = relations[(relation_name = r['relation_name'])]
           relation[:isView] = true if r['table_type'] == 'VIEW'
@@ -934,7 +960,7 @@ module ActiveRecord::ConnectionHandling
           # puts "KEY! #{r['relation_name']}.#{col_name} #{r['key']} #{r['const']}" if r['key']
         end
       else # MySQL2 acts a little differently, bringing back an array for each row
-        ActiveRecord::Base.connection.execute(sql).each do |r|
+        ActiveRecord::Base.execute_sql(sql).each do |r|
           # next if internal_views.include?(r['relation_name']) # Skip internal views such as v_all_assessments
           relation = relations[(relation_name = r[0])] # here relation represents a table or view from the database
           relation[:isView] = true if r[1] == 'VIEW' # table_type
@@ -1000,11 +1026,11 @@ module ActiveRecord::ConnectionHandling
       else
       end
       if sql
-        ::Brick.db_schemas = ActiveRecord::Base.connection.execute(schema_sql)
+        ::Brick.db_schemas = ActiveRecord::Base.execute_sql(schema_sql)
         ::Brick.db_schemas = ::Brick.db_schemas.to_a unless ::Brick.db_schemas.is_a?(Array)
         ::Brick.db_schemas.map! { |row| row['table_schema'] } unless ::Brick.db_schemas.empty? || ::Brick.db_schemas.first.is_a?(String)
         ::Brick.db_schemas -= ['information_schema', 'pg_catalog']
-        ActiveRecord::Base.connection.execute(sql).each do |fk|
+        ActiveRecord::Base.execute_sql(sql).each do |fk|
           fk = fk.values unless fk.is_a?(Array)
           ::Brick._add_bt_and_hm(fk, relations)
         end
@@ -1113,10 +1139,10 @@ module Brick
       return if is_class || ::Brick.config.exclude_hms&.any? { |exclusion| fk[0] == exclusion[0] && fk[1] == exclusion[1] && primary_table == exclusion[2] }
 
       if (assoc_hm = hms.fetch((hm_cnstr_name = "hm_#{cnstr_name}"), nil))
-        if assoc_bt[:fk].is_a?(String)
-          assoc_bt[:fk] = [assoc_bt[:fk], fk[1]] unless fk[1] == assoc_bt[:fk]
-        elsif assoc_bt[:fk].exclude?(fk[1])
-          assoc_bt[:fk] << fk[1]
+        if assoc_hm[:fk].is_a?(String)
+          assoc_hm[:fk] = [assoc_hm[:fk], fk[1]] unless fk[1] == assoc_hm[:fk]
+        elsif assoc_hm[:fk].exclude?(fk[1])
+          assoc_hm[:fk] << fk[1]
         end
         assoc_hm[:alternate_name] = "#{assoc_hm[:alternate_name]}_#{bt_assoc_name}" unless assoc_hm[:alternate_name] == bt_assoc_name
         assoc_hm[:inverse] = assoc_bt

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

@@ -71,7 +71,8 @@ module Brick
               keys = if fk_name.is_a?(Array) && pk.is_a?(Array) # Composite keys?
                        fk_name.zip(pk.map { |pk_part| "#{obj_name}.#{pk_part}" })
                      else
-                       [[fk_name, "#{obj_name}.#{pk}"]]
+                       pk = pk.each_with_object([]) { |pk_part, s| s << "#{obj_name}.#{pk_part}" }
+                       [[fk_name, "#{pk.length == 1 ? pk.first : pk.inspect}"]]
                      end
               keys << [hm_assoc.inverse_of.foreign_type, "#{hm_assoc.active_record.name}"] if hm_assoc.options.key?(:as)
               keys.map { |x| "#{x.first}: #{x.last}"}.join(', ')
@@ -82,7 +83,7 @@ module Brick
               return  _brick_find_template(*args, **options) unless @_brick_model
 
               model_name = @_brick_model.name
-              pk = @_brick_model.primary_key
+              pk = @_brick_model._brick_primary_key(::Brick.relations.fetch(model_name, nil))
               obj_name = model_name.underscore
               table_name = model_name.pluralize.underscore
               template_link = nil
@@ -112,7 +113,7 @@ module Brick
 "<%= obj = #{obj_name}.#{hm.first}; link_to(obj.brick_descrip, obj) if obj %>\n"
                                  end
                 elsif args.first == 'show'
-                  hm_stuff << "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}&.first&", pk)} }) %>\n"
+                  hm_stuff << "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
                 end
                 s << hm_stuff
               end
@@ -206,7 +207,13 @@ input[type=submit] {
   val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
 end
 def hide_bcrypt(val)
-  is_bcrypt?(val) ? '(hidden)' : val
+  if is_bcrypt?(val)
+    '(hidden)'
+  elsif val.is_a?(String) && val.encoding.name != 'UTF-8'
+    val[0..1000].force_encoding('UTF-8')
+  else
+    val
+  end
 end %>"
 
               if ['index', 'show', 'update'].include?(args.first)
@@ -283,7 +290,7 @@ function changeout(href, param, value) {
               inline = case args.first
                        when 'index'
                          obj_pk = if pk&.is_a?(Array) # Composite primary key?
-                                    "[#{pk.map { |pk_part| "#{obj_name}.#{pk_part}" }.join(', ')}]"
+                                    "[#{pk.map { |pk_part| "#{obj_name}.#{pk_part}" }.join(', ')}]" unless pk.empty?
                                   elsif pk
                                     "#{obj_name}.#{pk}"
                                   end
@@ -385,9 +392,9 @@ function changeout(href, param, value) {
 
 <% if @_brick_params&.present? %><h3>where <%= @_brick_params.each_with_object([]) { |v, s| s << \"#\{v.first\} = #\{v.last.inspect\}\" }.join(', ') %></h3><% end %>
 <table id=\"#{table_name}\">
-  <thead><tr>#{'<th></th>' if pk}
+  <thead><tr>#{'<th></th>' if pk.present?}
   <% @#{table_name}.columns.map(&:name).each do |col| %>
-    <% next if col == '#{pk}' || ::Brick.config.metadata_columns.include?(col) || poly_cols.include?(col) %>
+    <% next if #{(pk || []).inspect}.include?(col) || ::Brick.config.metadata_columns.include?(col) || poly_cols.include?(col) %>
     <th>
     <% if (bt = bts[col]) %>
          BT <%
@@ -408,7 +415,7 @@ function changeout(href, param, value) {
   <tr>#{"
     <td><%= link_to '⇛', #{obj_name}_path(#{obj_pk}), { class: 'big-arrow' } %></td>" if obj_pk}
     <% #{obj_name}.attributes.each do |k, val| %>
-      <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) || poly_cols.include?(k) || k.start_with?('_brfk_') || (k.start_with?('_br_') && (k.length == 63 || k.end_with?('_ct'))) %>
+      <% next if #{(obj_pk || []).inspect}.include?(k) || ::Brick.config.metadata_columns.include?(k) || poly_cols.include?(k) || k.start_with?('_brfk_') || (k.start_with?('_br_') && (k.length == 63 || k.end_with?('_ct'))) %>
       <td>
       <% if (bt = bts[k]) %>
         <%# binding.pry # Postgres column names are limited to 63 characters %>
@@ -444,7 +451,7 @@ function changeout(href, param, value) {
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
-<h1>#{model_name}: <%= (obj = @#{obj_name}&.first)&.brick_descrip || controller_name %></h1>
+<h1>#{model_name}: <%= (obj = @#{obj_name})&.brick_descrip || controller_name %></h1>
 <%= link_to '(See all #{obj_name.pluralize})', #{table_name}_path %>
 <% if obj %>
   <%= # path_options = [obj.#{pk}]
@@ -453,10 +460,9 @@ function changeout(href, param, value) {
     form_for(obj.becomes(#{model_name})) do |f| %>
   <table>
   <% has_fields = false
-    @#{obj_name}.first.attributes.each do |k, val| %>
+    @#{obj_name}.attributes.each do |k, val| %>
     <tr>
-    <%# %%% Accommodate composite keys %>
-    <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
+    <% next if #{(pk || []).inspect}.include?(k) || ::Brick.config.metadata_columns.include?(k) %>
     <th class=\"show-field\">
     <% has_fields = true
       if (bt = bts[k])
@@ -464,21 +470,31 @@ function changeout(href, param, value) {
         bt_name = bt[1].map { |x| x.first.name }.join('/')
         # %%% Only do this if the user has permissions to edit this bt field
         if bt[2] # Polymorphic?
-          poly_class_name = @#{obj_name}.first.send(\"#\{bt.first\}_type\")
-          bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
+          poly_class_name = orig_poly_name = @#{obj_name}.send(\"#\{bt.first\}_type\")
+          bt_pair = nil
+          loop do
+            bt_pair = bt[1].find { |pair| pair.first.name == poly_class_name }
+            # Acxommodate any valid STI by going up the chain of inheritance
+            break unless bt_pair.nil? && poly_class_name = ::Brick.existing_stis[poly_class_name]
+          end
+          puts \"*** Might be missing an STI class called #\{orig_poly_name\} whose base class should have this:
+***   has_many :#{table_name}, as: :#\{bt.first\}
+*** Can probably auto-configure everything using these lines in an initialiser:
+***   Brick.sti_namespace_prefixes = { '::#\{orig_poly_name\}' => 'SomeParentModel' }
+***   Brick.polymorphics = { '#{table_name}.#\{bt.first\}' => ['SomeParentModel'] }\" if bt_pair.nil?
           # descrips = @_brick_bt_descrip[bt.first][bt_class]
-          poly_id = @#{obj_name}.first.send(\"#\{bt.first\}_id\")
+          poly_id = @#{obj_name}.send(\"#\{bt.first\}_id\")
           # bt_class.order(obj_pk = bt_class.primary_key).each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
         else # No polymorphism, so just get the first one
           bt_pair = bt[1].first
         end
-        bt_class = bt_pair.first
+        bt_class = bt_pair&.first
         if bt.length < 4
           bt << (option_detail = [[\"(No #\{bt_name\} chosen)\", '^^^brick_NULL^^^']])
           # %%% Accommodate composite keys for obj.pk at the end here
-          bt_class.order(obj_pk = bt_class.primary_key).each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
+          bt_class&.order(obj_pk = bt_class.primary_key)&.each { |obj| option_detail << [obj.brick_descrip(nil, obj_pk), obj.send(obj_pk)] }
         end %>
-        BT <%= bt_class.bt_link(bt.first) %>
+        BT <%= bt_class&.bt_link(bt.first) || orig_poly_name %>
     <% else %>
       <%= k %>
     <% end %>
@@ -488,7 +504,7 @@ function changeout(href, param, value) {
       html_options = { prompt: \"Select #\{bt_name\}\" }
       html_options[:class] = 'dimmed' unless val %>
       <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
-      <%= bt_obj = bt_class.find_by(bt_pair[1] => val); link_to('⇛', send(\"#\{bt_class.base_class.name.underscore\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' }) if bt_obj %>
+      <%= bt_obj = bt_class&.find_by(bt_pair[1] => val); link_to('⇛', send(\"#\{bt_class.base_class.name.underscore\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' }) if bt_obj %>
     <% else case #{model_name}.column_for_attribute(k).type
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>
@@ -520,16 +536,17 @@ function changeout(href, param, value) {
 
   #{hms_headers.each_with_object(+'') do |hm, s|
     if (pk = hm.first.klass.primary_key)
-      s << "<table id=\"#{hm_name = hm.first.name.to_s}\">
+      hm_singular_name = (hm_name = hm.first.name.to_s).singularize.underscore
+      obj_pk = (pk.is_a?(Array) ? pk : [pk]).each_with_object([]) { |pk_part, s| s << "#{hm_singular_name}.#{pk_part}" }.join(', ')
+      s << "<table id=\"#{hm_name}\">
         <tr><th>#{hm[3]}</th></tr>
-        <% collection = @#{obj_name}.first.#{hm_name}
+        <% collection = @#{obj_name}.#{hm_name}
         collection = collection.is_a?(ActiveRecord::Associations::CollectionProxy) ? collection.order(#{pk.inspect}) : [collection]
         if collection.empty? %>
           <tr><td>(none)</td></tr>
         <% else %>
-          <% collection.uniq.each do |#{hm_singular_name = hm_name.singularize.underscore}| %>
-            <%# %%% accommodate composite primary key %>
-            <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm.first.klass.name.underscore}_path(#{hm_singular_name}.#{pk})) %></td></tr>
+          <% collection.uniq.each do |#{hm_singular_name}| %>
+            <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm.first.klass.name.underscore}_path([#{obj_pk}])) %></td></tr>
           <% end %>
         <% end %>
       </table>"

data/lib/brick/join_array.rb

@@ -213,7 +213,7 @@ module Brick
           puts "X3"
           super(key, ::Brick::JoinArray.new.replace([current, value]))
         when ::Brick::JoinArray # Concatenate new stuff onto any existing JoinArray
-          current.set_matching(value, nil)
+          current.set_matching(value, nil) if value
         when ::Brick::JoinHash # Graduate an existing hash into being in an array if things are dissimilar
           super(key, ::Brick::JoinArray.new.replace([current, value]))
           value

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -291,6 +291,10 @@ module Brick
       Brick.config.schema_to_analyse = schema
     end
 
+    def default_route_fallback=(resource_name)
+      Brick.config.default_route_fallback = resource_name
+    end
+
     # Load additional references (virtual foreign keys)
     # This is attempted early if a brick initialiser file is found, and then again as a failsafe at the end of our engine's initialisation
     # %%% Maybe look for differences the second time 'round and just add new stuff instead of entirely deferring
@@ -321,9 +325,9 @@ module Brick
 You might be missing an STI namespace prefix entry for these tables:  #{missing_stis.keys.join(', ')}.
 In config/initializers/brick.rb appropriate entries would look something like:
   Brick.sti_namespace_prefixes = {"
-            puts missing_stis.map { |_k, missing_sti| "\n    '::#{missing_sti}' => 'YourParentModel'" }.join(',')
+            puts missing_stis.map { |_k, missing_sti| "\n    '::#{missing_sti}' => 'SomeParentModel'" }.join(',')
             puts "  }
-(Just trade out YourParentModel with some more appropriate one.)"
+(Just trade out SomeParentModel with some more appropriate one.)"
           end
         end
         @_additional_references_loaded = true
@@ -381,6 +385,9 @@ In config/initializers/brick.rb appropriate entries would look something like:
     def finalize!
       existing_controllers = routes.each_with_object({}) { |r, s| c = r.defaults[:controller]; s[c] = nil if c }
       ::Rails.application.routes.append do
+        unless ::Brick.config.default_route_fallback.blank? || ::Rails.application.routes.named_routes.send(:routes)[:root]
+          send(:root, "#{::Brick.config.default_route_fallback}#index")
+        end
         # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
         # If auto-controllers and auto-models are both enabled then this makes sense:
         ::Brick.relations.each do |k, v|
@@ -444,7 +451,7 @@ ActiveSupport.on_load(:active_record) do
             relation = clone # spawn
             relation.select_values = column_names
             result = if klass.connection.class.name.end_with?('::PostgreSQLAdapter')
-                       rslt = klass.connection.execute(relation.arel.to_sql)
+                       rslt = klass.execute_sql(relation.arel.to_sql)
                        rslt.type_map =
                          @type_map ||= proc do
                            # This aliasing avoids the warning:

data/lib/generators/brick/install_generator.rb

@@ -113,24 +113,24 @@ module Brick
 # #   #{resembles_fks.join(', ')}"
       end
 
-      poly = case (possible_polymorphics = possible_polymorphics.values.flatten).length
+      poly = case (possible_polymorphics = possible_polymorphics.values.flatten.map { |poss_poly| "#{poss_poly} => nil"}).length
       when 0
 " like this:
-# Brick.polymorphics = [
-#                        'comments.commentable',
-#                        'images.imageable'
-#                      ]"
+# Brick.polymorphics = {
+#                        'comments.commentable' => nil,
+#                        'images.imageable' => nil
+#                      }"
       when 1
 ".
 # # Here is a possible polymorphic association that has been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
-# Brick.polymorphics = [#{possible_additional_references.first}]"
+# Brick.polymorphics = { #{possible_additional_references.first} }"
 
       else
 ".
 # # Here are possible polymorphic associations that have been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
-# Brick.polymorphics = [
+# Brick.polymorphics = {
 #   #{possible_polymorphics.join(",\n#   ")}
-# ]"
+# }"
       end
 
       create_file(filename, "# frozen_string_literal: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.29
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord