brick 1.0.57 → 1.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930370b67a72b31db99cc8d50afa80d4c3be0d07e727155eb20ac5a7628bb1bb
-  data.tar.gz: f2d7964c79172a438800b3c69c63e62b26a4984357ca5d6c7ff9e2ef72e5308f
+  metadata.gz: 508d41fa8b75089e0467ece56ab53fc78b651f3951eabe62d108a62fa8b0f35e
+  data.tar.gz: dcd419560d850fb2014aab3076a6a80f5a555320ac2c2183e3381a916d94dbc8
 SHA512:
-  metadata.gz: 03e7ba018c426517060aa6312d14a9f1e0877d82b376782ea46b4b1506433bbe3e9e4d2c3d88aaf3d5fb356c68a129fd975b1718d7b2ac826b241efab3f2cee6
-  data.tar.gz: 645c6b750dd870180e312ffddff1d199bb84e92cdde0309f253ec8c927f3ba5304b84ae95b066c260d0523048c607b28148d1b577a479ec661b94de05248813a
+  metadata.gz: 49c90c7fbb1845e151f91b9df7f3b639d587e6239dae5e7f31306807a2b4dc7ac83436d78d46839accfea7c614fd2a94f2460443ea3daae424d280fae17cac77
+  data.tar.gz: 7dd02fd9ab902cfe6359b6be95101ec3a89c47d8b7bc71692ab4537f5ffeb3a24a4ee73063fc10b3d4197ce59fd5c94380f7534f66647d8c03dd512c6ef0c334

data/lib/brick/version_number.rb

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

data/lib/generators/brick/migrations_generator.rb

@@ -84,8 +84,14 @@ module Brick
 
       # 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|
+        schema = if v.split('.').length > 1
+                   v.first
+                 end
+        s[schema] = nil if schema && [::Brick.default_schema, 'public'].exclude?(schema)
+      end
       # Start the timestamps back the same number of minutes from now as expected number of migrations to create
-      current_mig_time = Time.now - chosen.length.minutes
+      current_mig_time = Time.now - (schemas.length + chosen.length).minutes
       done = []
       fks = {}
       stuck = {}
@@ -124,9 +130,14 @@ module Brick
                        tbl_parts.first
                      end
                    end
+          unless built_schemas.key?(schema)
+            mig = +"  def change\n    create_schema(:#{schema}) unless schema_exists?(:#{schema})\n  end\n"
+            migration_file_write(mig_path, "create_db_schema_#{schema}", current_mig_time += 1.minute, ar_version, mig)
+            built_schemas[schema] = nil
+          end
+
           # %%% 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.
@@ -163,8 +174,7 @@ module Brick
           end
           # 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 reverting? || schema_exists?(:#{schema})\n" if schema
+          mig = +"  def change\n    return unless reverting? || !table_exists?(#{tbl_code})\n\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
@@ -217,7 +227,11 @@ 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
+          if pk_is_also_fk
+            mig << "    reversible do |dir|\n"
+            mig << "      dir.up { execute('ALTER TABLE #{tbl} ADD PRIMARY KEY (#{pk_is_also_fk})') }\n"
+            mig << "    end\n"
+          end
           add_fks.each do |add_fk|
             is_commented = false
             # add_fk[2] holds the inverse relation
@@ -227,21 +241,16 @@ module Brick
               # No official PK, but if coincidentally there's a column of the same name, take a chance on it
               pk = (add_fk[2][:cols].key?(add_fk[1]) && add_fk[1]) || '???'
             end
-            #                                                            to_table               column
+            #                                                                 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_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 }
+          mig << "  end\n"
+          versions_to_create << migration_file_write(mig_path, "create_#{tbl_parts.join('_')}", current_mig_time += 1.minute, ar_version, 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|
@@ -285,5 +294,14 @@ module Brick
     def emit_column(type, name, suffix)
       "      t.#{type.start_with?('numeric') ? 'decimal' : type} :#{name}#{suffix}\n"
     end
+
+    def migration_file_write(mig_path, name, current_mig_time, ar_version, mig)
+      File.open("#{mig_path}/#{version = current_mig_time.strftime('%Y%m%d%H%M00')}_#{name}.rb", "w") do |f|
+        f.write "class #{name.camelize} < ActiveRecord::Migration#{ar_version}\n"
+        f.write mig
+        f.write "end\n"
+      end
+      version
+    end
   end
 end

metadata

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