brick 1.0.155 → 1.0.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fceffbcf863eb9c03b64a0cb4420a33ded5eb7f3908b40b263a345ae9bf5c164
-  data.tar.gz: 81f9f96bd1463b8b7e7736ed4716bcf78609bae27485af4de15cb23ae12e27ee
+  metadata.gz: e001ce24602c8fef817c24a0eb88e014e990d98828474acd66d868b50dd68692
+  data.tar.gz: 8378593754641ffc86059672fe6148ba767d91a867361b21ec8377a82903af6b
 SHA512:
-  metadata.gz: c41a59ca62c80012166225b0cf80505b81fe57ccdfeb92c4add7f227d6d4a9cc0c664aaf5209c31dabd54c3e471fe140fd3dc75bf1441bbed0fca67e9801ffd9
-  data.tar.gz: 83c874515b230b0b607da32e41366284b15e830ebd7f7022fb318db412fef94a0339495de54c9ab0277425af2635cc8ab235675074cbb50f703082979ebd28b5
+  metadata.gz: 84fa7d9831dfca26b9b08ef46bd852c3d4f96e1f8420ff086526f97964090b3f95d71b5d66d9ff7ba47ec5f74e50938c9714731d21d0c59ac2365305ab8826bc
+  data.tar.gz: cf790bbb66852142fe07cb1619517043dc3ef8c47b0f020b22bc635cd902fface9b52631507b2fdd9520b604c98eae00b58a1bad29ace185c8d342e79e99a062

data/lib/brick/extensions.rb

@@ -1464,7 +1464,6 @@ class Object
                                                               rescue StandardError => ex
                                                                 ::ActiveRecord::Base
                                                               end))
-
       end
       hmts = nil
       code = +"class #{full_name} < #{base_model.name}\n"
@@ -1489,6 +1488,10 @@ class Object
         end
         # Accommodate singular or camel-cased table names such as "order_detail" or "OrderDetails"
         code << "  self.table_name = '#{self.table_name = matching}'\n" if inheritable_name || self.table_name != matching
+        if (inh_col = ::Brick.config.sti_type_column.find { |_k, v| v.include?(matching) }&.first)
+          self.inheritance_column = inh_col
+          code << "  self.inheritance_column = '#{inh_col}'\n"
+        end
 
         # Override models backed by a view so they return true for #is_view?
         # (Dynamically-created controllers and view templates for such models will then act in a read-only way)

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1159,8 +1159,7 @@ ActiveSupport.on_load(:active_record) do
       # :singleton-method:
       # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling
       # dates and times from the database. This is set to :utc by default.
-      unless respond_to?(:default_timezone)
-        puts "ADDING!!! 4.w"
+      unless ::ActiveRecord.respond_to?(:default_timezone) || respond_to?(:default_timezone)
         mattr_accessor :default_timezone, instance_writer: false
         self.default_timezone = :utc
       end

data/lib/generators/brick/migrations_generator.rb

@@ -23,7 +23,8 @@ module Brick
                   'time with time zone' => 'time',
                   'double precision' => 'float',
                   'smallint' => 'integer', # %%% Need to put in "limit: 2"
-                  # # Oracle data types
+                  'ARRAY' => 'string', # Note that we'll also add ", array: true"
+                  # Oracle data types
                   'VARCHAR2' => 'string',
                   'CHAR' => 'string',
                   ['NUMBER', 22] => 'integer',
@@ -176,7 +177,7 @@ module Brick
           # Support missing primary key (by adding:  , id: false)
           id_option = if pk_is_also_fk || !pkey_cols&.present?
                         needs_serial_col = true
-                        ', id: false'
+                        +', id: false'
                       elsif ((pkey_col_first = (col_def = relation[:cols][pkey_cols&.first])&.first) &&
                              (pkey_col_first = SQL_TYPES[pkey_col_first] || SQL_TYPES[col_def&.[](0..1)] ||
                                                SQL_TYPES.find { |r| r.first.is_a?(Regexp) && pkey_col_first =~ r.first }&.last ||
@@ -185,16 +186,16 @@ module Brick
                             )
                         case pkey_col_first
                         when 'integer'
-                          ', id: :serial'
+                          +', id: :serial'
                         when 'bigint'
-                          ', id: :bigserial'
+                          +', id: :bigserial'
                         else
-                          ", id: :#{pkey_col_first}" # Something like:  id: :integer, primary_key: :businessentityid
+                          +", id: :#{pkey_col_first}" # Something like:  id: :integer, primary_key: :businessentityid
                         end +
                           (pkey_cols.first ? ", primary_key: :#{pkey_cols.first}" : '')
                       end
           if !id_option && pkey_cols.sort != arpk
-            id_option = ", primary_key: :#{pkey_cols.first}"
+            id_option = +", primary_key: :#{pkey_cols.first}"
           end
           if !is_4x_rails && (comment = relation&.fetch(:description, nil))&.present?
             (id_option ||= +'') << ", comment: #{comment.inspect}"
@@ -223,6 +224,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')
             if !is_4x_rails && klass && (comment = klass.columns_hash.fetch(col, nil)&.comment)&.present?
               suffix << ", comment: #{comment.inspect}"
             end

data/lib/generators/brick/seeds_generator.rb

@@ -31,7 +31,7 @@ module Brick
           s[v_parts.first] = nil unless [::Brick.default_schema, 'public'].include?(v_parts.first)
         end
       end
-      seeds = +"# Seeds file for #{ActiveRecord::Base.connection.current_database}:"
+      seeds = +"# Seeds file for #{ActiveRecord::Base.connection.current_database}:\n"
       done = []
       fks = {}
       stuck = {}
@@ -82,10 +82,14 @@ module Brick
           fkeys = relation[:fks].values.select { |assoc| assoc[:is_bt] && !assoc[:polymorphic] }
           # Refer to this table name as a symbol or dotted string as appropriate
           # tbl_code = tbl_parts.length == 1 ? ":#{tbl_parts.first}" : "'#{tbl}'"
-          seeds << "  # #{class_name}\n"
 
+          has_rows = false
           is_empty = true
           klass.order(*pkey_cols).each do |obj|
+            unless has_rows
+              has_rows = true
+              seeds << "  puts 'Seeding: #{class_name}'\n"
+            end
             is_empty = false
             pk_val = obj.send(pkey_cols.first)
             fk_vals = []
@@ -98,19 +102,55 @@ module Brick
                 val = val.to_s
               end
               if fk
-                fk_vals << "#{fk[:assoc_name]}: #{fk[:inverse_table]}_#{val.inspect}" if val
+                inv_tbl = fk[:inverse_table].gsub('.', '__')
+                fk_vals << "#{fk[:assoc_name]}: #{inv_tbl}_#{brick_escape(val)}" if val
               else
                 data << "#{col}: #{val.inspect}"
               end
             end
-            seeds << "#{tbl}_#{pk_val} = #{class_name}.create(#{(fk_vals + data).join(', ')})\n"
+            seeds << "#{tbl.gsub('.', '__')}_#{brick_escape(pk_val)} = #{class_name}.create(#{(fk_vals + data).join(', ')})\n"
           end
+          seeds << "  # (Skipping #{class_name} as it has no rows)\n" unless has_rows
           File.open(seed_file_path, "w") { |f| f.write seeds }
         end
         done.concat(fringe)
         chosen -= done
       end
+      stuck_counts = Hash.new { |h, k| h[k] = 0 }
+      chosen.each do |leftover|
+        puts "Can't do #{leftover} because:\n  #{stuck[leftover].map do |snag|
+          stuck_counts[snag.last[:inverse_table]] += 1
+          snag.last[:assoc_name]
+        end.join(', ')}"
+      end
       puts "\n*** Created seeds for #{done.length} models in db/seeds.rb ***"
+      if (stuck_sorted = stuck_counts.to_a.sort { |a, b| b.last <=> a.last }).length.positive?
+        puts "-----------------------------------------"
+        puts "Unable to create migrations for #{stuck_sorted.length} tables#{
+          ".  Here's the top 5 blockers" if stuck_sorted.length > 5
+        }:"
+        pp stuck_sorted[0..4]
+      end
+    end
+
+  private
+
+    def brick_escape(val)
+      val = val.to_s if val.is_a?(Date) || val.is_a?(Time) # Accommodate when for whatever reason a primary key is a date or time
+      case val
+      when String
+        ret = +''
+        val.each_char do |ch|
+          if ch < '0' || (ch > '9' && ch < 'A') || ch > 'Z'
+            ret << (ch == '_' ? ch : "x#{'K'.unpack('H*')[0]}")
+          else
+            ret << ch
+          end
+        end
+        ret
+      else
+        val
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.155
+  version: 1.0.156
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-09 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord