brick 1.0.65 → 1.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a69a2b2fabbd8850a4484ae743c51ea895329d984638b0d7448a020859163f3
-  data.tar.gz: 46e5b56d1606aeaa1489b12462c417eabba871eca5cd018c223f915092157e11
+  metadata.gz: 977737d8dec8900c82e2a973060dca56ae7897e281557e43e1c0696012521270
+  data.tar.gz: 8a005ecab292cbfdaf94b29476d4db56e9f5b71a46a5f71ca6fd049550ed4cff
 SHA512:
-  metadata.gz: e4817d2bef72c2e8082eee5762616f72b1e1c360ac395bb79b2272ceffa46849f7da89b72f99044875f70d688970f2529d9d9bb1ddea3b1b3adbe816d608345f
-  data.tar.gz: c992c1d4979ee36e8eaa4a6d575c5e19defafd926b2c30aa73ea0c2c4c1789f8418431b8e1af7b0832d747c26e2861b91eed070725004746d25255a74d984571
+  metadata.gz: c3cfaf5cdcdf67038ba5969306f49b73c09977b9e1dec078ad3ca3d6f6e7d16b5b0d18eb16a982568966ac91cabdcb96e82362cce4906485581b36ce2e2410da
+  data.tar.gz: 50f38455e43528478fe694f08bfcc50a8968536c9e4e6d8ab0c1713ff621e2153454a541d8e5940f584f2bd9e06549c4d3db047ac11fbdedaf5bc536d0ac7cd1

data/lib/brick/extensions.rb

@@ -657,9 +657,12 @@ Module.class_exec do
                full_class_name = +''
                full_class_name << "::#{self.name}" unless self == Object
                full_class_name << "::#{plural_class_name.underscore.singularize.camelize}"
-               if (plural_class_name == 'BrickSwagger' ||
-                  ((::Brick.config.add_status || ::Brick.config.add_orphans) && plural_class_name == 'BrickGem') ||
-                  model = self.const_get(full_class_name))
+               if plural_class_name == 'BrickSwagger' ||
+                  (
+                    (::Brick.config.add_status || ::Brick.config.add_orphans) &&
+                    plural_class_name == 'BrickGem'
+                  ) ||
+                  model = self.const_get(full_class_name)
                  # if it's a controller and no match or a model doesn't really use the same table name, eager load all models and try to find a model class of the right name.
                  Object.send(:build_controller, self, class_name, plural_class_name, model, relations)
                end
@@ -1033,7 +1036,7 @@ class Object
           self.define_method :orphans do
             instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params)))
           end
-          return [new_controller_class, code + ' # BrickGem controller']
+          return [new_controller_class, code + "end # BrickGem controller\n"]
         when 'BrickSwagger'
           is_swagger = true # if request.format == :json)
         end
@@ -1193,6 +1196,8 @@ class Object
             else
               instance_variable_set("@#{singular_table_name}".to_sym,
                                     model.send(:create, send(params_name_sym)))
+              index
+              render :index
             end
           end
 
@@ -1353,14 +1358,12 @@ module ActiveRecord::ConnectionHandling
       when 'Mysql2'
         ::Brick.default_schema = schema = ActiveRecord::Base.connection.current_database
       when 'SQLite'
-        # %%% Retrieve internal ActiveRecord table names like this:
-        # ActiveRecord::Base.internal_metadata_table_name, ActiveRecord::Base.schema_migrations_table_name
         sql = "SELECT m.name AS relation_name, UPPER(m.type) AS table_type,
           p.name AS column_name, p.type AS data_type,
           CASE p.pk WHEN 1 THEN 'PRIMARY KEY' END AS const
         FROM sqlite_master AS m
           INNER JOIN pragma_table_info(m.name) AS p
-        WHERE m.name NOT IN (?, ?)
+        WHERE m.name NOT IN ('sqlite_sequence', ?, ?)
         ORDER BY m.name, p.cid"
       else
         puts "Unfamiliar with connection adapter #{ActiveRecord::Base.connection.adapter_name}"

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

@@ -96,16 +96,15 @@ module Brick
 
             alias :_brick_find_template :find_template
             def find_template(*args, **options)
-              unless (model_name = (
-                       @_brick_model ||
-                       (ActionView.version < ::Gem::Version.new('5.0') && args[1].is_a?(Array) ? set_brick_model(args) : nil)
-                     )&.name) ||
+              unless (model_name = @_brick_model&.name) ||
                      (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
-                     (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']])
+                     (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']]) ||
+                     # Used to also have:  ActionView.version < ::Gem::Version.new('5.0') &&
+                     (model_name = (args[1].is_a?(Array) ? set_brick_model(args) : nil)&.name)
                 return _brick_find_template(*args, **options)
               end
 
-              unless is_status || is_orphans
+            if @_brick_model
                 pk = @_brick_model._brick_primary_key(::Brick.relations.fetch(model_name, nil))
                 obj_name = model_name.split('::').last.underscore
                 path_obj_name = model_name.underscore.tr('/', '_')
@@ -156,7 +155,7 @@ module Brick
                                  end
                     hm_entry << ']'
                     hms_columns << hm_entry
-                  when 'show', 'update'
+                  when 'show', 'new', 'update'
                     hm_stuff << if hm_fk_name
                                   "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
                                 else # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
@@ -179,6 +178,7 @@ module Brick
                               end.keys.sort.each_with_object(+'') do |v, s|
                                 s << "<option value=\"#{v.underscore.gsub('.', '/').pluralize}\">#{v}</option>"
                               end.html_safe
+              table_options << '<option value="brick_status">(Status)</option>'.html_safe if ::Brick.config.add_status
               table_options << '<option value="brick_orphans">(Orphans)</option>'.html_safe if is_orphans
               css = +"<style>
 h1, h3 {
@@ -275,7 +275,7 @@ tr th, tr td {
   color: #80B8D2;
 }
 
-table.shadow tbody tr {
+table.shadow > tbody > tr {
   border-bottom: thin solid #dddddd;
 }
 
@@ -283,7 +283,7 @@ table tbody tr:nth-of-type(even) {
   background-color: #f3f3f3;
 }
 
-table.shadow tbody tr:last-of-type {
+table.shadow > tbody > tr:last-of-type {
   border-bottom: 2px solid #009879;
 }
 
@@ -300,14 +300,6 @@ a.big-arrow {
   font-size: 2.5em;
   text-decoration: none;
 }
-.wide-input {
-  display: block;
-  overflow: hidden;
-}
-.wide-input input[type=text] {
-  display: inline-block;
-  width: 90%;
-}
 .dimmed {
   background-color: #C0C0C0;
   text-align: center;
@@ -324,9 +316,6 @@ svg.revert {
   display: none;
   margin-left: 0.25em;
 }
-.wide-input > svg.revert {
-  float: right;
-}
 input+svg.revert {
   top: 0.5em;
 }
@@ -365,8 +354,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
@@ -379,9 +368,10 @@ def display_value(col_type, val)
       '?'
     end
   end
-end %>"
+end
+callbacks = {} %>"
 
-              if ['index', 'show', 'update'].include?(args.first)
+              if ['index', 'show', 'new', 'update'].include?(args.first)
                 poly_cols = []
                 css << "<% bts = { #{
                   bt_items = bts.each_with_object([]) do |v, s|
@@ -537,17 +527,18 @@ if (headerTop) {
 }
 </script>"
 
-              erd_markup = "<div id=\"mermaidErd\" class=\"mermaid\">
+              erd_markup = if @_brick_model
+                             "<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('/', '_')
+        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 %>
 <% end
    last_through = nil
@@ -557,14 +548,15 @@ erDiagram
 
      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
+       through_name = (through_assoc = hm.last.source_reflection).active_record.name.split('::').last
+       callbacks[through_name] = through_assoc.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 %> : \"\"
+%>  <%= \"#\{model_short_name} ||--o{ #\{through_name}\".html_safe %> : \"\"
 <%       last_through = through
        end
-%>    <%= \"#\{through_assoc.active_record.name} }o--|| #\{hm_name}\".html_safe %> : \"\"
+%>    <%= \"#\{through_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} : \\\"#\{
@@ -572,21 +564,25 @@ erDiagram
           }\\\"\".html_safe %><%
      end %>
 <% end
+   def dt_lookup(dt)
+     { 'integer' => 'int', }[dt] || dt.tr(' ', '_')
+   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) }
+     cols = cb_relation[:cols]
  %>  <%= cb_k %> {<%
      pkeys&.each do |pk| %>
-    <%= \"int #\{pk} \\\"PK#\{' fk' if fkeys&.include?(pk)}\\\"\".html_safe %><%
+    <%= \"#\{dt_lookup(cols[pk].first)} #\{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) %><%
+    <%= \"#\{dt_lookup(cols[fk_part].first)} #\{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) %><%
+    <%= \"#\{dt_lookup(cols[fk].first)} #\{fk} \\\"&nbsp;&nbsp;&nbsp;&nbsp;fk\\\"\".html_safe unless pkeys&.include?(fk) %><%
        end
      end %>
   }
@@ -595,6 +591,7 @@ erDiagram
  %>
 </div>
 "
+                           end
               inline = case args.first
                        when 'index'
                          obj_pk = if pk&.is_a?(Array) # Composite primary key?
@@ -690,7 +687,7 @@ erDiagram
 </script>
 <script async defer src=\"https://apis.google.com/js/api.js\" onload=\"gapiLoaded()\"></script>
 "
-                         end
+                         end # DutyFree data export and import
 # %%% Instead of our current "for Janet Leverling (Employee)" kind of link we previously had this code that did a "where x = 123" thing:
 #   (where <%= @_brick_params.each_with_object([]) { |v, s| s << \"#\{v.first\} = #\{v.last.inspect\}\" }.join(', ') %>)
 +"#{css}
@@ -829,6 +826,7 @@ erDiagram
 #{script}"
 
                        when 'status'
+                         if is_status
 # Status page - list of all resources and 5 things they do or don't have present, and what is turned on and off
 # Must load all models, and then find what table names are represented
 # Easily could be multiple files involved (STI for instance)
@@ -852,7 +850,7 @@ erDiagram
   @resources.each do |r|
   %>
   <tr>
-  <td><%= link_to(r[0], \"/#\{r[0].tr('.', '/')}\") %></td>
+  <td><%= link_to(r[0], \"/#\{r[0].underscore.tr('.', '/')}\") %></td>
   <td<%= if r[1]
            ' class=\"orphan\"' unless ::Brick.relations.key?(r[1])
          else
@@ -873,6 +871,7 @@ erDiagram
 <% end %>
 </tbody></table>
 #{script}"
+                         end
 
                        when 'orphans'
                          if is_orphans
@@ -890,7 +889,7 @@ erDiagram
 #{script}"
                          end
 
-                       when 'show', 'update'
+                       when 'show', 'new', 'update'
 +"#{css}
 
 <svg id=\"revertTemplate\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"
@@ -958,38 +957,41 @@ end
     <% end %>
     </th>
     <td>
+    <table><tr><td>
     <% dt_pickers = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
+    html_options = {}
+    html_options[:class] = 'dimmed' unless val
+    is_revert = true
     if bt
-      html_options = { prompt: \"Select #\{bt_name\}\" }
-      html_options[:class] = 'dimmed' unless val %>
+      html_options[:prompt] = \"Select #\{bt_name\}\" %>
       <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
       <%= if (bt_obj = bt_class&.find_by(bt_pair[1] => val))
             link_to('⇛', send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_obj.send(bt_class.primary_key.to_sym)), { class: 'show-arrow' })
           elsif val
             \"<span class=\\\"orphan\\\">Orphaned ID: #\{val}</span>\".html_safe
-          end %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
+          end %>
     <% else
-    html_options = {}
-    html_options[:class] = 'dimmed' unless val
-    case (col_type = col.type || col.sql_type)
+      case (col_type = col.type || col.sql_type)
       when :string, :text %>
-        <% if is_bcrypt?(val) # || .readonly? %>
+        <% if is_bcrypt?(val) # || .readonly?
+             is_revert = false %>
           <%= hide_bcrypt(val, 1000) %>
         <% else %>
-          <div class=\"wide-input\"><%= f.text_field(k.to_sym, html_options) %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg></div>
+          <%= f.text_field(k.to_sym, html_options) %>
         <% end %>
       <% when :boolean %>
-        <%= f.check_box k.to_sym %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
+        <%= f.check_box k.to_sym %>
       <% when :integer, :decimal, :float %>
         <%= if col_type == :integer
               f.text_field k.to_sym, { pattern: '\\d*', class: 'check-validity' }
             else
               f.number_field k.to_sym
-            end %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
+            end %>
       <% when *dt_pickers.keys
            is_includes_dates = true %>
-        <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
-      <% when :uuid %>
+        <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %>
+      <% when :uuid
+           is_revert = false %>
         <%=
           # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
           # If it's not yet enabled then:  create extension \"uuid-ossp\";
@@ -1000,11 +1002,18 @@ 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, :primary_key
+           is_revert = false %>
       <% else %>
-        <%= display_value(col_type, val) %>
+        <%= display_value(col_type, val)
+           is_revert = false %>
+      <% end
+       end
+       if is_revert
+         %></td>
+         <td><svg class=\"revert\" width=\"1.5em\" viewBox=\"0 0 512 512\"><use xlink:href=\"#revertPath\" /></svg>
       <% end %>
-    <% end %>
+      </td></tr></table>
     </td>
     </tr>
   <% end
@@ -1066,7 +1075,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
   var mermaidErd = document.getElementById(\"mermaidErd\");
   var mermaidCode;
   var cbs = {<%= callbacks.map { |k, v| \"#\{k}: \\\"#\{v.name.underscore.pluralize}\\\"\" }.join(', ').html_safe %>};
-  imgErd.addEventListener(\"click\", showErd);
+  if (imgErd) imgErd.addEventListener(\"click\", showErd);
   function showErd() {
     imgErd.style.display = \"none\";
     mermaidErd.style.display = \"inline-block\";
@@ -1127,9 +1136,12 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
   var origVal = getInpVal(),
       prevVal = origVal;
   var revert;
-  if ((revert = ((inp.tagName === \"SELECT\" && inp.nextElementSibling.nextElementSibling) ||
-       inp.nextElementSibling ||
-       inp.parentElement.nextElementSibling)) && revert.tagName.toLowerCase() === \"svg\")
+  if (inp.getAttribute(\"type\") == \"hidden\" || inp.getAttribute(\"type\") == \"submit\") return;
+
+  var svgTd = null;
+  if ((revert = ((inp.tagName === \"SELECT\" && (svgTd = inp.parentElement.nextElementSibling) && svgTd.firstElementChild) ||
+                 ((svgTd = inp.parentElement.nextElementSibling) && svgTd.firstElementChild))
+     ) && revert.tagName.toLowerCase() === \"svg\")
     revert.addEventListener(\"click\", function (e) {
       if (inp.type === \"checkbox\")
         inp.checked = origVal;
@@ -1160,7 +1172,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
       prevVal = getInpVal();
     }
     // Show or hide the revert button
-    if (revert) revert.style.display = getInpVal() === origVal ? \"none\" : \"inline-block\";
+    if (revert) revert.style.display = getInpVal() === origVal ? \"none\" : \"block\";
   });
   function getInpVal() {
     return inp.type === \"checkbox\" ? inp.checked : inp.value;
@@ -1180,6 +1192,13 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
             # In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
             prepend ::Brick::RouteSet
           end
+          # Do the root route before the Rails Welcome one would otherwise take precedence
+          unless (route = ::Brick.config.default_route_fallback).blank? ||
+                 ::Rails.application.routes.named_routes.send(:routes)[:root]
+            ::Rails.application.routes.append do
+              send(:root, "#{route}#{'#index' unless route.index('#')}")
+            end
+          end
         end
 
         # Just in case it hadn't been done previously when we tried to load the brick initialiser,

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -123,7 +123,7 @@ module Brick
   end
 
   class << self
-    attr_accessor :default_schema, :db_schemas
+    attr_accessor :default_schema, :db_schemas, :routes_done
 
     def set_db_schema(params)
       schema = params['_brick_schema'] || 'public'
@@ -461,11 +461,11 @@ In config/initializers/brick.rb appropriate entries would look something like:
 
   module RouteSet
     def finalize!
+      return super if ::Brick.routes_done
+
+      ::Brick.routes_done = true
       existing_controllers = routes.each_with_object({}) { |r, s| c = r.defaults[:controller]; s[c] = nil if c }
       ::Rails.application.routes.append do
-        unless ::Brick.config.default_route_fallback.blank? || ::Rails.application.routes.named_routes.send(:routes)[:root]
-          send(:root, "#{::Brick.config.default_route_fallback}#index")
-        end
         # %%% TODO: If no auto-controllers then enumerate the controllers folder in order to build matching routes
         # If auto-controllers and auto-models are both enabled then this makes sense:
         ::Brick.relations.each do |rel_name, v|

data/lib/generators/brick/install_generator.rb

@@ -279,8 +279,8 @@ module Brick
 # # route to go to the :index action for what would be a controller for that table.  You can specify any controller
 # # name and action you wish in order to override this and have that be the default route when none other has been
 # # specified in routes.rb or elsewhere.  (Or just use an empty string in order to disable this behaviour.)
-# Brick.default_route_fallback = 'customers' # This defaults to \"customers/index\"
-# Brick.default_route_fallback = 'orders/outstanding' # Example of a non-RESTful route
+# Brick.default_route_fallback = 'customers' # This defaults to \"customers#index\"
+# Brick.default_route_fallback = 'orders#outstanding' # Example of a non-RESTful route
 # Brick.default_route_fallback = '' # Omits setting a default route in the absence of any other
 ")
       end

data/lib/generators/brick/migrations_generator.rb

@@ -22,7 +22,16 @@ module Brick
                   'time without time zone' => 'time',
                   'time with time zone' => 'time',
                   'double precision' => 'float',
-                  'smallint' => 'integer' } # %%% Need to put in "limit: 2"
+                  'smallint' => 'integer', # %%% Need to put in "limit: 2"
+                  # Sqlite data types
+                  'TEXT' => 'text',
+                  '' => 'string',
+                  'INTEGER' => 'integer',
+                  'REAL' => 'float',
+                  'BLOB' => 'binary',
+                  'TIMESTAMP' => 'timestamp',
+                  'DATETIME' => 'timestamp'
+                }
     # (Still need to find what "inet" and "json" data types map to.)
 
     desc 'Auto-generates migration files for an existing database.'
@@ -38,7 +47,8 @@ module Brick
         return
       end
 
-      key_type = (ActiveRecord.version < ::Gem::Version.new('5.1') ? 'integer' : 'bigint')
+      is_sqlite = ActiveRecord::Base.connection.adapter_name == 'SQLite'
+      key_type = ((is_sqlite || ActiveRecord.version < ::Gem::Version.new('5.1')) ? 'integer' : 'bigint')
       is_4x_rails = ActiveRecord.version < ::Gem::Version.new('5.0')
       ar_version = "[#{ActiveRecord.version.segments[0..1].join('.')}]" unless is_4x_rails
       is_insert_versions = true
@@ -142,21 +152,20 @@ module Brick
           # if this one has come in as bigint or integer.
           pk_is_also_fk = fkey_cols.any? { |assoc| pkey_cols&.first == assoc[:fk] } ? pkey_cols&.first : nil
           # Support missing primary key (by adding:  ,id: false)
-          id_option = if pk_is_also_fk || (pkey_col_first = relation[:cols][pkey_cols&.first]&.first) != key_type
-                        if pk_is_also_fk || !pkey_cols&.present?
-                          ', id: false'
+          id_option = if pk_is_also_fk || !pkey_cols&.present?
+                        ', id: false'
+                      elsif ((pkey_col_first = relation[:cols][pkey_cols&.first]&.first) &&
+                             (pkey_col_first = SQL_TYPES[pkey_col_first] || pkey_col_first) != key_type)
+                        case pkey_col_first
+                        when 'integer'
+                          ', id: :serial'
+                        when 'bigint'
+                          ', id: :bigserial'
                         else
-                          case pkey_col_first
-                          when 'integer'
-                            ', id: :serial'
-                          when 'bigint'
-                            ', id: :bigserial'
-                          else
-                            ", id: :#{SQL_TYPES[pkey_col_first] || pkey_col_first}" # Something like:  id: :integer, primary_key: :businessentityid
-                          end +
-                            (pkey_cols.first ? ", primary_key: :#{pkey_cols.first}" : '') +
-                            (!is_4x_rails && (comment = relation&.fetch(:description, nil))&.present? ? ", comment: #{comment.inspect}" : '')
-                        end
+                          ", id: :#{pkey_col_first}" # Something like:  id: :integer, primary_key: :businessentityid
+                        end +
+                          (pkey_cols.first ? ", primary_key: :#{pkey_cols.first}" : '') +
+                          (!is_4x_rails && (comment = relation&.fetch(:description, nil))&.present? ? ", comment: #{comment.inspect}" : '')
                       end
           # Find the ActiveRecord class in order to see if the columns have comments
           unless is_4x_rails
@@ -208,7 +217,7 @@ module Brick
                 mig << "      t.references :#{fk[:assoc_name]}#{suffix}, foreign_key: { to_table: #{to_table} }\n"
               end
             else
-              next if !id_option&.end_with?('id: false') && pkey_cols.include?(col)
+              next if !id_option&.end_with?('id: false') && pkey_cols&.include?(col)
 
               # See if there are generic timestamps
               if sql_type == 'timestamp' && ['created_at','updated_at'].include?(col)
@@ -244,7 +253,7 @@ module Brick
             mig << "    #{'# ' if is_commented}add_foreign_key #{tbl_code}, #{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
           end
           mig << "  end\n"
-          versions_to_create << migration_file_write(mig_path, "create_#{tbl_parts.join('_')}", current_mig_time += 1.minute, ar_version, mig)
+          versions_to_create << migration_file_write(mig_path, "create_#{tbl_parts.map(&:underscore).join('_')}", current_mig_time += 1.minute, ar_version, mig)
         end
         done.concat(fringe)
         chosen -= done

metadata

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