brick 1.0.101 → 1.0.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba38d653370b0cc3e98f2adc82d8c475854440745bd35caab9a9a4253fc152c
-  data.tar.gz: 18ca517b90266cf5db711040a7f40c8e848600135ef0a39ad91da9cd2a0b1c89
+  metadata.gz: 74743982216a9827513b4aaa68fe0887c9ba3e7b78c45ff52f0a2f2b99dc7b88
+  data.tar.gz: 3857a95e891e7561d285dd3ecbdeb6c4c16cc9a8205e7b733b55867ed7a69f64
 SHA512:
-  metadata.gz: 859f48999fb0e8d1010a701e29c9f0275f716b20f54b4348576f4dbff7f68da1eb83709a51a1a7acd7debaf4dc1f82e863048ef16cda6b5f59862246e0c50787
-  data.tar.gz: d93c3db79715f62705c0b8f2f5bd2640a2756e1fbcb6aa6a7cf017a18bc31fa5e98496ea41539611c149f84870f24596c105d146484519b7f040d2f36b25ce45
+  metadata.gz: 8b71aa5b1d4da8c4aa1ce88af6d0767c12bdf72b2457594575795d4b9b3f36d1bfb2adef82413a3bc80e041813e7bc6c05768016c5e4cfc197e3bbb730113934
+  data.tar.gz: 6399e040cb4b54eac4d7a09b907cfba11037a4b3391dd3a86b4845e79bd0c4d4e169586c095fdaaaa8506f346628072c9c4c9b6d2ed60c3306a58866e6f9d030

data/lib/brick/extensions.rb

@@ -77,14 +77,13 @@ module ActiveRecord
     def self.brick_get_dsl
       # If there's no DSL yet specified, just try to find the first usable column on this model
       unless (dsl = ::Brick.config.model_descrips[name])
-        descrip_col = (columns.map(&:name) - _brick_get_fks -
-                      (::Brick.config.metadata_columns || []) -
-                      [primary_key]).first
-        dsl = ::Brick.config.model_descrips[name] = if descrip_col
-                                                      "[#{descrip_col}]"
-                                                    elsif (pk_parts = self.primary_key.is_a?(Array) ? self.primary_key : [self.primary_key])
-                                                      "#{name} ##{pk_parts.map { |pk_part| "[#{pk_part}]" }.join(', ')}"
-                                                    end
+        skip_columns = _brick_get_fks + (::Brick.config.metadata_columns || []) + [primary_key]
+        dsl = if (descrip_col = columns.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
+                "[#{descrip_col.name}]"
+              elsif (pk_parts = self.primary_key.is_a?(Array) ? self.primary_key : [self.primary_key])
+                "#{name} ##{pk_parts.map { |pk_part| "[#{pk_part}]" }.join(', ')}"
+              end
+        ::Brick.config.model_descrips[name] = dsl
       end
       dsl
     end
@@ -119,30 +118,32 @@ module ActiveRecord
               end
               s << part_sym
             end
-            if (parts = prefix + first_parts + [parts[-1]]).length > 1 && klass
-              unless is_polymorphic
-                s = build_array
-                parts[0..-3].each { |v| s = s[v.to_sym] }
-                s[parts[-2]] = nil # unless parts[-2].empty? # Using []= will "hydrate" any missing part(s) in our whole series
-              end
-              translations[parts[0..-2].join('.')] = klass
-            end
-            if klass&.column_names.exclude?(parts.last) &&
-               (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
-              if prefix.empty? # Custom columns start with an empty prefix
-                prefix << parts.shift until parts.empty?
+            if first_parts
+              if (parts = prefix + first_parts + [parts[-1]]).length > 1 && klass
+                unless is_polymorphic
+                  s = build_array
+                  parts[0..-3].each { |v| s = s[v.to_sym] }
+                  s[parts[-2]] = nil # unless parts[-2].empty? # Using []= will "hydrate" any missing part(s) in our whole series
+                end
+                translations[parts[0..-2].join('.')] = klass
               end
-              # Expand this entry which refers to an association name
-              members2, dsl2a = klass.brick_parse_dsl(build_array, prefix + [possible_dsl], translations, is_polymorphic, nil, true)
-              members += members2
-              dsl2 << dsl2a
-              dsl3 << dsl2a
-            else
-              dsl2 << "[#{bracket_name}]"
-              if emit_dsl
-                dsl3 << "[#{prefix[1..-1].map { |p| "#{p.to_s}." }.join if prefix.length > 1}#{bracket_name}]"
+              if klass&.column_names.exclude?(parts.last) &&
+                 (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
+                if prefix.empty? # Custom columns start with an empty prefix
+                  prefix << parts.shift until parts.empty?
+                end
+                # Expand this entry which refers to an association name
+                members2, dsl2a = klass.brick_parse_dsl(build_array, prefix + [possible_dsl], translations, is_polymorphic, nil, true)
+                members += members2
+                dsl2 << dsl2a
+                dsl3 << dsl2a
+              else
+                dsl2 << "[#{bracket_name}]"
+                if emit_dsl
+                  dsl3 << "[#{prefix[1..-1].map { |p| "#{p.to_s}." }.join if prefix.length > 1}#{bracket_name}]"
+                end
+                members << parts
               end
-              members << parts
             end
             bracket_name = nil
           else
@@ -409,7 +410,7 @@ module ActiveRecord
       model._brick_calculate_bts_hms(translations, join_array) if is_add_bts || is_add_hms
 
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-      is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
       is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer'
       is_distinct = nil
       wheres = {}
@@ -557,7 +558,7 @@ module ActiveRecord
               brick_link = rel_dupe.brick_links[sel_col.first]
               field_tbl_name = brick_link&.split('.')&.last ||
                 # ... so here's a best-effort guess for what the table name might be.
-                rel_dupe.klass.reflect_on_association(sel_col.first).klass.table_name
+                rel_dupe.klass.reflect_on_association(sel_col.first)&.klass&.table_name
               # If it's Oracle, quote any AREL aliases that had been applied
               field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && rel_dupe.brick_links.values.include?(field_tbl_name)
 
@@ -803,6 +804,7 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
       alias _brick_find_sti_class find_sti_class
       def find_sti_class(type_name)
         if ::Brick.sti_models.key?(type_name ||= name)
+          # Used to be:  ::Brick.sti_models[type_name].fetch(:base, nil) || _brick_find_sti_class(type_name)
           _brick_find_sti_class(type_name)
         else
           # This auto-STI is more of a brute-force approach, building modules where needed
@@ -1407,7 +1409,7 @@ class Object
       singular_table_name = ActiveSupport::Inflector.singularize(ActiveSupport::Inflector.underscore(plural_class_name))
       pk = model&._brick_primary_key(relations.fetch(table_name, nil))
       is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-      is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
 
       code = +"class #{class_name} < #{controller_base&.name || 'ApplicationController'}\n"
       built_controller = Class.new(controller_base || ActionController::Base) do |new_controller_class|
@@ -1622,6 +1624,18 @@ class Object
         end
 
         unless is_openapi || is_avo
+          # Skip showing Bullet gem optimisation messages
+          if Object.const_defined?('Bullet') && Bullet.respond_to?(:enable?)
+            around_action :skip_bullet
+            def skip_bullet
+              bullet_enabled = Bullet.enable?
+              Bullet.enable = false
+              yield
+            ensure
+              Bullet.enable = bullet_enabled
+            end
+          end
+
           _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk)) if pk
           code << "  def index\n"
           code << "    @#{table_name.pluralize} = #{model.name}#{pk&.present? ? ".order(#{order_by_txt.join(', ')})" : '.all'}\n"
@@ -1935,7 +1949,7 @@ end.class_exec do
             puts "*** In the brick.rb initializer the line \"::Brick.schema_behavior = ...\" refers to schema(s) called #{possible_schemas.map { |s| "\"#{s}\"" }.join(', ')}.  No mentioned schema exists. ***"
           end
         end
-      when 'Mysql2'
+      when 'Mysql2', 'Trilogy'
         ::Brick.default_schema = schema = ActiveRecord::Base.connection.current_database
       when 'OracleEnhanced'
         # ActiveRecord::Base.connection.current_database will be something like "XEPDB1"
@@ -2070,7 +2084,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       # end
       # schema = ::Brick.default_schema # Reset back for this next round of fun
       case ActiveRecord::Base.connection.adapter_name
-      when 'PostgreSQL', 'Mysql2', 'SQLServer'
+      when 'PostgreSQL', 'Mysql2', 'Trilogy', 'SQLServer'
         sql = "SELECT kcu1.CONSTRAINT_SCHEMA, kcu1.TABLE_NAME, kcu1.COLUMN_NAME,
             kcu2.CONSTRAINT_SCHEMA AS primary_schema, kcu2.TABLE_NAME AS primary_table, kcu1.CONSTRAINT_NAME AS CONSTRAINT_SCHEMA_FK
           FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS rc

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

@@ -29,6 +29,54 @@ module Brick
   var finalParams = Object.keys(params).reduce(function (s, v) { if (params[v]) s.push(v + \"=\" + params[v]); return s; }, []).join(\"&\");
   return hrefParts[0] + (finalParams.length > 0 ? \"?\" + finalParams : \"\");
 }
+
+// This PageTransitionEvent fires when the page first loads, as well as after any other history
+// transition such as when using the browser's Back and Forward buttons.
+window.addEventListener(\"pageshow\", linkSchemas);
+var brickSchema;
+function linkSchemas() {
+  var schemaSelect = document.getElementById(\"schema\");
+  var tblSelect = document.getElementById(\"tbl\");
+  if (tblSelect) { // Always present
+    // Used to be:  var i = # {::Brick.config.path_prefix ? '0' : 'schemaSelect ? 1 : 0'},
+    var changeoutList = changeout(location.href);
+    for (var i = 0; i < changeoutList.length; ++i) {
+      tblSelect.value = changeoutList[i];
+      if (tblSelect.value !== \"\") break;
+    }
+
+    tblSelect.addEventListener(\"change\", function () {
+      var lhr = changeout(location.href, null, this.value);
+      if (brickSchema) lhr = changeout(lhr, \"_brick_schema\", schemaSelect.value);
+      location.href = lhr;
+    });
+  }
+
+  if (schemaSelect) { // First drop-down is only present if multitenant
+    if (brickSchema = changeout(location.href, \"_brick_schema\")) {
+      [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
+    }
+    if (schemaSelect.options.length > 1) {
+      schemaSelect.value = brickSchema || \"public\";
+      schemaSelect.addEventListener(\"change\", function () {
+        // If there's an ID then remove it (trim after selected table)
+        location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
+      });
+    }
+  }
+  tblSelect.focus();
+
+  [... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
+    if (brickSchema)
+      form.action = changeout(form.action, \"_brick_schema\", brickSchema);
+    form.addEventListener('submit', function (ev) {
+      [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
+        if (select.value === \"^^^brick_NULL^^^\") select.value = null;
+      });
+      return true;
+    });
+  });
+};
 "
 
       # paths['app/models'] << 'lib/brick/frameworks/active_record/models'
@@ -168,17 +216,9 @@ module Brick
                   end
 "<script>
 #{JS_CHANGEOUT}
-window.addEventListener(\"load\", linkSchemas);
 document.addEventListener(\"turbo:render\", linkSchemas);
 window.addEventListener(\"popstate\", linkSchemas);
 // [... document.getElementsByTagName('turbo-frame')].forEach(function (a) { a.addEventListener(\"turbo:frame-render\", linkSchemas); });
-function linkSchemas() {
-  brickSchema = changeout(location.href, \"_brick_schema\");
-  if (brickSchema) {
-    [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
-    [... document.getElementsByTagName(\"FORM\")].forEach(function (form) { form.action = changeout(form.action, \"_brick_schema\", brickSchema); });
-  }
-}
 </script>
 #{_brick_content}".html_safe
                 end
@@ -288,7 +328,14 @@ function linkSchemas() {
                      else
                        [[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)
+              if hm_assoc.options.key?(:as)
+                poly_type = if hm_assoc.active_record.column_names.include?(hm_assoc.active_record.inheritance_column)
+                              '[sti_type]'
+                            else
+                              hm_assoc.active_record.name
+                            end
+                keys << [hm_assoc.inverse_of.foreign_type, poly_type]
+              end
               keys.to_h
             end
 
@@ -362,9 +409,14 @@ function linkSchemas() {
                     end
                   when 'show', 'new', 'update'
                     hm_stuff << if hm_fk_name
-                                  if hm_assoc.klass.column_names.include?(hm_fk_name)
+                                  if hm_assoc.klass.column_names.include?(hm_fk_name) ||
+                                     (hm_fk_name.is_a?(String) && hm_fk_name.include?('.')) # HMT?  (Could do a better check for this)
                                     predicates = path_keys(hm_assoc, hm_fk_name, pk).map do |k, v|
-                                                   v.is_a?(String) ? "#{k}: '#{v}'" : "#{k}: @#{obj_name}.#{v}"
+                                                   if v == '[sti_type]'
+                                                     "'#{k}': @#{obj_name}.#{hm_assoc.active_record.inheritance_column}"
+                                                   else
+                                                     v.is_a?(String) ? "'#{k}': '#{v}'" : "'#{k}': @#{obj_name}.#{v}"
+                                                   end
                                                  end.join(', ')
                                     "<%= link_to '#{assoc_name}', #{hm_assoc.klass._brick_index}_path({ #{predicates} }) %>\n"
                                   else
@@ -622,13 +674,24 @@ def hide_bcrypt(val, max_len = 200)
   end
 end
 def display_value(col_type, val)
+  is_mssql_geography = nil
+  # Some binary thing that really looks like a Microsoft-encoded WGS84 point?  (With the first two bytes, E6 10, indicating an EPSG code of 4326)
+  if col_type == :binary && val && val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
+    col_type = 'geography'
+    is_mssql_geography = true
+  end
   case col_type
   when 'geometry', 'geography'
     if Object.const_defined?('RGeo')
-      @is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2' if @is_mysql.nil?
+      @is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name) if @is_mysql.nil?
       @is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer' if @is_mssql.nil?
       val_err = nil
-      if @is_mysql || @is_mssql
+
+      if @is_mysql || (is_mssql_geography ||=
+                        (@is_mssql ||
+                          (val && val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12])
+                        )
+                      )
         # MySQL's \"Internal Geometry Format\" and MSSQL's Geography are like WKB, but with an initial 4 bytes that indicates the SRID.
         if (srid = val&.[](0..3)&.unpack('I'))
           val = val.dup.force_encoding('BINARY')[4..-1].bytes
@@ -642,23 +705,30 @@ def display_value(col_type, val)
           # xx1x xxxx = IsWholeGlobe
           # Convert Microsoft's unique geography binary to standard WKB
           # (MSSQL point usually has two doubles, lng / lat, and can also have Z)
-          if @is_mssql
+          if is_mssql_geography
             if val[0] == 1 && (val[1] & 8 > 0) && # Single point?
-              (val.length - 2) % 8 == 0 && val.length < 27 # And containing up to three 8-byte values?
-              idx = 2
-              new_val = [0, 0, 0, 0, 1]
-              new_val.concat(val[idx - 8...idx].reverse) while (idx += 8) <= val.length
-              val = new_val
+               (val.length - 2) % 8 == 0 && val.length < 27 # And containing up to three 8-byte values?
+              val = [0, 0, 0, 0, 1] + val[2..-1].reverse
             else
               val_err = '(Microsoft internal SQL geography type)'
             end
           end
         end
       end
-      val_err || (val ? RGeo::WKRep::WKBParser.new.parse(val.pack('c*')) : nil)
+      unless val_err || val.nil?
+        if (geometry = RGeo::WKRep::WKBParser.new.parse(val.pack('c*'))).is_a?(RGeo::Cartesian::PointImpl) &&
+           !(geometry.y == 0.0 && geometry.x == 0.0)
+          # Create a POINT link to this style of Google maps URL:  https://www.google.com/maps/place/38.7071296+-121.2810649/@38.7071296,-121.2810649,12z
+          geometry = \"<a href=\\\"https://www.google.com/maps/place/#\{geometry.y}+#\{geometry.x}/@#\{geometry.y},#\{geometry.x},12z\\\" target=\\\"blank\\\">#\{geometry.to_s}</a>\"
+        end
+        val = geometry
+      end
+      val_err || val
     else
       '(Add RGeo gem to parse geometry detail)'
     end
+  when :binary
+    display_binary(val) if val
   else
     if col_type
       hide_bcrypt(val)
@@ -667,6 +737,40 @@ def display_value(col_type, val)
     end
   end
 end
+
+def image_signatures
+  @image_signatures ||= { \"\\xFF\\xD8\\xFF\\xEE\".force_encoding('ASCII-8BIT') => 'jpeg',
+                          \"\\xFF\\xD8\\xFF\\xE0\\x00\\x10\\x4A\\x46\\x49\\x46\\x00\\x01\".force_encoding('ASCII-8BIT') => 'jpeg',
+                          \"\\x89PNG\\r\\n\\x1A\\n\".force_encoding('ASCII-8BIT') => 'png',
+                          '<svg' => 'svg+xml', # %%% Not yet very good detection for SVG
+                          'BM'.force_encoding('ASCII-8BIT') => 'bmp',
+                          'GIF87a'.force_encoding('ASCII-8BIT') => 'gif',
+                          'GIF89a'.force_encoding('ASCII-8BIT') => 'gif' }
+end
+def display_binary(val)
+  if val[0..1] == \"\\x15\\x1C\" # One of those goofy Microsoft OLE containers?
+    package_header_length = val[2..3].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    # This will often be just FF FF FF FF
+    # object_size = val[16..19].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    friendly_and_class_names = val[20...package_header_length].split(\"\\0\")
+    object_type_name_length = val[package_header_length + 8..package_header_length+11].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    friendly_and_class_names << val[package_header_length + 12...package_header_length + 12 + object_type_name_length].strip
+    # friendly_and_class_names will now be something like:  ['Bitmap Image', 'Paint.Picture', 'PBrush']
+    real_object_size = val[package_header_length + 20 + object_type_name_length..package_header_length + 23 + object_type_name_length].bytes.reverse.inject(0) {|m, b| (m << 8) + b }
+    object_start = package_header_length + 24 + object_type_name_length
+    val = val[object_start...object_start + real_object_size]
+  end
+  if (signature = image_signatures.find { |k, _v| val[0...k.length] == k })
+    if val.length < 500_000
+      \"<img src=\\\"data:image/#\{signature.last};base64,#\{Base64.encode64(val)}\\\">\"
+    else
+      \"&lt;&nbsp;#\{signature.last} image, #\{val.length} bytes&nbsp;>\"
+    end
+  else
+    \"&lt;&nbsp;Binary, #\{val.length} bytes&nbsp;>\"
+  end
+end
+
 # Accommodate composite primary keys that include strings with forward-slash characters
 def slashify(*vals)
   vals.map { |val_part| val_part.is_a?(String) ? val_part.gsub('/', '^^sl^^') : val_part }
@@ -705,56 +809,8 @@ callbacks = {} %>
 
               # %%% When doing schema select, if we're on a new page go to index
               script = "<script>
-var schemaSelect = document.getElementById(\"schema\");
-var tblSelect = document.getElementById(\"tbl\");
-var brickSchema;
 var #{table_name}HtColumns;
 
-// This PageTransitionEvent fires when the page first loads, as well as after any other history
-// transition such as when using the browser's Back and Forward buttons.
-window.addEventListener(\"pageshow\", function() {
-  if (tblSelect) { // Always present
-    var i = #{::Brick.config.path_prefix ? '0' : 'schemaSelect ? 1 : 0'},
-        changeoutList = changeout(location.href);
-    for (; i < changeoutList.length; ++i) {
-      tblSelect.value = changeoutList[i];
-      if (tblSelect.value !== \"\") break;
-    }
-
-    tblSelect.addEventListener(\"change\", function () {
-      var lhr = changeout(location.href, null, this.value);
-      if (brickSchema)
-        lhr = changeout(lhr, \"_brick_schema\", schemaSelect.value);
-      location.href = lhr;
-    });
-  }
-
-  if (schemaSelect && schemaSelect.options.length > 1) { // First drop-down is only present if multitenant
-    brickSchema = changeout(location.href, \"_brick_schema\");
-    if (brickSchema) {
-      [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
-    }
-    schemaSelect.value = brickSchema || \"public\";
-    schemaSelect.focus();
-    schemaSelect.addEventListener(\"change\", function () {
-      // If there's an ID then remove it (trim after selected table)
-      location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
-    });
-  }
-
-  [... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
-    if (brickSchema)
-      form.action = changeout(form.action, \"_brick_schema\", brickSchema);
-    form.addEventListener('submit', function (ev) {
-      [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
-        if (select.value === \"^^^brick_NULL^^^\")
-          select.value = null;
-      });
-      return true;
-    });
-  });
-});
-
 // Add \"Are you sure?\" behaviour to any data-confirm buttons out there
 document.querySelectorAll(\"input[type=submit][data-confirm]\").forEach(function (btn) {
   btn.addEventListener(\"click\", function (evt) {
@@ -1082,8 +1138,11 @@ erDiagram
        id = id.first if id.is_a?(Array) && id.length == 1
        origin = (key_parts = k.split('.')).length == 1 ? model : model.reflect_on_association(key_parts.first).klass
        if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| fk[:fk] == key_parts.last }) &&
-          (obj = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id)) %>
-         <h3>for <%= link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination._brick_index(:singular)\}_path\".to_sym, id) %></h3><%
+          (objs = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id))
+         objs = [objs] unless objs.is_a?(Array) %>
+         <h3>for <% objs.each do |obj| %><%=
+                      link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination._brick_index(:singular)\}_path\".to_sym, id)
+               %><% end %></h3><%
        end
      end %>
   (<%= link_to \"See all #\{model.base_class.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)
@@ -1227,7 +1286,9 @@ erDiagram
 <head>
 #{css}
 <title><%=
-  page_title = (\"#{model_name}: #\{(obj = @#{obj_name})&.brick_descrip || controller_name}\")
+  model = (obj = @#{obj_name})&.class
+  model_name = @#{obj_name}.#{inh_col = @_brick_model.inheritance_column} if obj.respond_to?(:#{inh_col})
+  page_title = (\"#\{model_name ||= model.name}: #\{obj&.brick_descrip || controller_name}\")
 %></title>
 </head>
 <body>
@@ -1261,7 +1322,7 @@ end
 <% if obj
       # path_options = [obj.#{pk}]
       # path_options << { '_brick_schema':  } if
-      # url = send(:#\{model_name._brick_index(:singular)}_path, obj.#{pk})
+      # url = send(:#\{model._brick_index(:singular)}_path, obj.#{pk})
       options = {}
       options[:url] = send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, obj) if ::Brick.config.path_prefix
  %>
@@ -1357,7 +1418,17 @@ end
           # In Postgres labels of data stored in a hierarchical tree-like structure
           # If it's not yet enabled then:  create extension ltree;
           val %>
-      <% when :binary, :primary_key
+      <% when :binary %>
+        <%= is_revert = false
+           if val
+             # %%% This same kind of geography check is done two other times above ... would be great to DRY it up.
+             if val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
+               display_value('geography', val)
+             else
+               display_binary(val)
+             end.html_safe
+           end %>
+      <% when :primary_key
            is_revert = false %>
       <% else %>
         <%= is_revert = false
@@ -1381,8 +1452,8 @@ end
 <%   end %>
 
 #{unless args.first == 'new'
-  # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #{model_name} -- Are you sure?' } }"
-  confirm_are_you_sure = "data: { confirm: 'Delete #{model_name} -- Are you sure?' }"
+  # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #\{model_name} -- Are you sure?' } }"
+  confirm_are_you_sure = "data: { confirm: 'Delete #\{model_name} -- Are you sure?' }"
   hms_headers.each_with_object(+'') do |hm, s|
     # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
     next if hm.first.options[:through] && !hm.first.through_reflection
@@ -1390,11 +1461,24 @@ end
     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(', ')
+      poly_fix = if (poly_type = (hm.first.options[:as] && hm.first.type))
+                   "
+                       # Let's fix an unexpected \"feature\" of AR -- when going through a polymorphic has_many
+                       # association that points to an STI model then filtering for the __able_type column is done
+                       # with a .where(). And the polymorphic class name it points to is the base class name of
+                       # the STI model instead of its subclass.
+                       if (poly_type = #{poly_type.inspect}) &&
+                           @#{obj_name}.respond_to?(:#{@_brick_model.inheritance_column}) &&
+                           (base_type = collection.where_values_hash[poly_type])
+                         collection = collection.rewhere(poly_type => [base_type, @#{obj_name}.#{@_brick_model.inheritance_column}])
+                       end"
+      end
       s << "<table id=\"#{hm_name}\" class=\"shadow\">
-        <tr><th>#{hm[3]}</th></tr>
+        <tr><th>#{hm[1]}#{' poly' if hm[0].options[:as]} #{hm[3]}</th></tr>
         <% collection = @#{obj_name}.#{hm_name}
         collection = case collection
-                     when ActiveRecord::Associations::CollectionProxy
+                     when ActiveRecord::Associations::CollectionProxy#{
+                       poly_fix}
                        collection.order(#{pk.inspect})
                      when ActiveRecord::Base # Object from a has_one
                        [collection]
@@ -1576,11 +1660,10 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
             private
 
               alias _brick_render_template render_template
-              def render_template(view, template, *args)
-                result = _brick_render_template(view, template, *args)
-                if template.instance_variable_get(:@is_brick)
-                  Apartment::Tenant.switch!(::Brick.apartment_default_tenant) if ::Brick.apartment_multitenant
-                end
+              def render_template(view, template, layout_name, *args)
+                layout_name = nil if (is_brick = template.instance_variable_get(:@is_brick)) && layout_name.is_a?(Proc)
+                result = _brick_render_template(view, template, layout_name, *args)
+                Apartment::Tenant.switch!(::Brick.apartment_default_tenant) if is_brick && ::Brick.apartment_multitenant
                 result
               end
           end # TemplateRenderer

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

@@ -3,7 +3,7 @@ module Brick::Rails::FormTags
   def brick_grid(relation, bt_descrip, sequence = nil, inclusions, exclusions,
                  cols, poly_cols, bts, hms_keys, hms_cols)
     out = "<table id=\"headerTop\"></table>
-<table id=\"#{relation.table_name}\" class=\"shadow\">
+<table id=\"#{relation.table_name.split('.').last}\" class=\"shadow\">
   <thead><tr>"
     pk = (klass = relation.klass).primary_key || []
     pk = [pk] unless pk.is_a?(Array)
@@ -90,6 +90,7 @@ module Brick::Rails::FormTags
             # 0..62 because Postgres column names are limited to 63 characters
             obj, descrips[0..-2].map { |id| obj.send(id.last[0..62]) }, bt_id_col
           )
+          bt_txt = display_binary(bt_txt).html_safe if bt_txt&.encoding&.name == 'ASCII-8BIT'
           bt_txt ||= "<span class=\"orphan\">&lt;&lt; Orphaned ID: #{val} >></span>" if val
           bt_id = bt_id_col&.map { |id_col| obj.respond_to?(id_sym = id_col.to_sym) ? obj.send(id_sym) : id_col }
           out << (bt_id&.first ? link_to(bt_txt, send("#{bt_class.base_class._brick_index(:singular)}_path".to_sym, bt_id)) : bt_txt || '')

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -26,7 +26,7 @@ end
 require 'brick/util'
 
 # Allow ActiveRecord < 3.2 to work with Ruby 2.7 and later
-if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7')
+if (is_ruby_2_7 = (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7'))
   if ActiveRecord.version < ::Gem::Version.new('3.2')
     # Remove circular reference for "now"
     ::Brick::Util._patch_require(
@@ -1043,6 +1043,18 @@ ActiveSupport.on_load(:active_record) do
   end
   # rubocop:enable Lint/ConstantDefinitionInBlock
 
+  arsc = ::ActiveRecord::StatementCache
+  if is_ruby_2_7 && (params = arsc.method(:create).parameters).length == 2 && params.last == [:opt, :block]
+    arsc.class_exec do
+      def self.create(connection, callable = nil, &block)
+        relation = (callable || block).call ::ActiveRecord::StatementCache::Params.new
+        bind_map = ::ActiveRecord::StatementCache::BindMap.new relation.bound_attributes
+        query_builder = connection.cacheable_query(self, relation.arel)
+        new query_builder, bind_map
+      end
+    end
+  end
+
   # Rails < 4.2 is not innately compatible with Ruby 2.4 and later, and comes up with:
   # "TypeError: Cannot visit Integer" unless we patch like this:
   if ruby_version >= ::Gem::Version.new('2.4') &&
@@ -1081,11 +1093,54 @@ ActiveSupport.on_load(:active_record) do
     end
   end
 
+  if Psych.respond_to?(:unsafe_load) && ActiveRecord.version < ::Gem::Version.new('6.1')
+    Psych.class_exec do
+      class << self
+        alias _original_load load
+        def load(yaml, *args, **kwargs)
+          if caller.first.end_with?("`database_configuration'") && kwargs[:aliases].nil?
+            kwargs[:aliases] = true
+          end
+          _original_load(yaml, *args, **kwargs)
+        end
+      end
+    end
+  end
+
+  # def aliased_table_for(arel_table, table_name = nil)
+  #   table_name ||= arel_table.name
+
+  #   if aliases[table_name] == 0
+  #     # If it's zero, we can have our table_name
+  #     aliases[table_name] = 1
+  #     arel_table = arel_table.alias(table_name) if arel_table.name != table_name
+  #   else
+  #     # Otherwise, we need to use an alias
+  #     aliased_name = @connection.table_alias_for(yield)
+
+  #     # Update the count
+  #     count = aliases[aliased_name] += 1
+
+  #     aliased_name = "#{truncate(aliased_name)}_#{count}" if count > 1
+
+  #     arel_table = arel_table.alias(aliased_name)
+  #   end
+
+  #   arel_table
+  # end
+  # def aliased_table_for(table_name, aliased_name, type_caster)
+
   class ActiveRecord::Associations::JoinDependency
-    if JoinBase.instance_method(:initialize).arity == 2 # Older ActiveRecord 4.x?
-      def initialize(base, associations, joins)
-        @alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(base.connection, joins)
-        @alias_tracker.aliased_table_for(base.table_name, base.table_name) # Updates the count for base.table_name to 1
+    if JoinBase.instance_method(:initialize).arity == 2 # Older ActiveRecord <= 5.1?
+      def initialize(base, associations, joins, eager_loading: true)
+        araat = ::ActiveRecord::Associations::AliasTracker
+        if araat.respond_to?(:create_with_joins) # Rails 5.0 and 5.1
+          @alias_tracker = araat.create_with_joins(base.connection, base.table_name, joins)
+          @eager_loading = eager_loading # (Unused in Rails 5.0)
+        else # Rails 4.2
+          @alias_tracker = araat.create(base.connection, joins)
+          @alias_tracker.aliased_table_for(base, base.table_name) # Updates the count for base.table_name to 1
+        end
         tree = self.class.make_tree associations
 
         # Provide a way to find the original relation that this tree is being used for
@@ -1098,7 +1153,7 @@ ActiveSupport.on_load(:active_record) do
         @join_root.children.each { |child| construct_tables! @join_root, child }
       end
 
-    else # For ActiveRecord 5.0 - 7.1
+    else # For ActiveRecord 5.2 - 7.1
 
       def initialize(base, table, associations, join_type = nil)
         tree = self.class.make_tree associations
@@ -1245,13 +1300,13 @@ module ActiveRecord
 
     if private_instance_methods.include?(:build_join_query)
       alias _brick_build_join_query build_join_query
-      def build_join_query(manager, buckets, *args)
+      def build_join_query(manager, buckets, *args) # , **kwargs)
         # %%% Better way to bring relation into the mix
         if (aj = buckets.fetch(:association_join, nil))
           aj.instance_variable_set(:@relation, self)
         end
 
-        _brick_build_join_query(manager, buckets, *args)
+        _brick_build_join_query(manager, buckets, *args) # , **kwargs)
       end
 
     else
@@ -1433,4 +1488,85 @@ if Gem::Specification.all_names.any? { |g| g.start_with?('ransack-') }
   end
 end
 
+# Keyword arguments updates for Rails <= 5.2.x and Ruby >= 3.0
+if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Version.new('3.0')
+  admsm = ActionDispatch::MiddlewareStack::Middleware
+  admsm.class_exec do
+    # redefine #build
+    def build(app, **kwargs)
+      # puts klass.name
+      if args.length > 1 && args.last.is_a?(Hash)
+        kwargs.merge!(args.pop)
+      end
+      # binding.pry if klass == ActionDispatch::Static # ActionDispatch::Reloader
+      klass.new(app, *args, **kwargs, &block)
+    end
+  end
+
+  require 'active_model'
+  require 'active_model/type'
+  require 'active_model/type/value'
+  class ActiveModel::Type::Value
+    def initialize(*args, precision: nil, limit: nil, scale: nil)
+      @precision = precision
+      @scale = scale
+      @limit = limit
+    end
+  end
+
+  if Object.const_defined?('I18n')
+    module I18n::Base
+      alias _brick_translate translate
+      def translate(key = nil, *args, throw: false, raise: false, locale: nil, **options)
+        options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
+        _brick_translate(key = nil, throw: false, raise: false, locale: nil, **options)
+      end
+    end
+  end
+
+  module ActionController::RequestForgeryProtection
+  private
+
+    # Creates the authenticity token for the current request.
+    def form_authenticity_token(*args, form_options: {}) # :doc:
+      form_options.merge!(args.pop) if args.length > 0 && args.last.is_a?(Hash)
+      masked_authenticity_token(session, form_options: form_options)
+    end
+  end
+
+  module ActiveSupport
+    class MessageEncryptor
+      def encrypt_and_sign(value, *args, expires_at: nil, expires_in: nil, purpose: nil)
+        encrypted = if method(:_encrypt).arity == 1
+                      _encrypt(value) # Rails <= 5.1
+                    else
+                      if args.length > 0 && args.last.is_a?(Hash)
+                        expires_at ||= args.last[:expires_at]
+                        expires_in ||= args.last[:expires_in]
+                        purpose ||= args.last[:purpose]
+                      end
+                      _encrypt(value, expires_at: expires_at, expires_in: expires_in, purpose: purpose)
+                    end
+        verifier.generate(encrypted)
+      end
+    end
+    if const_defined?('Messages')
+      class Messages::Metadata
+        def self.wrap(message, *args, expires_at: nil, expires_in: nil, purpose: nil)
+          if args.length > 0 && args.last.is_a?(Hash)
+            expires_at ||= args.last[:expires_at]
+            expires_in ||= args.last[:expires_in]
+            purpose ||= args.last[:purpose]
+          end
+          if expires_at || expires_in || purpose
+            JSON.encode new(encode(message), pick_expiry(expires_at, expires_in), purpose)
+          else
+            message
+          end
+        end
+      end
+    end
+  end
+end
+
 require 'brick/extensions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.101
+  version: 1.0.103
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.42.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement