brick 1.0.232 → 1.0.234

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec8b0390d538c25946d68d51b1394875a02203694bc2d28928df1fd63987f40f
-  data.tar.gz: de49f7332e2a08a21a22e92cbac5c9668079551de6ba36ff45fd02dcac9102db
+  metadata.gz: de2c4e94eca5667096154e57b49fc68273d85d5aa4f3830d68781f742204aa4c
+  data.tar.gz: 181c532f44cea33088556c7a1c54525898209335fde70d4328faeb09cf55bd54
 SHA512:
-  metadata.gz: 7e77492d4d72836a829f9e073eaa14cb1f2c676aefbd053b0466e43b0d0f79141ec661bb38a377391d96711338f9bab5535ee52d51fc90964013ea042219cddc
-  data.tar.gz: '099332256ecadb0948c329dc8a3b06c1b460da5de41e8f183fc5dd937651edd57895b2d3c57399455af5732bab7172e6e88435560cd2d6b1d2e6f42eafefe71d'
+  metadata.gz: dafe49d283394fc7d411241662a3910266fb98e82679c3ac6aa575b88f6f640908dced9e62ccf077544c2a9732a43b6bc0691a20f83f44d4caa8d9621884dd63
+  data.tar.gz: 37db140de791a556266a43bd3ee4040d412e0436ffac0e6bf5fb5a11108f3030226c59710b801237176c935963418ea2cd9f1de2e4a6c3beb76dc3138640500e

data/lib/brick/extensions.rb

@@ -2521,6 +2521,7 @@ class Object
             end
             ar_select = ar_relation.respond_to?(:_select!) ? ar_relation.dup._select!(*selects, *counts) : ar_relation.select(selects + counts)
             instance_variable_set("@#{plural_table_name}".to_sym, ar_select)
+            @_lookup_context.instance_variable_set(:@_brick_is_postgres, true) if is_postgres
             table_name_no_schema = singular_table_name.pluralize
             if namespace && (idx = lookup_context.prefixes.index(table_name_no_schema))
               lookup_context.prefixes[idx] = "#{namespace.name.underscore}/#{lookup_context.prefixes[idx]}"
@@ -2665,6 +2666,7 @@ class Object
               @_lookup_context.instance_variable_set(:@_brick_model, real_model)
               if created_obj.errors.empty?
                 instance_variable_set("@#{singular_table_name}".to_sym, created_obj)
+                @_lookup_context.instance_variable_set(:@_brick_is_postgres, true) if is_postgres
                 index
                 render :index
               else # Surface errors to the user in a flash message

data/lib/brick/rails/engine.rb

@@ -745,8 +745,10 @@ window.addEventListener(\"popstate\", linkSchemas);
                       hm_entry << if hm_assoc.macro == :has_one
                                     'nil'
                                   else # :has_many or :has_and_belongs_to_many
+                                    b_r_name = "b_r_#{assoc_name}_ct"
                                     # Postgres column names are limited to 63 characters
-                                    "'" + "b_r_#{assoc_name}_ct"[0..62] + "'"
+                                    b_r_name = b_r_name[0..62] if @_brick_is_postgres
+                                    "'#{b_r_name}'"
                                   end
                       hm_entry << ", #{path_keys(hm_assoc, hm_fk_name, pk).inspect}]"
                       hms_columns << hm_entry

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 232
+    TINY = 234
 
     # 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
@@ -183,7 +183,7 @@ module Brick
               end
               is_empty = false
               # For Airtable, take off the "rec___" prefix
-              pk_val = is_airtable ? airtable_id[3..-1] : brick_escape(obj.attributes_before_type_cast[pkey_cols.first])
+              pk_val = is_airtable ? airtable_id[3..-1] : brick_escape(orig_pk_val = obj.attributes_before_type_cast[pkey_cols.first])
               var_name = "#{tbl.singularize.gsub('.', '__')}_#{pk_val}"
               fk_vals = []
               data = []
@@ -192,8 +192,8 @@ module Brick
                 # Skip primary key columns, unless they are part of a foreign key.
                 # (But always add all columns if it's Airtable!)
                 next if !(fk = fkeys.find { |assoc| col == assoc[:fk] }) &&
-                        pkey_cols.include?(col) &&
-                        !is_airtable
+                        !is_airtable &&
+                        pkey_cols.include?(col) && orig_pk_val.is_a?(Integer)
 
                 # Used to be:  obj.send(col)
                 # (and with that it was possible to raise ActiveRecord::Encryption::Errors::Configuration...)
@@ -202,16 +202,13 @@ module Brick
                   val = val.to_s
                 end
                 if fk
-                  inv_tbl = fk[:inverse_table].gsub('.', '__')
                   fk_val = if is_airtable
-                    inv_tbl = inv_tbl.singularize
-                    # Used to be:  fk[:airtable_col]
-                    # Take off the "rec___" prefix
-                    obj.attributes_before_type_cast[fk[:assoc_name]]&.first&.[](3..-1)
+                    # The (3..-1) is to take off the "rec___" prefix
+                    obj.attributes_before_type_cast[fk[:assoc_name]]&.first&.[](3..-1) if is_airtable
                   else
                     brick_escape(val)
                   end
-                  fk_vals << "#{fk[:assoc_name]}: #{inv_tbl}_#{fk_val}" if fk_val
+                  fk_vals << "#{fk[:assoc_name]}: #{fk[:inverse_table].singularize.gsub('.', '__')}_#{fk_val}" if fk_val
                 else
                   val = case val.class.name
                         when 'ActiveStorage::Filename'
@@ -262,7 +259,9 @@ end\n"
               end
               updates.each { |update| seeds << update } # Anything that needs patching up after-the-fact
             end
-            seeds << "  # (Skipping #{klass_name} as it has no rows)\n" unless has_rows
+            unless has_rows || klass_name.nil?
+              seeds << "  # (Skipping #{klass_name} as it has no rows)\n"
+            end
           end
           done.concat(fringe)
           chosen -= done
@@ -276,7 +275,7 @@ end\n"
         File.open(seed_file_path, "w") { |f| f.write seeds }
         stuck_counts = Hash.new { |h, k| h[k] = 0 }
         chosen.each do |leftover|
-          puts "Can't do #{leftover.klass_name} because:\n  #{stuck[leftover.table_name].map do |snag|
+          puts "Can't do #{leftover.klass.name} because:\n  #{stuck[leftover.table_name].map do |snag|
             stuck_counts[snag.last[:inverse_table]] += 1
             snag.last[:assoc_name]
           end.join(', ')}"
@@ -299,8 +298,8 @@ end\n"
         when String
           ret = +''
           val.each_char do |ch|
-            if ch < '0' || (ch > '9' && ch < 'A') || ch > 'Z'
-              ret << (ch == '_' ? ch : "x#{'K'.unpack('H*')[0]}")
+            if ch < '0' || (ch > '9' && ch < 'A') || (ch > 'Z' && ch < 'a') || ch == 'x' || ch > 'z'
+              ret << (ch == '_' ? ch : "x#{ch.unpack('H*')[0]}")
             else
               ret << ch
             end

metadata

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