brick 1.0.64 → 1.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c48ee6a2f143563e2e443f6edf0dc0e04e800e8fae6951e05b0362956129e950
-  data.tar.gz: f632f6e795dcf9b3aeb97e36a37c8074302c5967206b5f415a9a4b862bb4fda7
+  metadata.gz: 8a69a2b2fabbd8850a4484ae743c51ea895329d984638b0d7448a020859163f3
+  data.tar.gz: 46e5b56d1606aeaa1489b12462c417eabba871eca5cd018c223f915092157e11
 SHA512:
-  metadata.gz: 0cd5e05899a2f780a0bbf378f8f49e49f604b90cf122f2cd7efe34839c434af814c9a228f36bd18b112cd8e40b6736e88742ea0f2a1a0b55ac3f8f573e614918
-  data.tar.gz: a34a9f47746159f6b4b39f8a3cd994055e022be9eefe8737b73c63e5d475b283ae3b99a6a11e3faf140ca6efbf67d7f400e03147a757c237c8875f11ea2c0ea4
+  metadata.gz: e4817d2bef72c2e8082eee5762616f72b1e1c360ac395bb79b2272ceffa46849f7da89b72f99044875f70d688970f2529d9d9bb1ddea3b1b3adbe816d608345f
+  data.tar.gz: c992c1d4979ee36e8eaa4a6d575c5e19defafd926b2c30aa73ea0c2c4c1789f8418431b8e1af7b0832d747c26e2861b91eed070725004746d25255a74d984571

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
@@ -183,7 +185,7 @@ h1, h3 {
   margin-bottom: 0;
 }
 #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;
@@ -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,68 +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_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>
-<% end
-
-%><table id=\"headerTop\"></table>
+<% end %>
+#{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
@@ -905,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}]

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 64
+    TINY = 65
 
     # 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.64
+  version: 1.0.65
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord