brick 1.0.56 → 1.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b696c53c9d9d359d49de147b06b5342820ca230451c860d097f44bcae3b23bb0
-  data.tar.gz: 7b0f6ff365f918a97d64305eabf70fcfe78cf764514ca22b3731b780da04b22c
+  metadata.gz: 930370b67a72b31db99cc8d50afa80d4c3be0d07e727155eb20ac5a7628bb1bb
+  data.tar.gz: f2d7964c79172a438800b3c69c63e62b26a4984357ca5d6c7ff9e2ef72e5308f
 SHA512:
-  metadata.gz: 43ab6db28554fb7502d0f03267d2f5bab27d310fb988701d371232f6604090cd679767a12097a7c217401b05e938c787844ae11138a2c8143c1e675b93599656
-  data.tar.gz: 8d2e592ba27bba30e100ea23a2bf951d6f3861c422ef355bad7cd38e146c20c2cf53380aa7ee440f40aa2d111c7f33eadc8dc09f73d1689432fff071e04228c4
+  metadata.gz: 03e7ba018c426517060aa6312d14a9f1e0877d82b376782ea46b4b1506433bbe3e9e4d2c3d88aaf3d5fb356c68a129fd975b1718d7b2ac826b241efab3f2cee6
+  data.tar.gz: 645c6b750dd870180e312ffddff1d199bb84e92cdde0309f253ec8c927f3ba5304b84ae95b066c260d0523048c607b28148d1b577a479ec661b94de05248813a

data/lib/brick/version_number.rb

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

data/lib/generators/brick/migrations_generator.rb

@@ -5,12 +5,14 @@ require 'rails/generators/active_record'
 require 'fancy_gets'
 
 module Brick
-  # Auto-generates migrations
+  # Auto-generates migration files
   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, date, boolean, decimal, float
+    # Many SQL types are the same as their migration data type name:
+    #   text, integer, bigint, date, boolean, decimal, float
+    # These however are not:
     SQL_TYPES = { 'character varying' => 'string',
                   'character' => 'string', # %%% Need to put in "limit: 1"
                   'xml' => 'text',
@@ -23,15 +25,7 @@ module Brick
                   'smallint' => 'integer' } # %%% Need to put in "limit: 2"
     # (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.'
+    desc 'Auto-generates migration files for an existing database.'
 
     def brick_migrations
       # If Apartment is active, see if a default schema to analyse is indicated
@@ -47,11 +41,14 @@ module Brick
       key_type = (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
-      default_mig_path = (mig_path = ActiveRecord::Migrator.migrations_paths.first || "#{::Rails.root}/db/migrate")
-      if Dir.exist?(mig_path)
+      is_insert_versions = true
+      is_delete_versions = false
+      versions_to_delete_or_append = nil
+      if Dir.exist?(mig_path = ActiveRecord::Migrator.migrations_paths.first || "#{::Rails.root}/db/migrate")
         if Dir["#{mig_path}/**/*.rb"].present?
           puts "WARNING: migrations folder #{mig_path} appears to already have ruby files present."
           mig_path2 = "#{::Rails.root}/tmp/brick_migrations"
+          is_insert_versions = false unless mig_path == mig_path2
           if Dir.exist?(mig_path2)
             if Dir["#{mig_path2}/**/*.rb"].present?
               puts "As well, temporary folder #{mig_path2} also has ruby files present."
@@ -59,10 +56,15 @@ module Brick
               mig_path2 = gets_list(list: ['Cancel operation!', "Append migration files into #{mig_path} anyway", mig_path, mig_path2])
               return if mig_path2.start_with?('Cancel')
 
+              existing_mig_files = Dir["#{mig_path2}/**/*.rb"]
+              if (is_insert_versions = mig_path == mig_path2)
+                versions_to_delete_or_append = existing_mig_files.map { |ver| ver.split('/').last.split('_').first }
+              end
               if mig_path2.start_with?('Append migration files into ')
                 mig_path2 = mig_path
               else
-                Dir["#{mig_path2}/**/*.rb"].each { |rb| File.delete(rb) }
+                is_delete_versions = true
+                existing_mig_files.each { |rb| File.delete(rb) }
               end
             else
               puts "Using temporary folder #{mig_path2} for created migration files.\n\n"
@@ -88,7 +90,9 @@ module Brick
       fks = {}
       stuck = {}
       indexes = {} # Track index names to make sure things are unique
-      versions = [] # Resulting versions to be used when updating the schema_migrations table
+      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
       # 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.)
@@ -113,7 +117,7 @@ module Brick
                         end
           end
           schema = if (tbl_parts = tbl.split('.')).length > 1
-                     if tbl_parts.first == 'public'
+                     if tbl_parts.first == (::Brick.default_schema || 'public')
                        tbl_parts.shift
                        nil
                      else
@@ -123,10 +127,13 @@ module Brick
           # %%% For the moment we're skipping polymorphics
           fkey_cols = relation[:fks].values.select { |assoc| assoc[:is_bt] && !assoc[:polymorphic] }
           mig = +"class Create#{(full_table_name = tbl_parts.join('_')).camelize} < ActiveRecord::Migration#{ar_version}\n"
+          # If the primary key is also used as a foreign key, will need to do  id: false  and then build out
+          # a column definition which includes :primary_key -- %%% also using a data type of bigserial or serial
+          # 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)
-          # also integer / uuid / other non-standard data types for primary key
-          id_option = unless (pkey_col_first = relation[:cols][pkey_cols&.first]&.first) == key_type
-                        unless pkey_cols&.present?
+          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'
                         else
                           case pkey_col_first
@@ -157,21 +164,12 @@ module Brick
           # Refer to this table name as a symbol or dotted string as appropriate
           tbl_code = tbl_parts.length == 1 ? ":#{tbl_parts.first}" : "'#{tbl}'"
           mig << "  def change\n    return unless reverting? || !table_exists?(#{tbl_code})\n\n"
-          mig << "    create_schema :#{schema} unless schema_exists?(:#{schema})\n" if schema
+          mig << "    create_schema :#{schema} unless reverting? || schema_exists?(:#{schema})\n" if schema
           mig << "    create_table #{tbl_code}#{id_option} do |t|\n"
           possible_ts = [] # Track possible generic timestamps
           add_fks = [] # Track foreign keys to add after table creation
           relation[:cols].each do |col, col_type|
-            next if !id_option&.end_with?('id: false') && 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, !col_type[3]]
-              next
-            end
-
-            sql_type ||= col_type.first
+            sql_type = SQL_TYPES[col_type.first] || col_type.first
             suffix = col_type[3] ? +', null: false' : +''
             if !is_4x_rails && klass && (comment = klass.columns_hash.fetch(col, nil)&.comment)&.present?
               suffix << ", comment: #{comment.inspect}"
@@ -201,7 +199,14 @@ module Brick
                 mig << "      t.references :#{fk[:assoc_name]}#{suffix}, foreign_key: { to_table: #{to_table} }\n"
               end
             else
-              mig << emit_column(sql_type, col, suffix)
+              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)
+                possible_ts << [col, !col_type[3]]
+              else
+                mig << emit_column(sql_type, col, suffix)
+              end
             end
           end
           if possible_ts.length == 2 && # Both created_at and updated_at
@@ -212,6 +217,7 @@ module Brick
             possible_ts.each { |ts| emit_column('timestamp', ts.first, nil) }
           end
           mig << "    end\n"
+          mig << "    execute('ALTER TABLE #{tbl} ADD PRIMARY KEY (#{pk_is_also_fk});')\n" if pk_is_also_fk
           add_fks.each do |add_fk|
             is_commented = false
             # add_fk[2] holds the inverse relation
@@ -224,9 +230,13 @@ module Brick
             #                                                            to_table               column
             mig << "    #{'# ' if is_commented}add_foreign_key #{tbl_code}, #{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
           end
+          unless built_schemas.key?(schema)
+            mig << "    drop_schema :#{schema} if reverting? && schema_exists?(:#{schema})\n"
+            built_schemas[schema] = nil
+          end
           mig << "  end\nend\n"
           current_mig_time += 1.minute
-          versions << (version = current_mig_time.strftime('%Y%m%d%H%M00'))
+          versions_to_create << (version = current_mig_time.strftime('%Y%m%d%H%M00')).split('_').first
           File.open("#{mig_path}/#{version}_create_#{full_table_name}.rb", "w") { |f| f.write mig }
         end
         done.concat(fringe)
@@ -250,9 +260,23 @@ module Brick
         }:"
         pp stuck_sorted[0..4]
       else # Successful, and now we can update the schema_migrations table accordingly
-        ActiveRecord::Base.execute_sql("INSERT INTO #{ActiveRecord::Base.schema_migrations_table_name} (version) VALUES #{
-          versions.map { |version| "('#{version}')" }.join(', ')
-        }")
+        unless ActiveRecord::Migration.table_exists?(ActiveRecord::Base.schema_migrations_table_name)
+          ActiveRecord::SchemaMigration.create_table
+        end
+        # Remove to_delete - to_create
+        if ((versions_to_delete_or_append ||= []) - versions_to_create).present? && is_delete_versions
+          ActiveRecord::Base.execute_sql("DELETE FROM #{
+            ActiveRecord::Base.schema_migrations_table_name} WHERE version IN (#{
+            (versions_to_delete_or_append - versions_to_create).map { |vtd| "'#{vtd}'" }.join(', ')}
+          )")
+        end
+        # Add to_create - to_delete
+        if is_insert_versions && ((versions_to_create ||= []) - versions_to_delete_or_append).present?
+          ActiveRecord::Base.execute_sql("INSERT INTO #{
+            ActiveRecord::Base.schema_migrations_table_name} (version) VALUES #{
+            (versions_to_create - versions_to_delete_or_append).map { |vtc| "('#{vtc}')" }.join(', ')
+          }")
+        end
       end
     end
 

metadata

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