brick 1.0.38 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fcc487d2177c77f487d6d7ec910d0cb1ec61e1a9da77fdbd7e7bd413ebe7373
-  data.tar.gz: 618bb20e4ff8aea7a81f02191100cb9bf15905a69099a8bbaec56cea6f27e882
+  metadata.gz: 4455ebfde80fe8a4bd51f19438171abae2614e0740adba98ab39184952843a01
+  data.tar.gz: d5157748c37564156fc2f823cc3c4753b536491aa2cf81175683c8241fb2a2b9
 SHA512:
-  metadata.gz: 4d71c229f3c9ae97866aeeb5f852504f593136de06dbb5b500917454d38a1f9b3afb17ab7ba0b1bfc21e9371739f37af0b4d88534d6db5332c88c4dafbccf67a
-  data.tar.gz: e1354cc5c4fb808aea3eb2a3b4580cdc31a37e51c799581d8461de21af520e1dab66793815e7a3ea8b3fc31b39b1e520ffb5150e7e6646279a2e3fe10933b770
+  metadata.gz: 2a649c78c3e597004b36d6c33f1cd812a712fcfd561dfe94994de28e489de81508f9fea30b0896b4447c4ce0ffd0877fb8c5d7e20a34011212fd797a3cbd02ca
+  data.tar.gz: 58ecdc4acb12abb77169a8fda8cb8146fceaedeacdf77f1cec992008f98b05412e3a9e2f5b6a9721880caa710ba94792a187d3587248eea4d9946d309c91be56

data/lib/brick/compatibility.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'active_record/version'
-
 # ActiveRecord before 4.0 didn't have #version
 unless ActiveRecord.respond_to?(:version)
   module ActiveRecord
@@ -11,6 +10,16 @@ unless ActiveRecord.respond_to?(:version)
   end
 end
 
+require 'action_view'
+# Older ActionView didn't have #version
+unless ActionView.respond_to?(:version)
+  module ActionView
+    def self.version
+      ActionPack.version
+    end
+  end
+end
+
 # In ActiveSupport older than 5.0, the duplicable? test tries to new up a BigDecimal,
 # and Ruby 2.6 and later deprecates #new.  This removes the warning from BigDecimal.
 # This compatibility needs to be put into place in the application's "config/boot.rb"

data/lib/brick/config.rb

@@ -205,5 +205,10 @@ module Brick
     def not_nullables=(columns)
       @mutex.synchronize { @not_nullables = columns }
     end
+
+    # Add a special page to show references to non-existent records ("orphans")
+    def add_orphans
+      true
+    end
   end
 end

data/lib/brick/extensions.rb

@@ -70,7 +70,11 @@ module ActiveRecord
     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 || []
+      pk = begin
+             primary_key.is_a?(String) ? [primary_key] : primary_key || []
+           rescue
+             []
+           end
       # 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
@@ -204,7 +208,7 @@ module ActiveRecord
       assoc_name = CGI.escapeHTML(assoc_name.to_s)
       model_path = Rails.application.routes.url_helpers.send("#{model_underscore.tr('/', '_').pluralize}_path".to_sym)
       av_class = Class.new.extend(ActionView::Helpers::UrlHelper)
-      av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('6.1')
+      av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('7')
       link = av_class.link_to(name, model_path)
       model_underscore == assoc_name ? link : "#{assoc_name}-#{link}".html_safe
     end
@@ -411,14 +415,16 @@ module ActiveRecord
       hm_counts.each do |k, hm|
         associative = nil
         count_column = if hm.options[:through]
-                         fk_col = (associative = associatives[hm.name]).foreign_key
-                         hm.foreign_key
+                         fk_col = (associative = associatives[hm.name])&.foreign_key
+                         hm.foreign_key if fk_col
                        else
                          fk_col = hm.foreign_key
                          poly_type = hm.inverse_of.foreign_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
+
         tbl_alias = "_br_#{hm.name}"
         pri_tbl = hm.active_record
         on_clause = []
@@ -552,7 +558,7 @@ Module.class_exec do
     #   return my_const
     end
 
-    relations = ::Brick.instance_variable_get(:@relations)[ActiveRecord::Base.connection_pool.object_id] || {}
+    relations = ::Brick.relations
     # puts "ON OBJECT: #{args.inspect}" if self.module_parent == Object
     result = if ::Brick.enable_controllers? && class_name.end_with?('Controller') && (plural_class_name = class_name[0..-11]).length.positive?
                # Otherwise now it's up to us to fill in the gaps
@@ -561,7 +567,9 @@ Module.class_exec do
                full_class_name = +''
                full_class_name << "::#{self.name}" unless self == Object
                full_class_name << "::#{plural_class_name.underscore.singularize.camelize}"
