brick 1.0.63 → 1.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28a4db728e9312def40be9a9a790f1f22f464c6d6ade2b6e12f255730cd4111
-  data.tar.gz: c2e75de42686c9ad0707fd6eca3d0b0a12207e051d77622d70276845d9af0949
+  metadata.gz: c7e8235e9e499424e41a8329f9056b4ab801fd7502889dfdafc527522f061ad3
+  data.tar.gz: 898b3f172cb9eb6594b382087394857d7ff471a833069bfe7e060f404bfd2d4c
 SHA512:
-  metadata.gz: a897f30028aac1b6e14edc967a82c268aa58236cd424ecf977409a0c893d42b9e291c11ac2b2a411f00dc35c23b80a4ed6adecde394587c96d11b9f51c173fd8
-  data.tar.gz: 538d694b6a0717045c6e23ec536a000a552bc0ece9009f74511e33013e0dde97f8cefadbc61a45d4b7ea884dd0c1dd985f5defc58175ec51318d345a7e561c2d
+  metadata.gz: 0d0b88ac19a60e25ee48074e5ee67037c41d77b80a54ea22ad1813d22d4e3d233d253ed92a39e317f3faa86aac290ee51e0bed7ab178c583ca1d06b075bfaac1
+  data.tar.gz: a0d8f7683236868789c9262a08a8c615786afdd6ad93b1f330807d5acad5962ea2e2ea645a236e37926b42bfd09db00ec9d00fae15de90da8fe589bfbe493b65

data/lib/brick/extensions.rb

@@ -257,7 +257,7 @@ module ActiveRecord
           # For our purposes a :has_one is similar enough to a :belongs_to that we can just join forces
           _br_bt_descrip[k] = { hm.klass => hm.klass.brick_parse_dsl(join_array, k, translations) }
         else # Standard :has_many
-          _br_hm_counts[k] = hm
+          _br_hm_counts[k] = hm unless hm.options[:through] && !_br_associatives.fetch(hm.name, nil)
         end
       end
     end
@@ -398,7 +398,7 @@ module ActiveRecord
       if selects&.empty? # Default to all columns
         tbl_no_schema = table.name.split('.').last
         columns.each do |col|
-          col_alias = ' AS _class' if (col_name = col.name) == 'class'
+          col_alias = " AS _#{col.name}" if (col_name = col.name) == 'class'
           selects << if is_mysql
                        "`#{tbl_no_schema}`.`#{col_name}`#{col_alias}"
                      else
@@ -479,24 +479,25 @@ module ActiveRecord
                        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}"
+        tbl_alias = is_mysql ? "`_br_#{hm.name}`" : "\"_br_#{hm.name}\""
         pri_tbl = hm.active_record
+        pri_tbl_name = is_mysql ? "`#{pri_tbl.table_name}`" : "\"#{pri_tbl.table_name.gsub('.', '"."')}\""
         on_clause = []
         if fk_col.is_a?(Array) # Composite key?
-          fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl.table_name}.#{pri_tbl.primary_key[idx]}" }
+          fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_tbl.primary_key[idx]}" }
           selects = fk_col.dup
         else
           selects = [fk_col]
-          on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl.table_name}.#{pri_tbl.primary_key}"
+          on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_tbl.primary_key}"
         end
         if poly_type
           selects << poly_type
           on_clause << "#{tbl_alias}.#{poly_type} = '#{name}'"
         end
+        hm_table_name = is_mysql ? "`#{associative&.table_name || hm.klass.table_name}`" : "\"#{(associative&.table_name || hm.klass.table_name).gsub('.', '"."')}\""
         join_clause = "LEFT OUTER
 JOIN (SELECT #{selects.join(', ')}, COUNT(#{'DISTINCT ' if hm.options[:through]}#{count_column
-          }) AS _ct_ FROM #{associative&.table_name || hm.klass.table_name
-          } GROUP BY #{(1..selects.length).to_a.join(', ')}) AS #{tbl_alias}"
+          }) AS _ct_ FROM #{hm_table_name} GROUP BY #{(1..selects.length).to_a.join(', ')}) AS #{tbl_alias}"
         joins!("#{join_clause} ON #{on_clause.join(' AND ')}")
       end
       where!(wheres) unless wheres.empty?
@@ -1016,6 +1017,7 @@ class Object
       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))
+      is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2'
 
       namespace_name = "#{namespace.name}::" if namespace
       code = +"class #{namespace_name}#{class_name} < ApplicationController\n"
@@ -1119,7 +1121,9 @@ class Object
           @_brick_params = (ar_relation = model.all).brick_select(params, (selects = []), order_by, translations, join_array)
           # %%% Add custom HM count columns
           # %%% What happens when the PK is composite?
-          counts = model._br_hm_counts.each_with_object([]) { |v, s| s << "_br_#{v.first}._ct_ AS _br_#{v.first}_ct" }
+          counts = model._br_hm_counts.each_with_object([]) do |v, s|
+            s << (is_mysql ? "`_br_#{v.first}`._ct_ AS \"_br_#{v.first}_ct\"" : "\"_br_#{v.first}\"._ct_ AS \"_br_#{v.first}_ct\"")
+          end
           instance_variable_set("@#{table_name}".to_sym, ar_relation.dup._select!(*selects, *counts))
           if namespace && (idx = lookup_context.prefixes.index(table_name))
             lookup_context.prefixes[idx] = "#{namespace.name.underscore}/#{lookup_context.prefixes[idx]}"
@@ -1525,7 +1529,9 @@ module ActiveRecord::ConnectionHandling
 
   def retrieve_schema_and_tables(sql = nil, is_postgres = nil, schema = nil)
     sql ||= "SELECT t.table_schema AS \"schema\", t.table_name AS relation_name, t.table_type,#{"
-      pg_catalog.obj_description((t.table_schema || '.' || t.table_name)::regclass, 'pg_class') AS table_description," if is_postgres}
+      pg_catalog.obj_description(
+        ('\"' || t.table_schema || '\".\"' || t.table_name || '\"')::regclass, 'pg_class'
+      ) AS table_description," if is_postgres}
       c.column_name, c.data_type,
       COALESCE(c.character_maximum_length, c.numeric_precision) AS max_length,
       tc.constraint_type AS const, kcu.constraint_name AS \"key\",
@@ -1595,6 +1601,8 @@ module Brick
                           "#{bt_assoc_name}_bt"
                         end
       end
+      bt_assoc_name = "_#{bt_assoc_name}" if bt_assoc_name == 'attribute'
+
       # %%% Temporary schema patch
       for_tbl = fk[1]
       apartment = Object.const_defined?('Apartment') && Apartment

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

@@ -118,7 +118,9 @@ module Brick
                   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]
+                  hm_fk_name = if (through = hm_assoc.options[:through])
+                                 next unless @_brick_model.instance_methods.include?(through)
+
                                  associative = @_brick_model._br_associatives[hm.first]
                                  tbl_nm = if hm_assoc.options[:source]
                                             associative.klass.reflect_on_association(hm_assoc.options[:source]).inverse_of&.name
@@ -182,10 +184,8 @@ module Brick
 h1, h3 {
   margin-bottom: 0;
 }
-#resourceName {
-}
 #imgErd {
-  background-image:url(assets/brick_erd.png);
+  background-image:url(/assets/brick_erd.png);
   background-size: 100% 100%;
   width: 2.2em;
   height: 2.2em;
@@ -365,8 +365,8 @@ def display_value(col_type, val)
       @is_mysql = ActiveRecord::Base.connection.adapter_name == 'Mysql2' if @is_mysql.nil?
       if @is_mysql
         # MySQL's \"Internal Geometry Format\" is like WKB, but with an initial 4 bytes that indicates the SRID.
-        srid = val[..3].unpack('I')
-        val = val[4..]
+        srid = val[0..3].unpack('I')
+        val = val[4..-1]
       end
       RGeo::WKRep::WKBParser.new.parse(val)
     else
@@ -453,25 +453,27 @@ window.addEventListener(\"pageshow\", function() {
 
 function changeout(href, param, value, trimAfter) {
   var hrefParts = href.split(\"?\");
-  if (param === undefined || param === null) {
+  var params = hrefParts.length > 1 ? hrefParts[1].split(\"&\") : [];
+  if (param === undefined || param === null || param === -1) {
     hrefParts = hrefParts[0].split(\"://\");
     var pathParts = hrefParts[hrefParts.length - 1].split(\"/\");
     if (value === undefined)
       // A couple possibilities if it's namespaced, starting with two parts in the path -- and then try just one
       return [pathParts.slice(1, 3).join('/'), pathParts.slice(1, 2)[0]];
-    else
-      return hrefParts[0] + \"://\" + pathParts[0] + \"/\" + value;
+    else {
+      var queryString = param ? \"?\" + params.join(\"&\") : \"\";
+      return hrefParts[0] + \"://\" + pathParts[0] + \"/\" + value + queryString;
+    }
   }
   if (trimAfter) {
     var pathParts = hrefParts[0].split(\"/\");
     while (pathParts.lastIndexOf(trimAfter) !== pathParts.length - 1) pathParts.pop();
     hrefParts[0] = pathParts.join(\"/\");
   }
-  var params = hrefParts.length > 1 ? hrefParts[1].split(\"&\") : [];
-  params = params.reduce(function (s, v) { var parts = v.split(\"=\"); if (parts[1] !== null) s[parts[0]] = parts[1]; return s; }, {});
+  params = params.reduce(function (s, v) { var parts = v.split(\"=\"); if (parts[1]) s[parts[0]] = parts[1]; return s; }, {});
   if (value === undefined) return params[param];
   params[param] = value;
-  var finalParams = Object.keys(params).reduce(function (s, v) { if (params[v] !== null) s.push(v + \"=\" + params[v]); return s; }, []).join(\"&\");
+  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 : \"\");
 }
 
@@ -534,6 +536,65 @@ if (headerTop) {
   }, true);
 }
 </script>"
+
+              erd_markup = "<div id=\"mermaidErd\" class=\"mermaid\">
+erDiagram
+<% model_short_name = #{@_brick_model.name.split('::').last.inspect}
+   callbacks = {}
+   @_brick_bt_descrip&.each do |bt|
+     bt_class = bt[1].first.first
+     callbacks[bt_name = bt_class.name.split('::').last] = bt_class
+     is_has_one = #{@_brick_model.name}.reflect_on_association(bt.first).inverse_of&.macro == :has_one ||
+                  ::Brick.config.has_ones&.fetch('#{@_brick_model.name}', nil)&.key?(bt.first.to_s)
+    %>  <%= \"#\{model_short_name} #\{is_has_one ? '||' : '}o'}--|| #\{bt_name} : \\\"#\{
+        bt.first unless bt.first.to_s == bt[1].first.first.name.underscore.singularize.tr('/', '_')
+        }\\\"\".html_safe %>
+<% end
+   last_through = nil
+   @_brick_hm_counts&.each do |hm|
+     # Skip showing self-referencing HM links since they would have already been drawn while evaluating the BT side
+     next if (hm_class = hm.last&.klass) == #{@_brick_model.name}
+
+     callbacks[hm_name = hm_class.name.split('::').last] = hm_class
+     if (through = hm.last.options[:through]&.to_s) # has_many :through  (HMT)
+       callbacks[through.singularize.camelize] = (through_assoc = hm.last.source_reflection).active_record
+       if last_through == through # Same HM, so no need to build it again, and for clarity just put in a blank line
+%><%=    \"\n\"
+%><%   else
+%>  <%= \"#\{model_short_name} ||--o{ #\{through_assoc.active_record.name}\".html_safe %> : \"\"
+<%       last_through = through
+       end
+%>    <%= \"#\{through_assoc.active_record.name} }o--|| #\{hm_name}\".html_safe %> : \"\"
+    <%= \"#\{model_short_name} }o..o{ #\{hm_name} : \\\"#\{hm.first}\\\"\".html_safe %><%
+     else # has_many
+%>  <%= \"#\{model_short_name} ||--o{ #\{hm_name} : \\\"#\{
+            hm_name unless hm.first.to_s == hm_class.name.underscore.pluralize.tr('/', '_')
+          }\\\"\".html_safe %><%
+     end %>
+<% end
+   callbacks.merge({model_short_name => #{@_brick_model.name}}).each do |cb_k, cb_class|
+     cb_relation = ::Brick.relations[cb_class.table_name]
+     pkeys = cb_relation[:pkey]&.first&.last
+     fkeys = cb_relation[:fks]&.values&.each_with_object([]) { |fk, s| s << fk[:fk] if fk.fetch(:is_bt, nil) }
+ %>  <%= cb_k %> {<%
+     pkeys&.each do |pk| %>
+    <%= \"int #\{pk} \\\"PK#\{' fk' if fkeys&.include?(pk)}\\\"\".html_safe %><%
+     end %><%
+     fkeys&.each do |fk|
+       if fk.is_a?(Array)
+         fk.each do |fk_part| %>
+    <%= \"int #\{fk_part} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk_part) %><%
+         end
+       else %>
+    <%= \"int #\{fk} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk) %><%
+       end
+     end %>
+  }
+<% end
+ # callback < %= cb_k % > erdClick
+ %>
+</div>
+"
               inline = case args.first
                        when 'index'
                          obj_pk = if pk&.is_a?(Array) # Composite primary key?
@@ -670,40 +731,9 @@ if (headerTop) {
       });
     });
   </script>
-<% end
-   if true # @_brick_erd
-%><div id=\"mermaidErd\" class=\"mermaid\">
-erDiagram
-<% model_short_name = #{@_brick_model.name.split('::').last.inspect}
-   callbacks = {}
-   @_brick_bt_descrip.each do |bt|
-     bt_full_name = bt[1].first.first.name
-     callbacks[bt_name = bt_full_name.split('::').last] = bt_full_name
-     # binding.pry
-    %>  <%= \"#\{model_short_name} #\{'||'}--#\{
-        'o{'} #\{bt_name} : \\\"#\{
-        bt.first unless bt.first.to_s == bt[1].first.first.name.underscore.singularize.tr('/', '_')
-        }\\\"\".html_safe %>
-<% end %>
-<% @_brick_hm_counts.each do |hm|
-     hm_full_name = hm.last.klass.name
-     callbacks[hm_name = hm_full_name.split('::').last] = hm_full_name
-    %>  <%= \"#\{model_short_name} #\{'}o'}--#\{
-        '||'} #\{hm_name} : \\\"#\{
-        hm.first unless hm.first.to_s == hm_full_name.underscore.pluralize.tr('/', '_')
-        }\\\"\".html_safe %>
 <% end %>
-<% callbacks.keys.each do |cb|
- %>  <%= cb %> {
-    int id
-  }
-<% end
- # callback < %= cb_k % > erdClick
- %>
-</div>
-<% end
-
-%><table id=\"headerTop\"></table>
+#{erd_markup}
+<table id=\"headerTop\"></table>
 <table id=\"#{table_name}\" class=\"shadow\">
   <thead><tr>#{"<th x-order=\"#{pk.join(',')}\"></th>" if pk.present?}<%=
      # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
@@ -877,6 +907,7 @@ if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(
   description %><br><%
 end
 %><%= link_to '(See all #{obj_name.pluralize})', #{path_obj_name.pluralize}_path %>
+#{erd_markup}
 <% if obj %>
   <br><br>
   <%= # path_options = [obj.#{pk}]
@@ -1034,7 +1065,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
   var imgErd = document.getElementById(\"imgErd\");
   var mermaidErd = document.getElementById(\"mermaidErd\");
   var mermaidCode;
-  var cbs = {<%= callbacks.map { |k, v| \"#\{k}: \\\"#\{v.underscore.pluralize}\\\"\" }.join(', ').html_safe %>};
+  var cbs = {<%= callbacks.map { |k, v| \"#\{k}: \\\"#\{v.name.underscore.pluralize}\\\"\" }.join(', ').html_safe %>};
   imgErd.addEventListener(\"click\", showErd);
   function showErd() {
     imgErd.style.display = \"none\";
@@ -1049,13 +1080,14 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
         securityLevel: \"loose\",
         mermaid: {callback: function(objId) {
           var svg = document.getElementById(objId);
+          svg.removeAttribute(\"width\");
           var cb;
           for(cb in cbs) {
             var gErd = svg.getElementById(cb);
             gErd.setAttribute(\"class\", \"relatedModel\");
             gErd.addEventListener(\"click\",
               function (evt) {
-                location.href = changeout(changeout(location.href, null, cbs[this.id]), \"_brick_erd\", \"1\");
+                location.href = changeout(changeout(location.href, -1, cbs[this.id]), \"_brick_erd\", \"1\");
               }
             );
           }

data/lib/brick/version_number.rb

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

metadata

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