brick 1.0.232 → 1.0.233

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec8b0390d538c25946d68d51b1394875a02203694bc2d28928df1fd63987f40f
-  data.tar.gz: de49f7332e2a08a21a22e92cbac5c9668079551de6ba36ff45fd02dcac9102db
+  metadata.gz: 153b8d0a95771a92fad553394bb1dd51633a971e7909b3a32e6cf548dacb2cb9
+  data.tar.gz: '094c6476db206319239def080ffc9349a4e8ec35c915e23a3cf1db3a5d8b425d'
 SHA512:
-  metadata.gz: 7e77492d4d72836a829f9e073eaa14cb1f2c676aefbd053b0466e43b0d0f79141ec661bb38a377391d96711338f9bab5535ee52d51fc90964013ea042219cddc
-  data.tar.gz: '099332256ecadb0948c329dc8a3b06c1b460da5de41e8f183fc5dd937651edd57895b2d3c57399455af5732bab7172e6e88435560cd2d6b1d2e6f42eafefe71d'
+  metadata.gz: 54c76ebb11fead41ed9ae33fee09e2e6e4685aa12c50c073a9da72d1004d08c2065b441d2bf272d06e8aacc2de16401c74636c61f65048d30e6b9d0bd49add8a
+  data.tar.gz: 1c391fa9c4acfbb9ce327d9da410e23ee9c1b183145f1a636ca5be91ac48b369346859432982033f74cf50de99f7d4f9c2011e7111eeefe4830bd76e45d5b931

data/lib/brick/version_number.rb

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

data/lib/generators/brick/airtable_api_caller.rb

@@ -64,11 +64,11 @@ Please provide your Airtable PAT:"
                         else
                           # puts col['type']
                           dt = case col['type']
-                          when 'singleLineText', 'url', 'singleSelect'
+                          when 'singleLineText', 'url', 'email', 'singleSelect'
                             'string'
                           when 'multilineText'
                             'text'
-                          when 'number'
+                          when 'number', 'currency'
                             'decimal'
                           when 'checkbox'
                             'boolean'
@@ -140,7 +140,7 @@ Please provide your Airtable PAT:"
       end
 
       def sane_name(col_name)
-        sane_table_name(col_name.gsub('&', 'and').tr('()?', ''))
+        sane_table_name(col_name.gsub('&', 'and').tr('()?', '').tr('/', '_'))
       end
 
       def sane_table_name(tbl_name)

data/lib/generators/brick/migrations_builder.rb

@@ -183,7 +183,9 @@ module Brick
               #         to_table               column
               mig << "#{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
             end
-            if after_fks.length > 500
+            # If there are LOTS of foreign keys then give extra database maintenance info and initially
+            # disable the final FK migration by using a ".rbx" file extension.
+            fks_extension = if after_fks.length > 500
               minutes = (after_fks.length + 1000) / 1500
               mig << "    if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'\n"
               mig << "      puts 'NOTE:  It could take around #{minutes} #{'minute'.pluralize(minutes)} on a FAST machine for Postgres to do all the final processing for these foreign keys.  Please be patient!'\n"
@@ -194,14 +196,19 @@ module Brick
       execute('VACUUM FULL')
       execute('BEGIN TRANSACTION')
     end\n"
+              'rbx'
+            else
+              'rb'
             end
             mig << +"  end\n"
             current_mig_time[0] += 1.minute
-            versions_to_create << migration_file_write(mig_path, 'create_brick_fks.rbx', current_mig_time, ar_version, mig)
-            puts "Have written out a final migration called 'create_brick_fks.rbx' which creates #{after_fks.length} foreign keys.
-  This file extension (.rbx) will cause it not to run yet when you do a 'rails db:migrate'.
+            versions_to_create << migration_file_write(mig_path, "create_brick_fks.#{fks_extension}", current_mig_time, ar_version, mig)
+            puts "Have written out a final migration called 'create_brick_fks.#{fks_extension}' which creates #{after_fks.length} foreign keys."
+            if fks_extension == 'rbx'
+              puts "  This file extension (.rbx) will cause it not to run yet when you do a 'rails db:migrate'.
   The idea here is to do all data loading first, and then rename that migration file back
   into having a .rb extension, and run a final db:migrate to put the foreign keys in place."
+            end
 
           when 'Create' # Show additional_references entries that can be added into brick.rb
             puts 'Place this block into your brick.rb file:'

data/lib/generators/brick/seeds_builder.rb

@@ -162,14 +162,14 @@ module Brick
                     s[col_name] = obj['fields'][field.first]
                   else # Consider N:M fks
                     hm_fk = relation[:fks].find { |_k, fk1| !fk1[:is_bt] && fk1[:assoc_name] == ::Brick::AirtableApiCaller.sane_name(field.first) }&.last
-                    if (t_table = hm_fk&.fetch(:inverse_table, nil))
-                      associative_fks = relations[hm_fk&.fetch(:inverse_table, nil)][:fks]
+                    if (assoc_table = hm_fk&.fetch(:inverse_table, nil))
+                      associative_fks = relations[assoc_table][:fks]
                       # near_side_fk = associative_fks.find { |_k, fk1| fk1[:is_bt] && fk1[:assoc_name] == ::Brick::AirtableApiCaller.sane_name(field.first) }&.last
                       far_side_fk = associative_fks.find { |_k, fk1| fk1[:is_bt] && fk1[:assoc_name] != ::Brick::AirtableApiCaller.sane_name(field.first) }&.last
                       field.last.each do |nm_rec|
                         # Can trade out:  hm_fk[:fk]  for:  near_side_fk[:inverse_table]
-                        airtable_assoc_recids[t_table] << "#{hm_fk[:fk]}: #{hm_fk[:fk].singularize}_#{nm_rec[3..-1]}, " \
-                                                          "#{far_side_fk[:assoc_name]}: #{far_side_fk[:inverse_table].singularize}_#{obj['id'][3..-1]}"
+                        airtable_assoc_recids[assoc_table] << "#{hm_fk[:fk]}: #{hm_fk[:fk].singularize}_#{nm_rec[3..-1]}, " \
+                                                              "#{far_side_fk[:assoc_name]}: #{far_side_fk[:inverse_table].singularize}_#{obj['id'][3..-1]}"
                       end
                     end
                   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.232
+  version: 1.0.233
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-15 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord