brick 1.0.53 → 1.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737256fad5c987fa2ac603cf3708da959127a33ab9b27d164ceff858b71987b9
-  data.tar.gz: 144352db7686d19d9c330887069287da88de456276cc17aaeeaeb3c1de7a3281
+  metadata.gz: '09f9f2f9f7e21a96d29cdad815c069e52280ea068051f27a542541bcefd33e87'
+  data.tar.gz: 54e032633f930a43d1bc929d05d241367d9ebbdb8010f588b922d1111077524e
 SHA512:
-  metadata.gz: 83ec370e06c18bf9d62ec3ed445daf78dc5cbff825a85ff017cc7b814efb62f86e68022f7577734dd01ddf7e2f74b4b59de4b40b9c07656e83d0859ba6a4333d
-  data.tar.gz: 9106373ca7878dcc75c596f1fa44d420980c50cb09f5b63a1110d4e02dc63f02dafe3d1bc0d4de38a75d5678d964e3b8f12a720a722d2f593934e2f6be97f818
+  metadata.gz: 56cad221c2b20ac62839c1b7904c8acb9bc392b0779946bbe325c48c8ee5cf00b33413e070674343809ee851804e5f9bbec2d6469a148688c4aecbbcaee3e09d
+  data.tar.gz: 9757effb2a1d058ae4ccd259b59e0218e002928d90dadfd6ff3d0acd05fb12e27cfcfef30afa3964637e0e4f1e4246b410deba45fb01e452e20056df94820377

data/lib/brick/extensions.rb

@@ -1289,7 +1289,10 @@ module ActiveRecord::ConnectionHandling
   alias _brick_establish_connection establish_connection
   def establish_connection(*args)
     conn = _brick_establish_connection(*args)
-    _brick_reflect_tables
+    begin
+      _brick_reflect_tables
+    rescue ActiveRecord::NoDatabaseError
+    end
     conn
   end
 

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -7,13 +7,13 @@ module Brick
   class InstallGenerator < ::Rails::Generators::Base
     # include ::Rails::Generators::Migration
 
-    source_root File.expand_path('templates', __dir__)
-    class_option(
-      :with_changes,
-      type: :boolean,
-      default: false,
-      desc: 'Store changeset (diff) with each version'
-    )
+    # source_root File.expand_path('templates', __dir__)
+    # class_option(
+    #   :with_changes,
+    #   type: :boolean,
+    #   default: false,
+    #   desc: 'Store changeset (diff) with each version'
+    # )
 
     desc 'Generates an initializer file for configuring Brick'
 

data/lib/generators/brick/migrations_generator.rb

@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require 'rails/generators/active_record'
+require 'fancy_gets'
+
+module Brick
+  # Auto-generates migrations
+  class MigrationsGenerator < ::Rails::Generators::Base
+    include FancyGets
+    # include ::Rails::Generators::Migration
+
+    # SQL types that are the same as their migration data type name:  text, integer, bigint, smallint, date, boolean, decimal, float
+    SQL_TYPES = { 'character varying' =>'string',
+                  'timestamp without time zone' =>'timestamp',
+                  'timestamp with time zone' =>'timestamp',
+                  'double precision' =>'float' } # might work with 'double'
+    # (Still need to find what "inet" and "json" data types map to.)
+
+    # # source_root File.expand_path('templates', __dir__)
+    # class_option(
+    #   :with_changes,
+    #   type: :boolean,
+    #   default: false,
+    #   desc: 'Add IMPORT_TEMPLATE to model'
+    # )
+
+    desc 'Auto-generates migrations for an existing database.'
+
+    def brick_migrations
+      # If Apartment is active, see if a default schema to analyse is indicated
+
+      # # Load all models
+      # Rails.configuration.eager_load_namespaces.select { |ns| ns < Rails::Application }.each(&:eager_load!)
+
+      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
+
+      ar_version = unless ActiveRecord.version < ::Gem::Version.new('5.0')
+                     arv = ActiveRecord.version.segments[0..1]
+                     arv.pop if arv&.last == 0
+                     "[#{arv.join('.')}]"
+                   end
+      default_mig_path = (mig_path = ActiveRecord::Migrator.migrations_paths.first || "#{File.expand_path(__dir__)}/db/migrate")
+      if Dir.exist?(mig_path)
+        if Dir["#{mig_path}/**/*.rb"].present?
+          puts "WARNING: migrations folder #{mig_path} appears to already have ruby files present."
+          mig_path2 = "#{File.expand_path(__dir__)}/tmp/brick_migrations"
+          if Dir.exist?(mig_path2)
+            if Dir["#{mig_path2}/**/*.rb"].present?
+              puts "As well, temporary folder #{mig_path2} also has ruby files present."
+              puts "Choose a destination -- all existing .rb files will be removed:"
+              mig_path2 = gets_list(list: ['Cancel operation!', "Add all migration files to #{mig_path} anyway", mig_path, mig_path2])
+              return if mig_path2.start_with?('Cancel')
+
+              if mig_path2.start_with?('Add all migration files to ')
+                mig_path2 = mig_path
+              else
+                Dir["#{mig_path2}/**/*.rb"].each { |rb| File.delete(rb) }
+              end
+            else
+              puts "Using temporary folder #{mig_path2} for created migration files.\n\n"
+            end
+          else
+            puts "Creating the temporary folder #{mig_path2} for created migration files.\n\n"
+            Dir.mkdir(mig_path2)
+          end
+          mig_path = mig_path2
+        else
+          puts "Using standard migration folder #{mig_path} for created migration files.\n\n"
+        end
+      else
+        puts "Creating standard ActiveRecord migration folder #{mig_path} to hold new migration files.\n\n"
+        Dir.mkdir(mig_path)
+      end
+
+      # Generate a list of tables that can be chosen
+      chosen = gets_list(list: tables, chosen: tables.dup)
+      # Work from now back the same number of minutes as expected migrations to create
+      current_mig_time = Time.now - chosen.length.minutes
+      done = []
+      fks = {}
+      stuck = {}
+      # 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|
+                        snags = ::Brick.relations[tbl][:fks].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])
+                        end
+                        stuck[tbl] = snags if snags.present?
+                      end).present?
+        fringe.each do |tbl|
+          tbl = tbl[7..-1] if tbl.start_with?('public.') # %%% Provide better multitenancy support later
+          pkey_cols = ::Brick.relations[chosen.first][:pkey].values.flatten
+          # %%% For the moment we're skipping polymorphics
+          fkey_cols = ::Brick.relations[tbl][:fks].values.select { |assoc| assoc[:is_bt] && !assoc[:polymorphic] }
+          mig = +"class Create#{table_name = tbl.camelize} < ActiveRecord::Migration#{ar_version}\n"
+          # %%% Support missing foreign key (by adding:  ,id: false)
+          # also bigint / uuid / other non-standard data type for primary key
+          mig << "  def change\n    create_table :#{tbl} do |t|\n"
+          possible_ts = [] # Track possible generic timestamps
+          (relation = ::Brick.relations[tbl])[:cols].each do |col, col_type|
+            next if pkey_cols.include?(col)
+
+            # See if there are generic timestamps
+            if (sql_type = SQL_TYPES[col_type.first]) == 'timestamp' && ['created_at','updated_at'].include?(col)
+              possible_ts << col
+              next
+            end
+
+            sql_type ||= col_type.first
+            # Determine if this column is used as part of a foreign key
+            if fk = fkey_cols.find { |assoc| col == assoc[:fk] }
+              mig << "      t.references :#{fk[:assoc_name]}#{", type: #{sql_type}" unless sql_type == 'integer'}\n"
+            else
+              mig << emit_column(sql_type, col)
+            end
+          end
+          if possible_ts.length == 2 # Both created_at and updated_at
+            mig << "\n      t.timestamps\n"
+          else # Just one or the other
+            possible_ts.each { |ts| emit_column('timestamp', ts) }
+          end
+          mig << "    end\n  end\nend\n"
+          current_mig_time += 1.minute
+          File.open("#{mig_path}/#{current_mig_time.strftime('%Y%m%d%H%M00')}_create_#{tbl}.rb", "w") { |f| f.write mig }
+        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
+      pretty_mig_path = mig_path[cur_path.length] if mig_path.start_with?(cur_path = File.expand_path(__dir__))
+      puts "*** Created #{done.length} migration files under #{pretty_mig_path || mig_path} ***"
+      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 emit_column(type, name)
+      "      t.#{type.start_with?('numeric') ? 'decimal' : type} :#{name}\n"
+    end
+  end
+end

data/lib/generators/brick/model_generator.rb

@@ -59,7 +59,6 @@ module Brick
         end
       end
       models.each do |m| # Find longest name in the list for future use to show lists on the right side of the screen
-        # Strangely this can't be inlined since it assigns to "len"
         if longest_length < (len = m.name.length)
           longest_length = len
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.53
+  version: 1.0.54
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -238,6 +238,7 @@ files:
 - lib/brick/version_number.rb
 - lib/generators/brick/USAGE
 - lib/generators/brick/install_generator.rb
+- lib/generators/brick/migrations_generator.rb
 - lib/generators/brick/model_generator.rb
 - lib/generators/brick/templates/add_object_changes_to_versions.rb.erb
 - lib/generators/brick/templates/create_versions.rb.erb