brick 1.0.55 → 1.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 430a2dfa5ef0caee9b99bc341ccd42a9d29e8f1d54071284aa2469e1baa0c659
-  data.tar.gz: b36e18de169bd9032e6c383548ec30cce06eeb97a35e8c3e4f4da935aff8f603
+  metadata.gz: b696c53c9d9d359d49de147b06b5342820ca230451c860d097f44bcae3b23bb0
+  data.tar.gz: 7b0f6ff365f918a97d64305eabf70fcfe78cf764514ca22b3731b780da04b22c
 SHA512:
-  metadata.gz: c51491575b9ee56c3789619bfc74a2d9c0525750687224e94e120cbae42fad8db1abda9d82978115d9266c55fa0c6f914ce273a3613915657d8a0cf4e7fe6aeb
-  data.tar.gz: a0646cfdc9a2c844fd1149968d0175346c48835c6245d7fe92d0126d60708cf76514704e29dc3f506d2e06e546c8c995bf7103d6ef42be481bb931b4d2bfa73f
+  metadata.gz: 43ab6db28554fb7502d0f03267d2f5bab27d310fb988701d371232f6604090cd679767a12097a7c217401b05e938c787844ae11138a2c8143c1e675b93599656
+  data.tar.gz: 8d2e592ba27bba30e100ea23a2bf951d6f3861c422ef355bad7cd38e146c20c2cf53380aa7ee440f40aa2d111c7f33eadc8dc09f73d1689432fff071e04228c4

data/lib/brick/version_number.rb

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

data/lib/generators/brick/migrations_generator.rb

@@ -87,6 +87,8 @@ module Brick
       done = []
       fks = {}
       stuck = {}
+      indexes = {} # Track index names to make sure things are unique
+      versions = [] # 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.)
@@ -134,14 +136,29 @@ module Brick
                             ', 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}" : '')
+                          end +
+                            (pkey_cols.first ? ", primary_key: :#{pkey_cols.first}" : '') +
+                            (!is_4x_rails && (comment = relation&.fetch(:description, nil))&.present? ? ", comment: #{comment.inspect}" : '')
                         end
                       end
+          # Find the ActiveRecord class in order to see if the columns have comments
+          unless is_4x_rails
+            klass = begin
+                      tbl.tr('.', '/').singularize.camelize.constantize
+                    rescue StandardError
+                    end
+            if klass
+              unless ActiveRecord::Migration.table_exists?(klass.table_name)
+                puts "WARNING: Unable to locate table #{klass.table_name} (for #{klass.name})."
+                klass = nil
+              end
+            end
+          end
           # Refer to this table name as a symbol or dotted string as appropriate
-          tbl = tbl_parts.length == 1 ? ":#{tbl_parts.first}" : "'#{tbl}'"
-          mig << "  def change\n    return unless reverting? || !table_exists?(#{tbl})\n\n"
+          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_table #{tbl}#{id_option} do |t|\n"
+          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|
@@ -156,6 +173,9 @@ module Brick
 
             sql_type ||= 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}"
+            end
             # Determine if this column is used as part of a foreign key
             if fk = fkey_cols.find { |assoc| col == assoc[:fk] }
               to_table = fk[:inverse_table].split('.')
@@ -166,6 +186,18 @@ module Brick
                 add_fks << [to_table, column, ::Brick.relations[fk[:inverse_table]]]
               else
                 suffix << ", type: :#{sql_type}" unless sql_type == key_type
+                # Will the resulting default index name be longer than what Postgres allows?  (63 characters)
+                if (idx_name = ActiveRecord::Base.connection.index_name(tbl, {column: col})).length > 63
+                  # Try to find a shorter name that hasn't been used yet
+                  unless indexes.key?(shorter = idx_name[0..62]) ||
+                         indexes.key?(shorter = idx_name.tr('_', '')[0..62]) ||
+                         indexes.key?(shorter = idx_name.tr('aeio', '')[0..62])
+                    puts "Unable to easily find unique name for index #{idx_name} that is shorter than 64 characters,"
+                    puts "so have resorted to this GUID-based identifier: #{shorter = "#{tbl[0..25]}_#{::SecureRandom.uuid}"}."
+                  end
+                  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"
               end
             else
@@ -190,11 +222,12 @@ module Brick
               pk = (add_fk[2][:cols].key?(add_fk[1]) && add_fk[1]) || '???'
             end
             #                                                            to_table               column
-            mig << "    #{'# ' if is_commented}add_foreign_key #{tbl}, #{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
+            mig << "    #{'# ' if is_commented}add_foreign_key #{tbl_code}, #{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
           end
           mig << "  end\nend\n"
           current_mig_time += 1.minute
-          File.open("#{mig_path}/#{current_mig_time.strftime('%Y%m%d%H%M00')}_create_#{full_table_name}.rb", "w") { |f| f.write mig }
+          versions << (version = current_mig_time.strftime('%Y%m%d%H%M00'))
+          File.open("#{mig_path}/#{version}_create_#{full_table_name}.rb", "w") { |f| f.write mig }
         end
         done.concat(fringe)
         chosen -= done
@@ -209,13 +242,17 @@ module Brick
       if mig_path.start_with?(cur_path = ::Rails.root.to_s)
         pretty_mig_path = mig_path[cur_path.length..-1]
       end
-      puts "*** Created #{done.length} migration files under #{pretty_mig_path || mig_path} ***"
+      puts "\n*** 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]
+      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(', ')
+        }")
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.55
+  version: 1.0.56
 platform: ruby
 authors:
 - Lorin Thwaits