brick 1.0.154 → 1.0.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 647f34b463dc92515c7eb04331726a808b5ea69dd2bbd6ef99c9d6c769868565
-  data.tar.gz: 22ae7fa65845e65a7848f5cfff0fbb52a864b0161783c3f7d28cfb82ba1f88e5
+  metadata.gz: e001ce24602c8fef817c24a0eb88e014e990d98828474acd66d868b50dd68692
+  data.tar.gz: 8378593754641ffc86059672fe6148ba767d91a867361b21ec8377a82903af6b
 SHA512:
-  metadata.gz: 84034f48010bd159804a19cb865a9cad04ba5efe89bb1e807a7031393d9a64a33d9ca9802f991565f4d73753df087d200099052dde59e4127c6b94370456ec09
-  data.tar.gz: 57b3cca20e566ef0d4ac72a45f24b025feea45421417b23cbe7cb683877ac228463f5f348f931a6024b9cdf750dde6aa6c49293e1ae1a596a70a0d8f3c128d6c
+  metadata.gz: 84fa7d9831dfca26b9b08ef46bd852c3d4f96e1f8420ff086526f97964090b3f95d71b5d66d9ff7ba47ec5f74e50938c9714731d21d0c59ac2365305ab8826bc
+  data.tar.gz: cf790bbb66852142fe07cb1619517043dc3ef8c47b0f020b22bc635cd902fface9b52631507b2fdd9520b604c98eae00b58a1bad29ace185c8d342e79e99a062

data/lib/brick/config.rb

@@ -380,6 +380,14 @@ module Brick
       @mutex.synchronize { @always_load_fields = field_set }
     end
 
+    def ignore_migration_fks
+      @mutex.synchronize { @ignore_migration_fks || [] }
+    end
+
+    def ignore_migration_fks=(relations)
+      @mutex.synchronize { @ignore_migration_fks = relations }
+    end
+
     # Add status page showing all resources and what files have been built out for them
     def add_status
       true

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 = 154
+    TINY = 156
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -1159,11 +1159,16 @@ 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
+
+      unless respond_to?(:primary_abstract_class)
+        def self.primary_abstract_class
+          self.abstract_class = true
+        end
+      end
     end
 
     # Rails < 4.0 cannot do #find_by, #find_or_create_by, or do #pluck on multiple columns, so here are the patches:

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',
@@ -123,21 +124,27 @@ module Brick
       built_schemas = {} # Track all built schemas so we can place an appropriate drop_schema command only in the first
                          # migration in which that schema is referenced, thereby allowing rollbacks to function properly.
       versions_to_create = [] # Resulting versions to be used when updating the schema_migrations table
+      ar_base = Object.const_defined?(:ApplicationRecord) ? ApplicationRecord : Class.new(ActiveRecord::Base)
       # Start by making migrations for fringe tables (those with no foreign keys).
       # Continue layer by layer, creating migrations for tables that reference ones already done, until
       # no more migrations can be created.  (At that point hopefully all tables are accounted for.)
       while (fringe = chosen.reject do |tbl|
+                        snag_fks = []
                         snags = ::Brick.relations.fetch(tbl, nil)&.fetch(:fks, nil)&.select do |_k, v|
                           v[:is_bt] && !v[:polymorphic] &&
                           tbl != v[:inverse_table] && # Ignore self-referencing associations (stuff like "parent_id")
-                          !done.include?(v[:inverse_table])
+                          !done.include?(v[:inverse_table]) &&
+                          ::Brick.config.ignore_migration_fks.exclude?(snag_fk = "#{tbl}.#{v[:fk]}") &&
+                          snag_fks << snag_fk
+                        end
+                        if snags&.present?
+                          # puts snag_fks.inspect
+                          stuck[tbl] = snags
                         end
-                        stuck[tbl] = snags if snags&.present?
                       end).present?
         fringe.each do |tbl|
           next unless (relation = ::Brick.relations.fetch(tbl, nil))&.fetch(:cols, nil)&.present?
 
-          ar_base = Object.const_defined?(:ApplicationRecord) ? ApplicationRecord : Class.new(ActiveRecord::Base)
           pkey_cols = (rpk = relation[:pkey].values.flatten) & (arpk = [ar_base.primary_key].flatten.sort)
           # In case things aren't as standard
           if pkey_cols.empty?
@@ -170,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 ||
@@ -179,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}"
@@ -217,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
@@ -246,7 +254,8 @@ module Brick
                   suffix << ", index: { name: '#{shorter || idx_name}' }"
                   indexes[shorter || idx_name] = nil
                 end
-                mig << "      t.references :#{fk[:assoc_name]}#{suffix}, foreign_key: { to_table: #{to_table} }\n"
+                primary_key = ::Brick.relations[fk[:inverse_table]][:class_name]&.constantize&.primary_key
+                mig << "      t.references :#{fk[:assoc_name]}#{suffix}, foreign_key: { to_table: #{to_table}#{", primary_key: :#{primary_key}" if primary_key != ar_base.primary_key} }\n"
               end
             else
               next if !id_option&.end_with?('id: false') && pkey_cols&.include?(col)

data/lib/generators/brick/seeds_generator.rb

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require 'fancy_gets'
+
+module Brick
+  class SeedsGenerator < ::Rails::Generators::Base
+    include FancyGets
+
+    desc 'Auto-generates a seeds file from existing data.'
+
+    def brick_seeds
+      # %%% If Apartment is active and there's no schema_to_analyse, ask which schema they want
+
+      ::Brick.mode = :on
+      ActiveRecord::Base.establish_connection
+
+      if (tables = ::Brick.relations.reject { |k, v| v.key?(:isView) && v[:isView] == true }.map(&:first).sort).empty?
+        puts "No tables found in database #{ActiveRecord::Base.connection.current_database}."
+        return
+      end
+
+      if File.exist?(seed_file_path = "#{::Rails.root}/db/seeds.rb")
+        puts "WARNING: seeds file #{seed_file_path} appears to already be present."
+      end
+
+      # Generate a list of tables that can be chosen
+      chosen = gets_list(list: tables, chosen: tables.dup)
+      schemas = chosen.each_with_object({}) do |v, s|
+        if (v_parts = v.split('.')).length > 1
+          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}:\n"
+      done = []
+      fks = {}
+      stuck = {}
+      indexes = {} # Track index names to make sure things are unique
+      ar_base = Object.const_defined?(:ApplicationRecord) ? ApplicationRecord : Class.new(ActiveRecord::Base)
+      # Start by making entries for fringe models (those with no foreign keys).
+      # Continue layer by layer, creating entries for models that reference ones already done, until
+      # no more entries can be created.  (At that point hopefully all models are accounted for.)
+      while (fringe = chosen.reject do |tbl|
+                        snag_fks = []
+                        snags = ::Brick.relations.fetch(tbl, nil)&.fetch(:fks, nil)&.select do |_k, v|
+                          v[:is_bt] && !v[:polymorphic] &&
+                          tbl != v[:inverse_table] && # Ignore self-referencing associations (stuff like "parent_id")
+                          !done.include?(v[:inverse_table]) &&
+                          ::Brick.config.ignore_migration_fks.exclude?(snag_fk = "#{tbl}.#{v[:fk]}") &&
+                          snag_fks << snag_fk
+                        end
+                        if snags&.present?
+                          # puts snag_fks.inspect
+                          stuck[tbl] = snags
+                        end
+                      end).present?
+        seeds << "\n"
+        fringe.each do |tbl|
+          next unless ::Brick.config.exclude_tables.exclude?(tbl) &&
+                      (relation = ::Brick.relations.fetch(tbl, nil))&.fetch(:cols, nil)&.present? &&
+                      (klass = Object.const_get(class_name = relation[:class_name])).table_exists?
+
+          pkey_cols = (rpk = relation[:pkey].values.flatten) & (arpk = [ar_base.primary_key].flatten.sort)
+          # In case things aren't as standard
+          if pkey_cols.empty?
+            pkey_cols = if rpk.empty? # && relation[:cols][arpk.first]&.first == key_type
+                          arpk
+                        elsif rpk.first
+                          rpk
+                        end
+          end
+          schema = if (tbl_parts = tbl.split('.')).length > 1
+                     if tbl_parts.first == (::Brick.default_schema || 'public')
+                       tbl_parts.shift
+                       nil
+                     else
+                       tbl_parts.first
+                     end
+                   end
+
+          # %%% For the moment we're skipping polymorphics
+          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}'"
+
+          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 = []
+            data = []
+            relation[:cols].each do |col, col_type|
+              next if !(fk = fkeys.find { |assoc| col == assoc[:fk] }) &&
+                      pkey_cols.include?(col)
+
+              if (val = obj.send(col)) && (val.is_a?(Time) || val.is_a?(Date))
+                val = val.to_s
+              end
+              if fk
+                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.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.154
+  version: 1.0.156
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -257,6 +257,7 @@ files:
 - lib/generators/brick/install_generator.rb
 - lib/generators/brick/migrations_generator.rb
 - lib/generators/brick/models_generator.rb
+- lib/generators/brick/seeds_generator.rb
 - lib/generators/brick/templates/add_object_changes_to_versions.rb.erb
 - lib/generators/brick/templates/create_versions.rb.erb
 homepage: https://github.com/lorint/brick