brick 1.0.247 → 1.0.249

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf36636026c4ecad5ff76ccdeea80604c6c9128f7065d7b546ab41cc4fccf1c
-  data.tar.gz: ec8c081354229eb5b4cdcd3112b24313468aaf731f856168cace28d3882e1f51
+  metadata.gz: 6a0179dae81efe75fe8ed60f18a8bcad431cd98db8604eadf7efba5ef200798f
+  data.tar.gz: fa409b53922fc28f8d0e0ef4753b0545efc27ae2c92fdf2f2249508d311137dc
 SHA512:
-  metadata.gz: 3742d4d628c4f0ff18008f5dd965b3e49c545d24141cea917a0ba141cff7f3243b6f159e732f2e786b87f274e80237bcea2af74f17b9494345cf898e54e72928
-  data.tar.gz: 3aa5e54bc3b4af270e5b2342430e294920b151139af66ec5771b15a575377f7275f9c10e593d7c1d314e67d145fd9ffb0ae834b4f68a5d4c1afff8b22ecc404c
+  metadata.gz: 95ad49630d116d9fc1ca4c29065caeef4bbff0c688f4cadc64aed81b9611d057a628168ab2bd69d8958e4aa79c6caf4a2715ae2979c60741f081ddfc0fb41db5
+  data.tar.gz: a8e9d742f3207b58ff4069e3efd57a02cfa25f6c267db72ca1e725b10bc3fd29fddcaca2dd19c6501aaa4003cafc515d413789539c838f4d24cc668785776111

data/lib/brick/compatibility.rb

@@ -119,7 +119,7 @@ if Object.const_defined?('ActionPack') && !ActionPack.respond_to?(:version)
     end
   end
 end
-if Object.const_defined?('Bundler') && Bundler.locked_gems&.dependencies.key?('action_view')
+if Object.const_defined?('Bundler') && Bundler.locked_gems&.dependencies&.key?('action_view')
   require 'action_view' # Needed for Rails <= 4.0
   module ::ActionView
     if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)

data/lib/brick/extensions.rb

@@ -38,6 +38,8 @@
 
 # Upon creation of a new object, when going to the index page, highlight this new object and scroll it into view (likely to the very bottom of everything, although might be sorted differently)
 
+# If there is a module defined with the same name as a schema found in a Postgres, MSSQL, or Oracle database then missing models that should exist underneath that module are not auto-generated.
+
 # ==========================================================
 # Dynamically create model or controller classes when needed
 # ==========================================================
@@ -213,7 +215,7 @@ module ActiveRecord
       end
 
       def is_postgres
-        @is_postgres ||= connection.adapter_name == 'PostgreSQL'
+        @is_postgres ||= ['PostgreSQL', 'PostGIS'].include?(connection.adapter_name)
       end
       def is_mysql
         @is_mysql ||= ['Mysql2', 'Trilogy'].include?(connection.adapter_name)
@@ -2206,7 +2208,7 @@ class Object
       end
       table_name = model&.table_name || 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_postgres = ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name)
       is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
 
       namespace = nil if namespace == ::Object

data/lib/brick/rails/engine.rb

