brick 1.0.198 → 1.0.200

data/lib/generators/brick/migration_builder.rb

@@ -141,7 +141,7 @@ module Brick
                           end
                         end).present?
           fringe.each do |tbl|
-            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []),
+            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []), built_schemas, mig_path, current_mig_time,
                                         key_type, is_4x_rails, ar_version, do_fks_last)
             after_fks.concat(add_fks) if do_fks_last
             versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time += 1.minute, ar_version, mig)
@@ -153,7 +153,7 @@ module Brick
         if do_fks_last
           # Write out any more tables that haven't been done yet
           chosen.each do |tbl|
-            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []),
+            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []), built_schemas, mig_path, current_mig_time,
                                         key_type, is_4x_rails, ar_version, do_fks_last)
             after_fks.concat(add_fks)
             migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time += 1.minute, ar_version, mig)
@@ -204,8 +204,11 @@ 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
-              #          from_table    column        to_table
-              puts "    [#{add_fk[3].to_s.inspect}, #{add_fk[1].inspect}, #{add_fk[0].to_s.inspect}]"
+              from_table = add_fk[3]
+              from_table = "'#{from_table[1..-1]}'" if from_table[0] == ':'
+              to_table = add_fk[0]
+              to_table = "'#{to_table[1..-1]}'" if to_table[0] == ':'
+              puts "    [#{from_table}, #{add_fk[1].inspect}, #{to_table}],"
             end
             puts '  ]'
           end
@@ -251,7 +254,7 @@ module Brick
 
     private
 
-      def gen_migration_columns(relations, tbl, tbl_parts, add_fks,
+      def gen_migration_columns(relations, tbl, tbl_parts, add_fks, built_schemas, mig_path, current_mig_time,
                                 key_type, is_4x_rails, ar_version, do_fks_last)
         return unless (relation = relations.fetch(tbl, nil))&.fetch(:cols, nil)&.present?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.198
+  version: 1.0.200
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -248,6 +248,7 @@ files:
 - lib/brick/frameworks/rails/form_tags.rb
 - lib/brick/frameworks/rspec.rb
 - lib/brick/join_array.rb
+- lib/brick/reflect_tables.rb
 - lib/brick/route_mapper.rb
 - lib/brick/serializers/json.rb
 - lib/brick/serializers/yaml.rb