-               if (plural_class_name == 'BrickSwagger' || model = self.const_get(full_class_name))
+               if (plural_class_name == 'BrickSwagger' ||
+                  (::Brick.config.add_orphans && plural_class_name == 'BrickGem') ||
+                  model = self.const_get(full_class_name))
                  # if it's a controller and no match or a model doesn't really use the same table name, eager load all models and try to find a model class of the right name.
                  Object.send(:build_controller, self, class_name, plural_class_name, model, relations)
                end
@@ -627,8 +635,8 @@ Module.class_exec do
 #         module_prefixes.unshift('') unless module_prefixes.first.blank?
 #         candidate_file = Rails.root.join('app/models' + module_prefixes.map(&:underscore).join('/') + '.rb')
       self._brick_const_missing(*args)
-    elsif self != Object
-      module_parent.const_missing(*args)
+    # elsif self != Object
+    #   module_parent.const_missing(*args)
     else
       puts "MISSING! #{self.name} #{args.inspect} #{table_name}"
       self._brick_const_missing(*args)
@@ -893,6 +901,16 @@ class Object
       built_controller = Class.new(ActionController::Base) do |new_controller_class|
         (namespace || Object).const_set(class_name.to_sym, new_controller_class)
 
+        # Brick-specific pages
+        if plural_class_name == 'BrickGem'
+          self.define_method :orphans do
+            instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params)))
+            puts "BrickGemController #{action_name} #{params.inspect}"
+            # render inline: 'Brick gem!'
+          end
+          return [new_controller_class, code + ' # BrickGem controller!']
+        end
+
         unless (is_swagger = plural_class_name == 'BrickSwagger') # && request.format == :json)
           code << "  def index\n"
           code << "    @#{table_name} = #{model.name}#{pk&.present? ? ".order(#{pk.inspect})" : '.all'}\n"
@@ -1188,8 +1206,13 @@ module ActiveRecord::ConnectionHandling
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'SQLite' # These bring back a hash for each row because the query uses column aliases
         # schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        ar_smtn = if ActiveRecord::Base.respond_to?(:schema_migrations_table_name)
+                    ActiveRecord::Base.schema_migrations_table_name
+                  else
+                    'schema_migrations'
+                  end
         ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : ''
-        ActiveRecord::Base.execute_sql(sql, ActiveRecord::Base.schema_migrations_table_name, ar_imtn).each do |r|
+        ActiveRecord::Base.execute_sql(sql, ar_smtn, ar_imtn).each do |r|
           # If Apartment gem lists the table as being associated with a non-tenanted model then use whatever it thinks
           # is the default schema, usually 'public'.
           schema_name = if ::Brick.config.schema_behavior[:multitenant]
@@ -1466,5 +1489,72 @@ module Brick
       end
       assoc_bt[:inverse] = assoc_hm
     end
+
+    # Locate orphaned records
+    def find_orphans(multi_schema)
+      is_default_schema = multi_schema&.==(Apartment.default_schema)
+      relations.each_with_object([]) do |v, s|
+        frn_tbl = v.first
+        next if (relation = v.last).key?(:isView) || config.exclude_tables.include?(frn_tbl) ||
+                !(for_pk = (relation[:pkey].values.first&.first))
+
+        is_default_frn_schema = !is_default_schema && multi_schema &&
+                                ((frn_parts = frn_tbl.split('.')).length > 1 && frn_parts.first)&.==(Apartment.default_schema)
+        relation[:fks].select { |_k, assoc| assoc[:is_bt] }.each do |_k, bt|
+          begin
+            if bt.key?(:polymorphic)
+              pri_pk = for_pk
+              pri_tables = Brick.config.polymorphics["#{frn_tbl}.#{bt[:fk]}"]
+                                .each_with_object(Hash.new { |h, k| h[k] = [] }) do |pri_class, s|
+                s[Object.const_get(pri_class).table_name] << pri_class
+              end
+              fk_id_col = "#{bt[:fk]}_id"
+              fk_type_col = "#{bt[:fk]}_type"
+              selects = []
+              pri_tables.each do |pri_tbl, pri_types|
+                # Skip if database is multitenant, we're not focused on "public", and the foreign and primary tables
+                # are both in the "public" schema
+                next if is_default_frn_schema &&
+                        ((pri_parts = pri_tbl&.split('.'))&.length > 1 && pri_parts.first)&.==(Apartment.default_schema)
+
+                selects << "SELECT '#{pri_tbl}' AS pri_tbl, frn.#{fk_type_col} AS pri_type, frn.#{fk_id_col} AS pri_id, frn.#{for_pk} AS frn_id
+                FROM #{frn_tbl} AS frn
+                  LEFT OUTER JOIN #{pri_tbl} AS pri ON pri.#{pri_pk} = frn.#{fk_id_col}
+                WHERE frn.#{fk_type_col} IN (#{
+                  pri_types.map { |pri_type| "'#{pri_type}'" }.join(', ')
+                }) AND frn.#{bt[:fk]}_id IS NOT NULL AND pri.#{pri_pk} IS NULL\n"
+              end
+              ActiveRecord::Base.execute_sql(selects.join("UNION ALL\n")).each do |o|
+                entry = [frn_tbl, o['frn_id'], o['pri_type'], o['pri_id'], fk_id_col]
+                entry << o['pri_tbl'] if (pri_class = Object.const_get(o['pri_type'])) != pri_class.base_class
+                s << entry
+              end
+            else
+              # Skip if database is multitenant, we're not focused on "public", and the foreign and primary tables
+              # are both in the "public" schema
+              pri_tbl = bt.key?(:inverse_table) && bt[:inverse_table]
+              next if is_default_frn_schema &&
+                      ((pri_parts = pri_tbl&.split('.'))&.length > 1 && pri_parts.first)&.==(Apartment.default_schema)
+
+              pri_pk = relations[pri_tbl].fetch(:pkey, nil)&.values&.first&.first ||
+                       _class_pk(pri_tbl, multi_schema)
+              ActiveRecord::Base.execute_sql(
+                "SELECT frn.#{bt[:fk]} AS pri_id, frn.#{for_pk} AS frn_id
+                FROM #{frn_tbl} AS frn
+                  LEFT OUTER JOIN #{pri_tbl} AS pri ON pri.#{pri_pk} = frn.#{bt[:fk]}
+                WHERE frn.#{bt[:fk]} IS NOT NULL AND pri.#{pri_pk} IS NULL
+                ORDER BY 1, 2"
+              ).each { |o| s << [frn_tbl, o['frn_id'], pri_tbl, o['pri_id'], bt[:fk]] }
+            end
+          rescue StandardError => err
+            puts "Strange -- #{err.inspect}"
+          end
+        end
+      end
+    end
+
+    def _class_pk(dotted_name, multitenant)
+      Object.const_get((multitenant ? [dotted_name.split('.').last] : dotted_name.split('.')).map { |nm| "::#{nm.singularize.camelize}" }.join).primary_key
+    end
   end
 end

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

@@ -50,23 +50,28 @@ module Brick
         # ====================================
         if ::Brick.enable_views?
           ActionView::LookupContext.class_exec do
+            # Used by Rails 5.0 and above
             alias :_brick_template_exists? :template_exists?
             def template_exists?(*args, **options)
-              unless (is_template_exists = _brick_template_exists?(*args, **options))
-                # Need to return true if we can fill in the blanks for a missing one
-                # args will be something like:  ["index", ["categories"]]
-                args[1] = args[1].each_with_object([]) { |a, s| s.concat(a.split('/')) }
-                args[1][args[1].length - 1] = args[1].last.singularize # Make sure the last item, defining the class name, is singular
-                model = args[1].map(&:camelize).join('::').constantize
-                if is_template_exists = model && (
-                     ['index', 'show'].include?(args.first) || # Everything has index and show
+              (::Brick.config.add_orphans && args.first == 'orphans') ||
+              _brick_template_exists?(*args, **options) ||
+              set_brick_model(args)
+            end
+
+            def set_brick_model(find_args)
+              # Need to return true if we can fill in the blanks for a missing one
+              # args will be something like:  ["index", ["categories"]]
+              find_args[1] = find_args[1].each_with_object([]) { |a, s| s.concat(a.split('/')) }
+              if (class_name = find_args[1].last&.singularize)
+                find_args[1][find_args[1].length - 1] = class_name # Make sure the last item, defining the class name, is singular
+                if (model = find_args[1].map(&:camelize).join('::').constantize) && (
+                     ['index', 'show'].include?(find_args.first) || # Everything has index and show
                      # Only CUD stuff has create / update / destroy
-                      (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(args.first))
+                     (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
                    )
                   @_brick_model = model
                 end
               end
-              is_template_exists
             end
 
             def path_keys(hm_assoc, fk_name, obj_name, pk)
@@ -82,43 +87,58 @@ module Brick
 
             alias :_brick_find_template :find_template
             def find_template(*args, **options)
-              return  _brick_find_template(*args, **options) unless @_brick_model
-
-              model_name = @_brick_model.name
-              pk = @_brick_model._brick_primary_key(::Brick.relations.fetch(model_name, nil))
-              obj_name = model_name.split('::').last.underscore
-              path_obj_name = model_name.underscore.tr('/', '_')
-              table_name = obj_name.pluralize
-              template_link = nil
-              bts, hms, associatives = ::Brick.get_bts_and_hms(@_brick_model) # This gets BT and HM and also has_many :through (HMT)
-              hms_columns = [] # Used for 'index'
-              skip_klass_hms = ::Brick.config.skip_index_hms[model_name] || {}
-              hms_headers = hms.each_with_object([]) do |hm, s|
-                hm_stuff = [(hm_assoc = hm.last), "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]}", (assoc_name = hm.first)]
-                hm_fk_name = if hm_assoc.options[:through]
-                               associative = associatives[hm_assoc.name]
-                               "'#{associative.name}.#{associative.foreign_key}'"
-                             else
-                               hm_assoc.foreign_key
-                             end
-                if args.first == 'index'
-                  hms_columns << if hm_assoc.macro == :has_many
-                                   set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
-                                              'nil'
-                                            else
-                                              # Postgres column names are limited to 63 characters
-                                              attrib_name = "_br_#{assoc_name}_ct"[0..62]
-                                              "#{obj_name}.#{attrib_name} || 0"
-                                            end
+              unless (model_name = (
+                       @_brick_model ||
+                       (ActionView.version < ::Gem::Version.new('5.0') && args[1].is_a?(Array) ? set_brick_model(args) : nil)
+                     )&.name) ||
+                     (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']])
+                return _brick_find_template(*args, **options)
+              end
+
+              unless is_orphans
+                pk = @_brick_model._brick_primary_key(::Brick.relations.fetch(model_name, nil))
+                obj_name = model_name.split('::').last.underscore
+                path_obj_name = model_name.underscore.tr('/', '_')
+                table_name = obj_name.pluralize
+                template_link = nil
+                bts, hms, associatives = ::Brick.get_bts_and_hms(@_brick_model) # This gets BT and HM and also has_many :through (HMT)
+                hms_columns = [] # Used for 'index'
+                skip_klass_hms = ::Brick.config.skip_index_hms[model_name] || {}
+                hms_headers = hms.each_with_object([]) do |hm, s|
+                  hm_stuff = [(hm_assoc = hm.last), "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]}", (assoc_name = hm.first)]
+                  hm_fk_name = if hm_assoc.options[:through]
+                                associative = associatives[hm_assoc.name]
+                                associative && "'#{associative.name}.#{associative.foreign_key}'"
+                              else
+                                hm_assoc.foreign_key
+                              end
+                  if args.first == 'index'
+                    hms_columns << if hm_assoc.macro == :has_many
+                                     set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
+                                                'nil'
+                                              else
+                                                # Postgres column names are limited to 63 characters
+                                                attrib_name = "_br_#{assoc_name}_ct"[0..62]
+                                                "#{obj_name}.#{attrib_name} || 0"
+                                              end
+                                     if hm_fk_name
 "<%= ct = #{set_ct}
      link_to \"#\{ct || 'View'\} #{assoc_name}\", #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)} }) unless ct&.zero? %>\n"
-                                 else # has_one
+                                     else
+"#{assoc_name}\n"
+                                     end
+                                   else # has_one
 "<%= 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.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
+                                   end
+                  elsif args.first == 'show'
+                    hm_stuff << if hm_fk_name
+                                  "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
+                                else
+                                  assoc_name
+                                end
+                  end
+                  s << hm_stuff
                 end
-                s << hm_stuff
               end
 
               schema_options = ::Brick.db_schemas.keys.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
@@ -133,6 +153,7 @@ module Brick
                               end.sort.each_with_object(+'') do |v, s|
                                 s << "<option value=\"#{v.underscore.gsub('.', '/').pluralize}\">#{v}</option>"
                               end.html_safe
+              table_options << '<option value="brick_orphans">(Orphans)</option>'.html_safe if is_orphans
               css = +"<style>
 #dropper {
   background-color: #eee;
@@ -488,7 +509,7 @@ if (headerTop) {
                ::Brick.config.metadata_columns.include?(col_name) || poly_cols.include?(col_name)
 
        col_order << col_name
-    %><th<%= \" title = \\\"#\{col.comment}\\\"\".html_safe unless col.comment.blank? %>><%
+    %><th<%= \" title = \\\"#\{col.comment}\\\"\".html_safe if col.respond_to?(:comment) && !col.comment.blank? %>><%
        if (bt = bts[col_name]) %>
          BT <%
          bt[1].each do |bt_pair| %><%=
@@ -500,7 +521,13 @@ if (headerTop) {
   %></th><%
      end
      # Consider getting the name from the association -- h.first.name -- if a more \"friendly\" alias should be used for a screwy table name
-  %>#{hms_headers.map { |h| "<th>#{h[1]} <%= link_to('#{h[2]}', #{h.first.klass.name.underscore.tr('/', '_').pluralize}_path) %></th>" }.join
+  %>#{hms_headers.map do |h|
+        if h.first.options[:through] && !h.first.through_reflection
+    "<th>#{h[1]} #{h[2]} %></th>"
+        else
+    "<th>#{h[1]} <%= link_to('#{h[2]}', #{h.first.klass.name.underscore.tr('/', '_').pluralize}_path) %></th>"
+        end
+      end.join
   }</tr></thead>
 
   <tbody>
@@ -522,6 +549,7 @@ if (headerTop) {
                # 0..62 because Postgres column names are limited to 63 characters
                #{obj_name}, (descrips = @_brick_bt_descrip[bt.first][bt_class])[0..-2].map { |z| #{obj_name}.send(z.last[0..62]) }, (bt_id_col = descrips.last)
              )
+             bt_txt ||= \"<< Orphaned ID: #\{val} >>\" if val
              bt_id = #{obj_name}.send(*bt_id_col) if bt_id_col&.present? %>
           <%= bt_id ? link_to(bt_txt, send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_id)) : bt_txt %>
           <%#= Previously was:  bt_obj = bt[1].first.first.find_by(bt[2] => val); link_to(bt_obj.brick_descrip, send(\"#\{bt[1].first.first.name.underscore\}_path\".to_sym, bt_obj.send(bt[1].first.first.primary_key.to_sym))) if bt_obj %>
@@ -539,6 +567,22 @@ if (headerTop) {
 
 #{"<hr><%= link_to \"New #{obj_name}\", new_#{path_obj_name}_path %>" unless @_brick_model.is_view?}
 #{script}"
+                       when 'orphans'
+                         if is_orphans
+"#{css}
+<p style=\"color: green\"><%= notice %></p>#{"
+<select id=\"schema\">#{schema_options}</select>" if ::Brick.config.schema_behavior[:multitenant] && ::Brick.db_schemas.length > 1}
+<select id=\"tbl\">#{table_options}</select>
+<h1>Orphans<%= \" for #\{}\" if false %></h1>
+<% @orphans.each do |o|
+  via = \" (via #\{o[4]})\" unless \"#\{o[2].split('.').last.underscore.singularize}_id\" == o[4] %>
+  <a href=\"/<%= o[0].split('.').last %>/<%= o[1] %>\">
+    <%= \"#\{o[0]} #\{o[1]} refers#\{via} to non-existent #\{o[2]} #\{o[3]}#\{\" (in table \\\"#\{o[5]}\\\")\" if o[5]}\" %>
+  </a><br>
+<% end %>
+#{script}"
+                         end
+
                        when 'show', 'update'
 "#{css}
 <p style=\"color: green\"><%= notice %></p>#{"
@@ -562,7 +606,7 @@ end
     <tr>
     <% next if (#{(pk || []).inspect}.include?(k) && !bts.key?(k)) ||
                ::Brick.config.metadata_columns.include?(k) %>
-    <th class=\"show-field\"<%= \" title = \\\"#\{col.comment}\\\"\".html_safe unless col.comment.blank? %>>
+    <th class=\"show-field\"<%= \" title = \\\"#\{col.comment}\\\"\".html_safe if col.respond_to?(:comment) && !col.comment.blank? %>>
     <% has_fields = true
       if (bt = bts[k])
         # Add a final member in this array with descriptive options to be used in <select> drop-downs
@@ -603,7 +647,11 @@ end
       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.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' }) if bt_obj %>
+      <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
+            link_to('⇛', send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
+          elsif val
+            \"Orphaned ID: #\{val}\"
+          end %>
     <% else case #{model_name}.column_for_attribute(k).type
       when :string, :text %>
         <% if is_bcrypt?(val) # || .readonly? %>
@@ -634,6 +682,8 @@ end
   <% end %>
 
   #{hms_headers.each_with_object(+'') do |hm, s|
+    next if hm.first.options[:through] && !hm.first.through_reflection
+
     if (pk = hm.first.klass.primary_key)
       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(', ')

data/lib/brick/tasks/orphans.rake

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+if Object.const_defined?('::Rake::TaskManager')
+  namespace :brick do
+    desc 'Find any seemingly-orphaned records'
+    task orphans: :environment do
+      schema_list = ((multi = ::Brick.config.schema_behavior[:multitenant]) && ::Brick.db_schemas.keys.sort) || []
+      schema = if schema_list.length == 1
+                 schema_list.first
+               elsif schema_list.length.positive?
+                 require 'fancy_gets'
+                 include FancyGets
+                 gets_list(list: schema_list, chosen: multi[:schema_to_analyse])
+               end
+      ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?", schema) if schema
+      orphans = ::Brick.find_orphans(schema)
+      puts "Orphans in #{schema}:\n#{'=' * (schema.length + 12)}" if schema
+      if orphans.empty?
+        puts "No orphans!"
+      else
+        orphans.each do |o|
+          via = " (via #{o[4]})" unless "#{o[2].split('.').last.underscore.singularize}_id" == o[4]
+          puts "#{o[0]} #{o[1]} refers#{via} to non-existent #{o[2]} #{o[3]}#{" (in table \"#{o[5]}\")" if o[5]}"
+        end
+        puts
+      end
+    end
+  end
+end

data/lib/brick/util.rb

@@ -5,7 +5,7 @@ module Brick
   module Util
     # ===================================
     # Epic require patch
-    def self._patch_require(module_filename, folder_matcher, search_text, replacement_text, autoload_symbol = nil, is_bundler = false)
+    def self._patch_require(module_filename, folder_matcher, replacements, autoload_symbol = nil, is_bundler = false)
       mod_name_parts = module_filename.split('.')
       extension = case mod_name_parts.last
                   when 'rb', 'so', 'o'
@@ -28,10 +28,13 @@ module Brick
           Dir.mkdir(new_part) unless Dir.exist?(new_part)
           new_part
         end
-        if ::Brick::Util._write_patched(folder_matcher, module_filename, extension, custom_require_dir, nil, search_text, replacement_text) &&
+        if ::Brick::Util._write_patched(folder_matcher, module_filename, extension, custom_require_dir, nil, replacements) &&
            !alp.include?(custom_require_dir)
           alp.unshift(custom_require_dir)
         end
+        # require 'pry-byebug'
+        # binding.pry
+        # z = 10
       elsif is_bundler
         puts "Bundler hack"
         require 'pry-byebug'
@@ -56,13 +59,13 @@ module Brick
             define_method(:require) do |name|
               puts name if name.to_s.include?('cucu')
               if (require_override = ::Brick::Util.instance_variable_get(:@_require_overrides)[name])
-                extension, folder_matcher, search_text, replacement_text, autoload_symbol = require_override
+                extension, folder_matcher, replacements, autoload_symbol = require_override
                 patched_filename = "/patched_#{name.tr('/', '_')}#{extension}"
                 if $LOADED_FEATURES.find { |f| f.end_with?(patched_filename) }
                   false
                 else
                   is_replaced = false
-                  if (replacement_path = ::Brick::Util._write_patched(folder_matcher, name, extension, ::Brick::Util._custom_require_dir, patched_filename, search_text, replacement_text))
+                  if (replacement_path = ::Brick::Util._write_patched(folder_matcher, name, extension, ::Brick::Util._custom_require_dir, patched_filename, replacements))
                     is_replaced = Kernel.send(:orig_require, replacement_path)
                   elsif replacement_path.nil?
                     puts "Couldn't find #{name} to require it!"
@@ -75,7 +78,7 @@ module Brick
             end
           end
         end
-        require_overrides[module_filename] = [extension, folder_matcher, search_text, replacement_text, autoload_symbol]
+        require_overrides[module_filename] = [extension, folder_matcher, replacements, autoload_symbol]
       end
     end
 
@@ -94,7 +97,7 @@ module Brick
 
     # Returns the full path to the replaced filename, or
     # false if the file already exists, and nil if it was unable to write anything.
-    def self._write_patched(folder_matcher, name, extension, dir, patched_filename, search_text, replacement_text)
+    def self._write_patched(folder_matcher, name, extension, dir, patched_filename, replacements)
       # See if our replacement file might already exist for some reason
       name = +"/#{name}" unless name.start_with?('/')
       name << extension unless name.end_with?(extension)
@@ -111,9 +114,13 @@ module Brick
         break if path.include?(folder_matcher) && (orig_as = File.open(orig_path))
       end
       puts [folder_matcher, name].inspect
-      if (orig_text = orig_as&.read)
-        File.open(replacement_path, 'w') do |replacement|
-          num_written = replacement.write(orig_text.gsub(search_text, replacement_text))
+      if (updated_text = orig_as&.read)
+        File.open(replacement_path, 'w') do |replaced_file|
+          replacements = [replacements] unless replacements.first.is_a?(Array)
+          replacements.each do |search_text, replacement_text|
+            updated_text.gsub!(search_text, replacement_text)
+          end
+          num_written = replaced_file.write(updated_text)
         end
         orig_as.close
       end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -2,10 +2,10 @@
 
 require 'brick/compatibility'
 
-# Allow ActiveRecord 4.0 and 4.1 to work with newer Ruby (>= 2.4) by avoiding a "stack level too deep"
+# Allow ActiveRecord 4.2.7 and older to work with newer Ruby (>= 2.4) by avoiding a "stack level too deep"
 # error when ActiveSupport tries to smarten up Numeric by messing with Fixnum and Bignum at the end of:
 # activesupport-4.0.13/lib/active_support/core_ext/numeric/conversions.rb
-if ActiveRecord.version < ::Gem::Version.new('4.2') &&
+if ActiveRecord.version < ::Gem::Version.new('4.2.8') &&
    ActiveRecord.version > ::Gem::Version.new('3.2') &&
    Object.const_defined?('Integer') && Integer.superclass.name == 'Numeric'
   class OurFixnum < Integer; end
@@ -31,25 +31,78 @@ if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7'
   # Remove circular reference for "now"
   ::Brick::Util._patch_require(
     'active_support/values/time_zone.rb', '/activesupport',
-    '  def parse(str, now=now)',
-    '  def parse(str, now=now())'
+    ['  def parse(str, now=now)',
+     '  def parse(str, now=now())']
   )
   # Remove circular reference for "reflection" for ActiveRecord 3.1
   if ActiveRecord.version >= ::Gem::Version.new('3.1')
     ::Brick::Util._patch_require(
       'active_record/associations/has_many_association.rb', '/activerecord',
-      'reflection = reflection)',
-      'reflection = reflection())',
+      ['reflection = reflection)',
+       'reflection = reflection())'],
       :HasManyAssociation # Make sure the path for this guy is available to be autoloaded
     )
   end
 end
 
+# Add left_outer_join! to Associations::JoinDependency and Relation::QueryMethods
+if ActiveRecord.version < ::Gem::Version.new('5')
+  is_add_left_outer_join = true
+  ::Brick::Util._patch_require(
+    'active_record/associations/join_dependency.rb', '/activerecord', # /associations
+      ["def join_constraints(outer_joins)
+        joins = join_root.children.flat_map { |child|
+          make_inner_joins join_root, child
+        }",
+      "def join_constraints(outer_joins, join_type)
+        joins = join_root.children.flat_map { |child|
+
+          if join_type == Arel::Nodes::OuterJoin
+            make_left_outer_joins join_root, child
+          else
+            make_inner_joins join_root, child
+          end
+        }"],
+    :JoinDependency # This one is in an "eager_autoload do" -- so how to handle it?
+  )
+
+  # Three changes all in the same file, query_methods.rb:
+  ::Brick::Util._patch_require(
+    'active_record/relation/query_methods.rb', '/activerecord',
+    [
+     # Change 1 - Line 904
+     ['build_joins(arel, joins_values.flatten) unless joins_values.empty?',
+    "build_joins(arel, joins_values.flatten) unless joins_values.empty?
+      build_left_outer_joins(arel, left_outer_joins_values.flatten) unless left_outer_joins_values.empty?"
+    ],
+     # Change 2 - Line 992
+     ["raise 'unknown class: %s' % join.class.name
+        end
+      end",
+   "raise 'unknown class: %s' % join.class.name
+        end
+      end
+
+      build_join_query(manager, buckets, Arel::Nodes::InnerJoin)
+   end
+
+   def build_join_query(manager, buckets, join_type)"
+     ],
+     # Change 3 - Line 1012
+    ['join_infos = join_dependency.join_constraints stashed_association_joins',
+    'join_infos = join_dependency.join_constraints stashed_association_joins, join_type'
+     ]
+    ],
+    :QueryMethods
+  )
+end
+
+
 # puts ::Brick::Util._patch_require(
 #     'cucumber/cli/options.rb', '/cucumber/cli/options', # /cli/options
-#     '  def extract_environment_variables',
-#     "  def extract_environment_variables\n
-#     puts 'Patch test!'"
+#     ['  def extract_environment_variables',
+#      "  def extract_environment_variables\n
+#     puts 'Patch test!'"]
 #   ).inspect
 
 # An ActiveRecord extension that uses INFORMATION_SCHEMA views to reflect on all
@@ -75,7 +128,10 @@ module Brick
 
     def set_db_schema(params)
       schema = params['_brick_schema'] || 'public'
-      ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?;", schema) if schema && ::Brick.db_schemas&.include?(schema)
+      if schema && ::Brick.db_schemas&.include?(schema)
+        ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?;", schema)
+        schema
+      end
     end
 
     # All tables and views (what Postgres calls "relations" including column and foreign key info)
@@ -295,10 +351,11 @@ module Brick
 
       relations = ::Brick.relations
       if (ars = ::Brick.config.additional_references) || ::Brick.config.polymorphics
+        is_optional = ActiveRecord.version >= ::Gem::Version.new('5.0')
         if ars
           ars.each do |ar|
             fk = ar.length < 5 ? [nil, +ar[0], ar[1], nil, +ar[2]] : [ar[0], +ar[1], ar[2], ar[3], +ar[4], ar[5]]
-            ::Brick._add_bt_and_hm(fk, relations, false, true)
+            ::Brick._add_bt_and_hm(fk, relations, false, is_optional)
           end
         end
         if (polys = ::Brick.config.polymorphics)
@@ -311,7 +368,7 @@ module Brick
             v ||= ActiveRecord::Base.execute_sql("SELECT DISTINCT #{poly}_type AS typ FROM #{table_name}").each_with_object([]) { |result, s| s << result['typ'] if result['typ'] }
             v.each do |type|
               if relations.key?(primary_table = type.underscore.pluralize)
-                ::Brick._add_bt_and_hm([nil, table_name, poly, nil, primary_table, "(brick) #{table_name}_#{poly}"], relations, true, true)
+                ::Brick._add_bt_and_hm([nil, table_name, poly, nil, primary_table, "(brick) #{table_name}_#{poly}"], relations, true, is_optional)
               else
                 missing_stis[primary_table] = type unless ::Brick.existing_stis.key?(type)
               end
@@ -403,6 +460,9 @@ In config/initializers/brick.rb appropriate entries would look something like:
               send(:resources, controller_name.to_sym, **options)
             end
           end
+          if ::Brick.config.add_orphans && instance_variable_get(:@set).named_routes.names.exclude?(:brick_orphans)
+            get('/brick_orphans', to: 'brick_gem#orphans', as: 'brick_orphans')
+          end
         end
         send(:get, '/api-docs/v1/swagger.json', { to: 'brick_swagger#index' }) if Object.const_defined?('Rswag::Ui')
       end
@@ -414,7 +474,24 @@ end
 
 require 'brick/version_number'
 
+# Older versions of ActiveRecord would only show more serious error information from "panic" level, which is
+# a level only available in Postgres 12 and older.  This patch will allow older and newer versions of Postgres
+# to work along with fairly old versions of Rails.
+if Object.const_defined?('PG::VERSION') && ActiveRecord.version < ::Gem::Version.new('4.2.6')
+  ::Brick::Util._patch_require(
+    'active_record/connection_adapters/postgresql_adapter.rb', '/activerecord', ["'panic'", "'error'"]
+  )
+end
+
 require 'active_record'
+require 'active_record/relation'
+require 'active_record/relation/query_methods' if is_add_left_outer_join
+
+# Rake tasks
+class Railtie < Rails::Railtie
+  Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
+end
+
 # Major compatibility fixes for ActiveRecord < 4.2
 # ================================================
 ActiveSupport.on_load(:active_record) do
@@ -633,6 +710,62 @@ ActiveSupport.on_load(:active_record) do
           end
         end
       end
+
+      if is_add_left_outer_join
+        # Final pieces for left_outer_joins support, which was derived from this commit:
+        # https://github.com/rails/rails/commit/3f46ef1ddab87482b730a3f53987e04308783d8b
+        module Associations
+          class JoinDependency
+            def make_left_outer_joins(parent, child)
+              tables    = child.tables
+              join_type = Arel::Nodes::OuterJoin
+              info      = make_constraints parent, child, tables, join_type
+
+              [info] + child.children.flat_map { |c| make_left_outer_joins(child, c) }
+            end
+          end
+        end
+        module Querying
+          delegate :left_outer_joins, to: :all
+        end
+        class Relation
+          MULTI_VALUE_METHODS = MULTI_VALUE_METHODS + [:left_outer_joins] unless MULTI_VALUE_METHODS.include?(:left_outer_joins)
+        end
+        module QueryMethods
+          attr_writer :left_outer_joins_values
+          def left_outer_joins_values
+            @left_outer_joins_values ||= []
+          end
+
+          def left_outer_joins(*args)
+            check_if_method_has_arguments!(:left_outer_joins, args)
+
+            args.compact!
+            args.flatten!
+
+            spawn.left_outer_joins!(*args)
+          end
+
+          def left_outer_joins!(*args) # :nodoc:
+            self.left_outer_joins_values += args
+            self
+          end
+
+          def build_left_outer_joins(manager, outer_joins)
+            buckets = outer_joins.group_by do |join|
+              case join
+              when Hash, Symbol, Array
+                :association_join
+              else
+                raise ArgumentError, 'only Hash, Symbol and Array are allowed'
+              end
+            end
+
+            build_join_query(manager, buckets, Arel::Nodes::OuterJoin)
+          end
+        end
+      end
+      # (End of left_outer_joins support)
     end
   end
 

data/lib/generators/brick/install_generator.rb

@@ -209,7 +209,7 @@ module Brick
 # # Specify STI subclasses either directly by name or as a general module prefix that should always relate to a specific
 # # parent STI class.  The prefixed :: here for these examples is mandatory.  Also having a suffixed :: means instead of
 # # a class reference, this is for a general namespace reference.  So in this case requests for, say, either of the
-# # non-existant classes Animals::Cat or Animals::Goat (or anything else with the module prefix of \"Animals::\" would
+# # non-existent classes Animals::Cat or Animals::Goat (or anything else with the module prefix of \"Animals::\" would
 # # build a model that inherits from Animal.  And a request specifically for the class Snake would build a new model
 # # that inherits from Reptile, and no other request would do this -- only specifically for Snake.  The ending ::
 # # indicates that it's a module prefix instead of a specific class name.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.41
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -26,10 +26,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
+- !ruby/object:Gem::Dependency
+  name: fancy_gets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +239,7 @@ files:
 - lib/brick/join_array.rb
 - lib/brick/serializers/json.rb
 - lib/brick/serializers/yaml.rb
+- lib/brick/tasks/orphans.rake
 - lib/brick/util.rb
 - lib/brick/version_number.rb
 - lib/generators/brick/USAGE