@@ -828,13 +828,13 @@ window.addEventListener(\"popstate\", linkSchemas);
               end
               css = +"
 <%
-          if @_request.respond_to?(:content_security_policy) && (csp = @_request.content_security_policy)&.directives&.present?
+          if @_request.respond_to?(:content_security_policy) && (csp = @_request.content_security_policy)&.directives&.present? %><%
             @_request.env['_is_brick'] = true
             if @_request.respond_to?(:content_security_policy_nonce_directives)
               @_request.content_security_policy_nonce_directives = %w[ script-src ]
               @_request.env['_brick_nonce'] = \" nonce=\\\"#\{@_request.content_security_policy_nonce}\\\"\".html_safe
               %><meta name=\"csp-nonce\" content=\"<%= @_request.content_security_policy_nonce %>\"><%
-            end
+            end %><%
             if !@_request.respond_to?(:_brick_content_security_policy)
               if csp.instance_variables.exclude?(:@_brick_style_shas)
                 csp.instance_variable_set(:@_brick_style_shas, [
@@ -1042,7 +1042,7 @@ if (window.brickFontFamily) {
   }
 </script>
 <script src=\"https://apis.google.com/js/api.js\"></script>
-<script async defer src=\"https://accounts.google.com/gsi/client\" id=\"gapiScript\"<%= @_request.env['_brick_nonce'] %>></script>
+<script async defer src=\"https://accounts.google.com/gsi/client\" id=\"gapiScript\"></script>
 <script<%= @_request.env['_brick_nonce'] %>>
   document.getElementById(\"gapiScript\").addEventListener(\"onload\",
     function () { // gapiLoaded
@@ -1075,14 +1075,16 @@ if (window.brickFontFamily) {
 </head>
 <body>
 <div id=\"titleBox\"><div id=\"titleSticky\">
-<% if request.respond_to?(:flash)
-     if (alert)
-%><p class=\"flashAlert\"><%= alert.html_safe %></p><%
-     end
-     if (notice)
-%><p class=\"flashNotice\"><%= notice.html_safe %></p><%
-     end
-end %>#{"
+<%= if request.respond_to?(:flash)
+      out = +''
+      if (alert)
+        out << \"<p class=\\\"flashAlert\\\">#\{alert}</p>\"
+      end
+      if (notice)
+        out << \"<p class=\\\"flashNotice\\\">#\{notice}</p>\"
+      end
+      out.html_safe
+    end %>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><tr>
@@ -1103,7 +1105,7 @@ end %>#{"
     end
 %><%= if (children = model.descendants).present?
   child_links = children.map do |child|
-    path = send(\"#\{child._brick_index}_path\") + \"?#\{base_model.inheritance_column}=#\{child.name}\"
+    path = send(\"#\{child._brick_index}_path\") + \"?__#\{base_model.inheritance_column}=#\{child.name}\"
     link_to(child.name, path)
   end
   \"<tr><td colspan=\\\"#\{td_count}\\\">Children: #\{child_links.join(' ')}</tr>\".html_safe
@@ -1114,22 +1116,22 @@ end
    if description.present? %><span class=\"__brick\"><%=
      description %></span><br><%
    end
-   # FILTER PARAMETERS
+   # FILTER PARAMETERS %><%
    if @_brick_params&.present? %>
-  <% if @_brick_params.length == 1 # %%% Does not yet work with composite keys
+  <% if @_brick_params.length == 1 # %%% Does not yet work with composite keys %><%
        k, id = @_brick_params.first
        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
+       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 }) &&
-          (objs = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id))
+          (objs = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id)) %><%
          objs = [objs] unless objs.is_a?(Array) %>
          <h3 class=\"__brick\">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 %><%
      end %>
   <span class=\"__brick\">(<%= link_to \"See all #\{model.base_class.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)</span>
-<% end
+<% end %><%
    # COLUMN EXCLUSIONS
    if @_brick_excl&.present? %>
   <div id=\"exclusions\">Excluded columns:
@@ -1144,9 +1146,10 @@ end
       });
     });
   </script>
-<% end
+<% end %><%
    # SEARCH BOX
-   if @_brick_es && @_brick_es&.index('r') # Must have at least Elasticsearch Read access %>
+   if @_brick_es && @_brick_es&.index('r') # Must have at least Elasticsearch Read access
+%>
   <input type=\"text\" id=\"esSearch\" class=\"dimmed\">
   <script<%= @_request.env['_brick_nonce'] %>>
     var esSearch = document.getElementById(\"esSearch\");
@@ -1211,7 +1214,7 @@ end
 </div></div>
 #{::Brick::Rails.erd_markup(@_brick_model, prefix) if @_brick_model}
 
-<%= # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
+<%=#  Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
     # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
     @#{res_name} ||= if (dym_list = instance_variables.reject do |entry|
                              entry.to_s.start_with?('@_') ||
@@ -1343,21 +1346,21 @@ end
            ' class=\"orphan\"' unless ::Brick.relations.key?(r[1])
          else
            ' class=\"dimmed\"'
-         end&.html_safe %>><%= # Table
+         end&.html_safe %>><%=# Table
          if (rowcount = rel&.fetch(:rowcount, nil))
            rowcount = (rowcount > 0 ? \" (#\{rowcount})\" : nil)
          end
          \"#\{r[1]}#\{rowcount}\" %></td>
   <td<%= lines = r[2]&.map { |line| \"#\{line.first}:#\{line.last}\" }
-         ' class=\"dimmed\"'.html_safe unless r[2] %>><%= # Migration
+         ' class=\"dimmed\"'.html_safe unless r[2] %>><%=# Migration
           lines&.join('<br>')&.html_safe %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[3] %>><%= # Model
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[3] %>><%=# Model
           r[3] %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[4] %>><%= # Route
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[4] %>><%=# Route
                %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[5] %>><%= # Controller
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[5] %>><%=# Controller
                %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[6] %>><%= # Views
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[6] %>><%=# Views
                %></td>
   </tr>
 <% end %>
@@ -1372,14 +1375,14 @@ end
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <h1>Orphans<%= \" for #\{}\" if false %></h1>
-<% @orphans.each do |o|
-     if (klass = ::Brick.relations[o[0]]&.fetch(:class_name, nil)&.constantize) %>
-<%=    via = \" (via #\{o[4]})\" unless \"#\{o[2].split('.').last.underscore.singularize}_id\" == o[4]
+<%= @orphans.each_with_object(+'') do |o, s|
+      if (klass = ::Brick.relations[o[0]]&.fetch(:class_name, nil)&.constantize)
+s << \"    via = \\\" (via #\{o[4]})\\\" unless \"#\{o[2].split('.').last.underscore.singularize}_id\" == o[4]
        link_to(\"#\{o[0]} #\{o[1]} refers#\{via} to non-existent #\{o[2]} #\{o[3]}#\{\" (in table \\\"#\{o[5]}\\\")\" if o[5]}\",
-               send(\"#\{klass._brick_index(:singular)\}_path\".to_sym, o[1])) %>
-  <br>
-<%   end
-   end %>
+               send(\"#\{klass._brick_index(:singular)\}_path\".to_sym, o[1]))
+s << \"\\n  <br>\\n\"
+     end
+   end.html_safe %>
 #{script}"
                          end
 
@@ -1419,25 +1422,27 @@ end
   c23.141-70.188,89.141-120.906,167.063-120.906c97.25,0,176,78.813,176,176C511.828,227.078,404.391,119.641,271.844,119.641z\" />
 </svg>
 
-<% if request.respond_to?(:flash)
-     if (alert)
-%><p class=\"flashAlert\"><%= alert.html_safe %></p><%
-     end
-     if (notice)
-%><p class=\"flashNotice\"><%= notice.html_safe %></p><%
-     end
-end %>#{"
+<%= if request.respond_to?(:flash)
+      out = +''
+      if (alert)
+        out << \"<p class=\\\"flashAlert\\\">#\{alert}</p>\"
+      end
+      if (notice)
+        out << \"<p class=\\\"flashNotice\\\">#\{notice}</p>\"
+      end
+      out.html_safe
+    end %>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><tr><td><h1><%= page_title %></h1></td>
-<% rel = Brick.relations[#{model_name}.table_name]
+<%= rel = Brick.relations[#{model_name}.table_name]
    if (in_app = rel.fetch(:existing, nil)&.fetch(:show, nil))
      begin
-       in_app = send(\"#\{in_app}_path\", #{pk.is_a?(String) ? "obj.#{pk}" : '[' + pk.map { |pk_part| "obj.#{pk_part}" }.join(', ') + ']' }) if in_app.is_a?(Symbol) %>
-     <td><%= link_to(::Brick::Rails::IN_APP.html_safe, in_app) %></td>
-<%   rescue ActionController::UrlGenerationError
+       in_app = send(\"#\{in_app}_path\", #{pk.is_a?(String) ? "obj.#{pk}" : '[' + pk.map { |pk_part| "obj.#{pk_part}" }.join(', ') + ']' }) if in_app.is_a?(Symbol)
+       \"\\n     <td>#\{link_to(::Brick::Rails::IN_APP.html_safe, in_app)}</td>\\n\".html_safe
+     rescue ActionController::UrlGenerationError
      end
-   end
+   end %><%
 
    if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
   <td><%= link_to_brick(
@@ -1448,19 +1453,19 @@ end %>#{"
                    end,
         title: \"#\{page_title} in Avo\" }
     ) %></td>
-<% end
+<% end %><%=
 
    if Object.const_defined?('ActiveAdmin')
-     ActiveAdmin.application.namespaces.names.each do |ns| %>
-<td><%= link_to_brick(
-   ::Brick::Rails::AA_PNG.html_safe,
-   { show_proc: Proc.new do |aa_model, relation|
-                  path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{aa_model.model_name.singular_route_key}_path\".to_sym
-                  send(path_helper, obj) if respond_to?(path_helper)
-                end,
-     title: \"#\{page_title} in ActiveAdmin\" }
- ) %></td>
-<%   end
+     ActiveAdmin.application.namespaces.names.each_with_object(+'') do |ns, s|
+       s << \"\\n<td>#\{link_to_brick(
+         ::Brick::Rails::AA_PNG.html_safe,
+         { show_proc: Proc.new do |aa_model, relation|
+                         path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{aa_model.model_name.singular_route_key}_path\".to_sym
+                         send(path_helper, obj) if respond_to?(path_helper)
+                       end,
+           title: \"#\{page_title} in ActiveAdmin\" }
+         )}</td>\\n\"
+     end
    end %>
 </tr></table>
 <%
@@ -1472,7 +1477,7 @@ end
 <% if obj %>
   <br><br>
 
-<%= # Write out the mega-form
+<%=# Write out the mega-form
     brick_form_with(model: obj, bts: bts, pk: #{pk.inspect}) %>
 
 #{unless args.first == 'new'
@@ -1706,7 +1711,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
               end
               if representation == :grid
                 inline << "<script<%= @_request.env['_brick_nonce'] %>>
-<% # Make column headers sort when clicked
+<%#  Make column headers sort when clicked
    # %%% Create a smart javascript routine which can do this client-side %>
 [... document.getElementsByTagName(\"TH\")].forEach(function (th) {
   th.addEventListener(\"click\", function (e) {

data/lib/brick/rails.rb

@@ -122,7 +122,7 @@ module ::Brick::Rails
       "<div id=\"mermaidErd\">
   <div id=\"mermaidDiagram\" class=\"mermaid\">
 erDiagram
-<% shown_classes = {}
+<%= shown_classes = {}
 
    def erd_sidelinks(shown_classes, klass)
      links = []
@@ -137,20 +137,20 @@ erDiagram
      links.join
    end
 
-   @_brick_bt_descrip&.each do |bt|
+   @_brick_bt_descrip&.each_with_object(+'') do |bt, s|
      bt_class = bt[1].first.first
      callbacks[bt_name = bt_class.name.split('::').last] = bt_class
      # Used to have:  &.inverse_of  before  &.macro
      is_has_one = ::#{model.name}.reflect_on_association(bt.first)&.macro == :has_one ||
                   ::Brick.config.has_ones&.fetch('#{model.name}', nil)&.key?(bt.first.to_s)
-    %>  <%= \"#{model_short_name} #\{is_has_one ? '||--o|' : '}o--||'} #\{bt_name} : \\\"#\{
+    s << \"  #{model_short_name} #\{is_has_one ? '||--o|' : '}o--||'} #\{bt_name} : \\\"#\{
         bt_underscored = bt[1].first.first.name.underscore.singularize
         bt.first unless bt.first.to_s == bt_underscored.split('/').last # Was:  bt_underscored.tr('/', '_')
-        }\\\"\".html_safe %>
-<%=  erd_sidelinks(shown_classes, bt_class).html_safe %>
-<% end
+        }\\\"\n\"
+     s << erd_sidelinks(shown_classes, bt_class)
+   end&.html_safe %><%=
    last_hm = nil
-   @_brick_hm_counts&.each do |hm|
+   @_brick_hm_counts&.each_with_object(+'') do |hm, s|
      # 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) == ::#{model.name}
 
@@ -159,21 +159,21 @@ erDiagram
        through_name = (through_assoc = hm.last.source_reflection).active_record.name.split('::').last
        callbacks[through_name] = through_assoc.active_record
        if last_hm == 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_name}\".html_safe %> : \"\"
-<%=      erd_sidelinks(shown_classes, through_assoc.active_record).html_safe %>
-<%       last_hm = through
+         s << \"\\n\"
+       else
+         s << \"  #{model_short_name} ||--o{ #\{through_name} : \\\"\\\"\\n\"
+         s << erd_sidelinks(shown_classes, through_assoc.active_record)
+         last_hm = through
        end
-%>    <%= \"#\{through_name} }o--|| #\{hm_name}\".html_safe %> : \"\"
-    <%= \"#{model_short_name} }o..o{ #\{hm_name} : \\\"#\{hm.first}\\\"\".html_safe %><%
+       s << \"    #\{through_name} }o--|| #\{hm_name} : \\\"\\\"\\n\"
+       s << \"#{model_short_name} }o..o{ #\{hm_name} : \\\"#\{hm.first}\\\"\\n\"
      else # has_many
-%>  <%= \"#{model_short_name} #\{hm.last.macro == :has_and_belongs_to_many ? '}o' : '||'}--o{ #\{hm_name} : \\\"#\{
+       s << \"  #{model_short_name} #\{hm.last.macro == :has_and_belongs_to_many ? '}o' : '||'}--o{ #\{hm_name} : \\\"#\{
             hm.first.to_s unless (last_hm = hm.first.to_s).downcase == hm_class.name.underscore.pluralize.tr('/', '_')
-          }\\\"\".html_safe %><%
-     end %>
-<%=  erd_sidelinks(shown_classes, hm_class).html_safe %>
-<% end
+          }\\\"\\n\"
+     end
+     s << erd_sidelinks(shown_classes, hm_class)
+   end&.html_safe %><%
    def dt_lookup(dt)
      { 'integer' => 'int', 'character varying' => 'varchar', 'double precision' => 'float',
        'timestamp without time zone' => 'timestamp',
@@ -186,26 +186,26 @@ erDiagram
      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) }
      cols = cb_relation[:cols]
- %>  <%= cb_k %> {<%
-     pkeys&.each do |pk| %>
-    <%= \"#\{dt_lookup(cols[pk].first)} #\{pk} \\\"PK#\{' fk' if fkeys&.include?(pk)}\\\"\".html_safe %><%
-     end %><%
-     fkeys&.each do |fk|
+ %>  <%= cb_k %> {<%=
+     pkeys&.each_with_object(+'') do |pk, s|
+       s << \"#\{dt_lookup(cols[pk].first)} #\{pk} \\\"PK#\{' fk' if fkeys&.include?(pk)}\\\"\"
+     end&.html_safe %><%=
+     fkeys&.each_with_object(+'') do |fk, s|
        if fk.is_a?(Array)
-         fk.each do |fk_part| %>
-    <%= \"#\{dt_lookup(cols[fk_part].first)} #\{fk_part} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk_part) %><%
+         fk.each do |fk_part|
+           s << \"#\{dt_lookup(cols[fk_part].first)} #\{fk_part} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\" unless pkeys&.include?(fk_part)
          end
        else # %%% Does not yet accommodate polymorphic BTs
-    %>
-    <%= \"#\{dt_lookup(cols[fk]&.first)} #\{fk} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk) %><%
+         s << \"#\{dt_lookup(cols[fk]&.first)} #\{fk} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\" unless pkeys&.include?(fk)
        end
-     end %><%
+     end&.html_safe %><%=
      if (erd_sc = Brick.config.erd_show_columns) == true || erd_sc&.include?(cb_class.name)
-       cols&.each do |col|
-         next if pkeys.include?(col.first) || fkeys.include?(col.first) %>
-    <%= \"#\{dt_lookup(col[1]&.first&.to_s)} #\{col.first}\".html_safe %><%
+       cols&.each_with_object(+'') do |col, s|
+         next if pkeys.include?(col.first) || fkeys.include?(col.first)
+
+         s << \"#\{dt_lookup(col[1]&.first&.to_s)} #\{col.first}\"
        end
-     end %>
+     end&.html_safe %>
   }
 <% end
  # callback < %= cb_k % > erdClick

data/lib/brick/reflect_tables.rb

@@ -100,7 +100,7 @@ module Brick
         is_postgres = nil
         is_mssql = ActiveRecord::Base.connection.adapter_name == 'SQLServer'
         case ActiveRecord::Base.connection.adapter_name
-        when 'PostgreSQL', 'SQLServer'
+        when 'PostgreSQL', 'PostGIS', 'SQLServer'
           is_postgres = !is_mssql
           db_schemas = if is_postgres
                          ActiveRecord::Base.execute_sql('SELECT nspname AS table_schema, MAX(oid) AS dt FROM pg_namespace GROUP BY 1 ORDER BY 1;')
@@ -177,8 +177,8 @@ module Brick
         measures = []
         ::Brick.is_oracle = true if ActiveRecord::Base.connection.adapter_name == 'OracleEnhanced'
         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'
+        when 'PostgreSQL', 'PostGIS', 'SQLite' # These bring back a hash for each row because the query uses column aliases
+          # schema ||= 'public' if ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name)
           retrieve_schema_and_tables(sql, is_postgres, is_mssql, schema).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'.
@@ -275,7 +275,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         end
 
         # PostGIS adds three views which would confuse Rails if models were to be built for them.
-        if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        if ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name)
           if relations.key?('geography_columns') && relations.key?('geometry_columns') && relations.key?('spatial_ref_sys')
             (::Brick.config.exclude_tables ||= []) << 'geography_columns'
             ::Brick.config.exclude_tables << 'geometry_columns'
@@ -284,7 +284,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         end
 
         # # Add unique OIDs
-        # if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        # if ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name)
         #   ActiveRecord::Base.execute_sql(
         #     "SELECT c.oid, n.nspname, c.relname
         #     FROM pg_catalog.pg_namespace AS n
@@ -309,7 +309,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         kcus = nil
         entry_type = nil
         case ActiveRecord::Base.connection.adapter_name
-        when 'PostgreSQL', 'Mysql2', 'Trilogy', 'SQLServer'
+        when 'PostgreSQL', 'PostGIS', 'Mysql2', 'Trilogy', 'SQLServer'
           # Part 1 -- all KCUs
           sql = "SELECT CONSTRAINT_CATALOG, CONSTRAINT_SCHEMA, CONSTRAINT_NAME, ORDINAL_POSITION,
                         TABLE_NAME, COLUMN_NAME
@@ -369,7 +369,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
           fk_references = ActiveRecord::Base.execute_sql(sql)
         end
         ::Brick.is_oracle = true if ActiveRecord::Base.connection.adapter_name == 'OracleEnhanced'
-        # ::Brick.default_schema ||= schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        # ::Brick.default_schema ||= schema ||= 'public' if ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name)
         ::Brick.default_schema ||= 'public' if is_postgres
         fk_references&.each do |fk|
           fk = fk.values unless fk.is_a?(Array)

data/lib/brick/util.rb

@@ -49,7 +49,7 @@ module Brick
           # then required in place of the original.
 
           Kernel.module_exec do
-            alias_method :orig_require, :require
+            alias_method :_orig_require, :require
             # To be most faithful to Ruby's normal behaviour, this should look like a public singleton
             define_method(:require) do |name|
               # %%% Can get a message such as "ActionDispatch::Routing is not missing constant RouteSet! (NameError)"
@@ -62,14 +62,14 @@ module Brick
                 else
                   is_replaced = false
                   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)
+                    is_replaced = _orig_require(replacement_path)
                   elsif replacement_path.nil?
                     puts "Couldn't find #{name} to require it!"
                   end
                   is_replaced
                 end
               else
-                Kernel.send(:orig_require, name)
+                _orig_require(name)
               end
             end
           end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -127,7 +127,7 @@ module Brick
     def set_db_schema(params = nil)
       # If Apartment::Tenant.current is not still the default (usually 'public') then an elevator has brought us into
       # a different tenant.  If so then don't allow schema navigation.
-      if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' && apartment_multitenant
+      if ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name) && apartment_multitenant
         current_schema = (ActiveRecord::Base.execute_sql('SELECT current_schemas(true)')
                                             .first['current_schemas'][1..-2]
                                             .split(',') - ['pg_catalog', 'pg_toast', 'heroku_ext']).first
@@ -1547,8 +1547,8 @@ module ActiveRecord
 
     elsif private_instance_methods.include?(:select_association_list) # AR >= 6.1
       alias _brick_select_association_list select_association_list
-      def select_association_list(associations, stashed_joins = nil)
-        result = _brick_select_association_list(associations, stashed_joins)
+      def select_association_list(associations, stashed_joins = nil, &block)
+        result = _brick_select_association_list(associations, stashed_joins, &block)
         result.instance_variable_set(:@relation, self)
         result
       end
@@ -1686,11 +1686,11 @@ module ActiveRecord
             if (relation = child.instance_variable_get(:@assocs)&.instance_variable_get(:@relation))
               link_path = child.instance_variable_get(:@link_path)
               relation.brick_links(false)[link_path] = if child.table.is_a?(Arel::Nodes::TableAlias)
-                                                  child.table.right
-                                                else
-                                                  # Was:  result.first&.left&.table_alias || child.table_name
-                                                  child.table.table_alias || child.table_name
-                                                end
+                                                         child.table.right
+                                                       else
+                                                         # Was:  result.first&.left&.table_alias || child.table_name
+                                                         child.table.table_alias || child.table_name
+                                                       end
             end
             result
           end

data/lib/generators/brick/migrations_builder.rb

@@ -16,6 +16,17 @@ module Brick
                   'double precision' => 'float',
                   'smallint' => 'integer', # %%% Need to put in "limit: 2"
                   'ARRAY' => 'string', # Note that we'll also add ", array: true"
+                  # MySQL data types
+                  'tinytext' => 'text',   # 255 bytes
+                  # 'text' => 'text',     # 64kb
+                  'mediumtext' => 'text', # 16mb
+                  'longtext' => 'text',   # 4gb
+                  'tinyblob' => 'binary',
+                  'blob' => 'binary',
+                  'mediumblob' => 'binary',
+                  'longblob' => 'binary',
+                  'enum' => 'string',
+                  'set' => 'string', # Note that we'll also add ", array: true"
                   # Oracle data types
                   'VARCHAR2' => 'string',
                   'CHAR' => 'string',
@@ -189,7 +200,7 @@ module Brick
             # disable the final FK migration by using a ".rbx" file extension.
             fks_extension = if after_fks.length > 500
               minutes = (after_fks.length + 1000) / 1500
-              mig << "    if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'\n"
+              mig << "    if ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name)\n"
               mig << "      puts 'NOTE:  It could take around #{minutes} #{'minute'.pluralize(minutes)} on a FAST machine for Postgres to do all the final processing for these foreign keys.  Please be patient!'\n"
 
               mig << "      # Vacuum takes only about ten seconds when all the tables are empty,
@@ -204,7 +215,7 @@ module Brick
             end
             mig << +"  end\n"
             increment_time(mig_path, current_mig_time)
-            base_name = "_#{relations[:base_name]&.tr(' ', '')&.underscore}" if relations[:base_name]
+            base_name = "_#{relations[:base_name].tr(' ', '').underscore}" if relations.key?(:base_name)
             versions_to_create << migration_file_write(mig_path, "create_brick_fks#{base_name}.#{fks_extension}", current_mig_time, ar_version, mig)
             puts "Have written out a final migration called 'create_brick_fks#{base_name}.#{fks_extension}' which creates #{after_fks.length} foreign keys."
             if fks_extension == 'rbx'
@@ -361,7 +372,7 @@ module Brick
                      SQL_TYPES.find { |r| r.first.is_a?(Regexp) && col_type.first =~ r.first }&.last ||
                      col_type.first
           suffix = col_type[3] || pkey_cols&.include?(col) ? +', null: false' : +''
-          suffix << ', array: true' if (col_type.first == 'ARRAY')
+          suffix << ', array: true' if (['ARRAY', 'set'].include?(col_type.first))
           if !is_4x_rails && klass && (comment = klass.columns_hash.fetch(col, nil)&.comment)&.present?
             suffix << ", comment: #{comment.inspect}"
           end
@@ -428,7 +439,7 @@ module Brick
         mig << "    end\n"
         if pk_is_also_fk
           mig << "    reversible do |dir|\n"
-          mig << "      dir.up { execute('ALTER TABLE #{tbl} ADD PRIMARY KEY (#{pk_is_also_fk})') }\n"
+          mig << "      dir.up { execute('ALTER TABLE #{tbl} ADD PRIMARY KEY (#{pkey_cols.map { |pk| "\"#{pk}\"" }.join(', ')})') }\n"
           mig << "    end\n"
         end
         add_fks.each do |add_fk|

data/lib/generators/brick/seeds_builder.rb

@@ -218,11 +218,11 @@ module Brick
               data = []
               updates = []
               relation[:cols].each do |col, _col_type|
-                # Skip primary key columns, unless they are part of a foreign key.
+                # Skip primary key columns, unless they are part of a foreign key or a composite key.
                 # (But always add all columns if it's Airtable!)
                 next if !(fk = fkeys.find { |assoc| col == assoc[:fk] }) &&
                         !is_airtable &&
-                        pkey_cols.include?(col) && orig_pk_val.is_a?(Integer)
+                        pkey_cols.first == col && orig_pk_val.is_a?(Integer)
 
                 # Used to be:  obj.send(col)
                 # (and with that it was possible to raise ActiveRecord::Encryption::Errors::Configuration...)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.247
+  version: 1.0.249
 platform: ruby
 authors:
 - Lorin Thwaits