brick 1.0.233 → 1.0.235

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153b8d0a95771a92fad553394bb1dd51633a971e7909b3a32e6cf548dacb2cb9
-  data.tar.gz: '094c6476db206319239def080ffc9349a4e8ec35c915e23a3cf1db3a5d8b425d'
+  metadata.gz: dbee410a881406dbcec60714bf2688d0cbc4aef0c89a68888ce9f2401e0005dd
+  data.tar.gz: b1a06757052b4130080b6a8762b1d7f8522f551956850bb8c2fe6655260380eb
 SHA512:
-  metadata.gz: 54c76ebb11fead41ed9ae33fee09e2e6e4685aa12c50c073a9da72d1004d08c2065b441d2bf272d06e8aacc2de16401c74636c61f65048d30e6b9d0bd49add8a
-  data.tar.gz: 1c391fa9c4acfbb9ce327d9da410e23ee9c1b183145f1a636ca5be91ac48b369346859432982033f74cf50de99f7d4f9c2011e7111eeefe4830bd76e45d5b931
+  metadata.gz: 2eca4cb00874a367159483ac23a6a03d273d5b5bd54913272f99a7ffefc26e2bbaced2a52b9df624320912e9b70445a432dd4694e5ccc673cb60187633e87d91
+  data.tar.gz: 381d498e42a473cf92cd556b843c59eb08618b0c8f2e61808689a4f1b4c2d5a0e0078d171d64b055cedca78d81bf5fbcfa73eff5268ca3d9d56076ec1c505299

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 = 233
+    TINY = 235
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/generators/brick/seeds_builder.rb

@@ -70,7 +70,7 @@ module Brick
         indexes = {} # Track index names to make sure things are unique
         ar_base = Object.const_defined?(:ApplicationRecord) ? ApplicationRecord : Class.new(ActiveRecord::Base)
         atrt_idx = 0    # ActionText::RichText unique index number
-        airtable_assoc_recids = Hash.new { |h, k| h[k] = [] }
+        airtable_assoc_recids = Hash.new { |h, k| h[k] = {} }
         @has_atrts = nil # Any ActionText::RichText present?
         # Start by making entries for fringe models (those with no foreign keys).
         # Continue layer by layer, creating entries for models that reference ones already done, until
@@ -168,8 +168,9 @@ module Brick
                       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[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]}"
+                        airtable_assoc_recids[assoc_table][[nm_rec[3..-1], obj['id'][3..-1]].sort.join] =
+                          "#{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 +184,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 +193,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 +203,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,21 +260,34 @@ 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
         end
-        airtable_assoc_recids.each do |k, v| # N:M links
-          v.each do |link|
-            seeds << "#{k.singularize.camelize}.create(#{link})\n"
+        airtable_assocs_done = {}
+        airtable_assoc_recids.each do |table_name, assoc_pairs| # N:M links
+          # Make note of any other tables which have exactly duplicated data
+          dupes = airtable_assocs_done.select do |dupe_table, dupe_pairs|
+            dupe_table != table_name && assoc_pairs.length > 0 && assoc_pairs.length == dupe_pairs.length &&
+            dupe_pairs.all? { |pair_name, _v3| assoc_pairs.keys.include?(pair_name) }
+          end
+          seeds << "  if ActiveRecord::Migration.table_exists?('#{table_name}')\n"
+          seeds << "    # Duplicate data found in: #{dupes.keys.join(', ')}\n" unless dupes.empty?
+          seeds << "    puts 'Seeding Airtable associations for #{table_name.camelize.singularize}'\n"
+          assoc_pairs.each do |_k2, pair_values|
+            seeds << "#{table_name.singularize.camelize}.create(#{pair_values})\n"
           end
+          seeds << "  end\n"
+          airtable_assocs_done[table_name] = assoc_pairs
         end
 
         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 +310,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.233
+  version: 1.0.235
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord