brick 1.0.242 → 1.0.243

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e28a33c378751e44778744e81bd2841b6bdd61d06587860b2a5f9bccccbaa85
-  data.tar.gz: 13f3272c5f8eabac2fb7c9253a1ce499fd2dd208d468b048e60c2542f3456eb9
+  metadata.gz: 00e544ab1972840fa5a6e9c3261fb65ed0591f677ad1cb9c1992dd7447bc3e06
+  data.tar.gz: 54bdcb8c8834736a98b331e494011e798a9d3b5bbd912113a73391a7a8bf3e72
 SHA512:
-  metadata.gz: b7f7c82a56a1097cd710a27f229988949e2327f9de6539302acd05a15ceea61d01b2960d98e9708fa823c24022509258ef2879b41c700822f1d8769c5734792a
-  data.tar.gz: 679dc5f6151313ef1d7bcd9912cbe4770741c5d03a7c3a29a1d139e72f96cdf778d096fffbf2018c80b8148a91310127a184072d0a63f07905c67c157a9d3e55
+  metadata.gz: 51e3caffcc7e19b44ca7dba5ac75454a03a5eba7ee79c862e5288542d6695b47bdbeb1000fcc257e5d251c4b1e84f82420081367ad9b8e06446c699b5fd8bf4f
+  data.tar.gz: 8a184a598c46f8162770a5b91b496cb56fc12d1ccfa6598185922a4a038e47ba3168bba24c8e9ccac764c6625a3bf309a9a5ab5022600ec883579630bbb7fd69

data/lib/brick/rails.rb

@@ -80,7 +80,7 @@ module ::Brick::Rails
       end
     end
 
-    def display_binary(val, max_size = 100_000)
+    def display_binary(val, max_size = 100_000, no_escaped_html = nil)
       return unless val
 
       @image_signatures ||= { (+"\xFF\xD8\xFF\xEE").force_encoding('ASCII-8BIT') => 'jpeg',
@@ -111,7 +111,8 @@ module ::Brick::Rails
          val.length < max_size
         "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
       else
-        "&lt;&nbsp;#{signature ? "#{signature} image" : 'Binary'}, #{val.length} bytes&nbsp;>"
+        descrip = "#{signature ? "#{signature} image" : 'Binary'}, #{val.length} bytes"
+        no_escaped_html ? "< #{descrip} >" : "&lt;&nbsp;#{descrip}&nbsp;>"
       end
     end
 
@@ -222,7 +223,7 @@ erDiagram
         '(hidden)'
       else
         if val.is_a?(String)
-          return ::Brick::Rails.display_binary(val) unless (val_utf8 = val.dup.force_encoding('UTF-8')).valid_encoding?
+          return ::Brick::Rails.display_binary(val, 100_000, is_xml == false) unless (val_utf8 = val.dup.force_encoding('UTF-8')).valid_encoding?
 
           val = val_utf8.strip
           return CGI.escapeHTML(val) if is_xml

data/lib/brick/reflect_tables.rb

@@ -553,7 +553,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
               end
               s[rel.first] = perms
             end
-          else # or there are specific permissions for each resource, so find the matching indexes
+          else # or there are specific permissions for each resource, so find the matching indexes.
             client = Elastic::Transport::Client.new
             ::Brick.elasticsearch_existings.each_with_object({}) do |index, s|
               this_access = access.is_a?(String) ? access : access[index.first] || '' # Look up permissions from above
@@ -625,13 +625,16 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
     end
 
     def ar_tables
-      ar_smtn = if ActiveRecord::Base.respond_to?(:schema_migrations_table_name)
-                  ActiveRecord::Base.schema_migrations_table_name
-                else
-                  'schema_migrations'
-                end
       ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : 'ar_internal_metadata'
-      [ar_smtn, ar_imtn]
+      [self._schema_migrations_table_name, ar_imtn]
+    end
+
+    def _schema_migrations_table_name
+      if ActiveRecord::Base.respond_to?(:schema_migrations_table_name)
+        ActiveRecord::Base.schema_migrations_table_name
+      else
+        'schema_migrations'
+      end
     end
   end
 end

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -150,7 +150,7 @@ module Brick
       when 1
 ".
   # # Here is a possible polymorphic association that has been auto-identified for the #{current_db} database:
-  # Brick.polymorphics = { #{possible_additional_references.first} }"
+  # Brick.polymorphics = { #{possible_polymorphics.first} }"
 
       else
 ".

data/lib/generators/brick/migrations_builder.rb

@@ -248,20 +248,24 @@ module Brick
           }:"
           pp stuck_sorted[0..4]
         elsif do_schema_migrations # Successful, and now we can update the schema_migrations table accordingly
-          unless ActiveRecord::Migration.table_exists?(ActiveRecord::Base.schema_migrations_table_name)
-            ActiveRecord::SchemaMigration.create_table
-          end
-          # Remove to_delete - to_create
-          if ((versions_to_delete_or_append ||= []) - versions_to_create).present? && is_delete_versions
-            ActiveRecord::Base.execute_sql("DELETE FROM #{
-              ActiveRecord::Base.schema_migrations_table_name} WHERE version IN (#{
-              (versions_to_delete_or_append - versions_to_create).map { |vtd| "'#{vtd}'" }.join(', ')}
-            )")
+          smtn = ::Brick._schema_migrations_table_name
+          if ActiveRecord::Migration.table_exists?(smtn)
+            # Remove to_delete - to_create
+            if ((versions_to_delete_or_append ||= []) - versions_to_create).present? && is_delete_versions
+              ActiveRecord::Base.execute_sql("DELETE FROM #{
+                smtn} WHERE version IN (#{
+                (versions_to_delete_or_append - versions_to_create).map { |vtd| "'#{vtd}'" }.join(', ')}
+              )")
+            end
+          else
+            ActiveRecord::Base.connection.create_table(smtn, primary_key: 'version') do |t|
+              t.string :verison
+            end
           end
           # Add to_create - to_delete
-          if is_insert_versions && ((versions_to_create ||= []) - versions_to_delete_or_append).present?
+          if is_insert_versions && (versions_to_delete_or_append ||= []) && ((versions_to_create ||= []) - versions_to_delete_or_append).present?
             ActiveRecord::Base.execute_sql("INSERT INTO #{
-              ActiveRecord::Base.schema_migrations_table_name} (version) VALUES #{
+              smtn} (version) VALUES #{
               (versions_to_create - versions_to_delete_or_append).map { |vtc| "('#{vtc}')" }.join(', ')
             }")
           end

data/lib/generators/brick/seeds_builder.rb

@@ -13,8 +13,8 @@ module Brick
       end
 
       def generate_seeds(relations = nil)
-        if File.exist?(seed_file_path = "#{::Rails.root}/db/seeds.rb")
-          puts "WARNING: seeds file #{seed_file_path} appears to already be present.\nOverwrite?"
+        if File.exist?((seed_file_path = "#{::Rails.root}/db/seed") + 's.rb')
+          puts "WARNING: seeds file #{seed_file_path}s.rb appears to already be present.\nOverwrite?"
           return unless gets_list(list: ['No', 'Yes']) == 'Yes'
 
           puts "\n"
@@ -56,11 +56,15 @@ module Brick
             end
           end
         end
-        seeds = +'# Seeds file for '
+        batch_num = 1
+        seeds_file = File.open("#{seed_file_path}s.rb", 'w')
+        seeds_len = lines_len = 0
+        seeds_file.write('# Seeds file for ')
+        seed_rows = nil
         if (arbc = ActiveRecord::Base.connection).respond_to?(:current_database) # SQLite3 can't do this!
-          seeds << "#{arbc.current_database}:\n"
+          seeds_file.write("#{arbc.current_database}:\n")
         elsif (filename = arbc.instance_variable_get(:@connection_parameters)&.fetch(:database, nil))
-          seeds << "#{filename}:\n"
+          seeds_file.write("#{filename}:\n")
         end
         done = []
         fks = {}
@@ -93,7 +97,6 @@ module Brick
                           end
                         end
               ).present?
-          seeds << "\n"
           unless is_airtable
             # Search through the fringe to see if we should bump special dependent classes forward to the next fringe.
             # (Currently only ActiveStorage::Attachment if there's also an ActiveStorage::VariantRecord in the same
@@ -150,8 +153,11 @@ module Brick
                 ::Brick::AirtableApiCaller.https_get("https://api.airtable.com/v0/#{airtable_table.base_id}/#{airtable_table.id}").fetch('records', nil)
               end
             else
-              klass.order(*pkey_cols)
+              # Must convert to a symbol when doing ORDER BY due to this ActiveRecord nuance:
+              # https://github.com/rails/rails/issues/2601
+              klass.order(*pkey_cols.map(&:to_sym)) unless relation[:pkey].empty?
             end
+            seed_rows = +''
             collection&.each do |obj|
               if is_airtable
                 fields = obj['fields'].each_with_object({}) do |field, s|
@@ -177,11 +183,13 @@ module Brick
               end
               unless has_rows
                 has_rows = true
-                seeds << "  puts 'Seeding: #{klass_name}'\n"
+                seed_rows << "\n  puts 'Seeding: #{klass_name}'\n"
+                puts "Preparing: #{klass_name}  — #{batch_num}"
               end
               is_empty = false
               # For Airtable, take off the "rec___" prefix
               pk_val = is_airtable ? airtable_id[3..-1] : brick_escape(orig_pk_val = obj.attributes_before_type_cast[pkey_cols.first])
+              pk_val = -pk_val if pk_val.is_a?(Numeric) && pk_val < 0
               var_name = "#{tbl.singularize.gsub('.', '__')}_#{pk_val}"
               fk_vals = []
               data = []
@@ -196,8 +204,12 @@ module Brick
                 # Used to be:  obj.send(col)
                 # (and with that it was possible to raise ActiveRecord::Encryption::Errors::Configuration...)
                 #  %%% should test further and see if that is possible with this code!)
-                if (val = obj.attributes_before_type_cast[col]) && (val.is_a?(Time) || val.is_a?(Date))
-                  val = val.to_s
+                if (val = obj.attributes_before_type_cast[col])
+                  if (val.is_a?(Time) || val.is_a?(Date))
+                    val = val.to_s
+                  elsif val.is_a?(Numeric)
+                    val = -val if val < 0
+                  end
                 end
                 if fk
                   fk_val = if is_airtable
@@ -240,12 +252,12 @@ module Brick
                 record_id = data.find { |d| d.start_with?('record_id: ') }[11..-1]
                 data.reject! { |d| d.start_with?('record_id: ') || d.start_with?('created_at: ') || d.start_with?('updated_at: ') }
                 data << "record_id: atrt_ids[[#{record_id}, '#{record_class}']]"
-                seeds << "#{var_name} = #{klass_name}.find_or_create_by(#{(fk_vals + data).join(', ')}) do |asa|
+                seed_rows << "#{var_name} = #{klass_name}.find_or_create_by(#{(fk_vals + data).join(', ')}) do |asa|
   asa.created_at = DateTime.parse('#{obj.created_at.inspect}')#{"
   asa.updated_at = DateTime.parse('#{obj.updated_at.inspect}')" if obj.respond_to?(:updated_at)}
 end\n"
               else
-                seeds << "#{var_name} = #{klass_name}.create(#{(fk_vals + data).join(', ')})\n"
+                seed_rows << "#{var_name} = #{klass_name}.create(#{(fk_vals + data).join(', ')})\n"
                 unless is_airtable
                   klass.attachment_reflections.each do |k, v|
                     if (attached = obj.send(k))
@@ -255,10 +267,24 @@ end\n"
                   end if klass.respond_to?(:attachment_reflections)
                 end
               end
-              updates.each { |update| seeds << update } # Anything that needs patching up after-the-fact
+              updates.each { |update| seed_rows << update } # Anything that needs patching up after-the-fact
+              seeds_file.write(seed_rows)
+              seeds_len += seed_rows.length
+              if (lines_len += 1) > 50000 || # More than 50K rows? ...
+                 seeds_len > 98000000        # ... or 100 megs total? ...
+                # ... then break it into multiple files
+                seeds_file.close
+                if batch_num == 1 # First one?  Then rename file to seedsx_0001.rb
+                  File.rename("#{seed_file_path}s.rb", "#{seed_file_path}x_0001.rb")
+                end
+                seeds_file = File.open("#{seed_file_path}x_#{(batch_num += 1).to_s.rjust(4, '0')}.rb", 'w')
+                puts "=== File #{batch_num} ===\n"
+                seeds_len = lines_len = 0
+              end
+              seed_rows = +''
             end
             unless has_rows || klass_name.nil?
-              seeds << "  # (Skipping #{klass_name} as it has no rows)\n"
+              seeds_file.write("  # (Skipping #{klass_name} as it has no rows)\n")
             end
           end
           done.concat(fringe)
@@ -271,17 +297,28 @@ end\n"
             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"
+          seed_rows << "  if ActiveRecord::Migration.table_exists?('#{table_name}')\n"
+          seed_rows << "    # Duplicate data found in: #{dupes.keys.join(', ')}\n" unless dupes.empty?
+          seed_rows << "    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"
+            seed_rows << "#{table_name.singularize.camelize}.create(#{pair_values})\n"
           end
-          seeds << "  end\n"
+          seed_rows << "  end\n"
           airtable_assocs_done[table_name] = assoc_pairs
         end
+        seeds_file.write(seed_rows) unless seed_rows.blank?
+
+        if batch_num > 1
+          seeds_file.close
+
+          # Create a main seeds file in place of the one that was renamed out
+          File.open("#{seed_file_path}s.rb", 'w') do |main_seeds_file|
+            (1..batch_num).each do |num|
+              main_seeds_file.write("load 'db/seedx_#{num.to_s.rjust(4, '0')}.rb'\n")
+            end
+          end
+        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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.242
+  version: 1.0.243
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-20 00:00:00.000000000 Z
+date: 2026-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord