brick 1.0.221 → 1.0.222

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4aaaeaadb65aad58b8eac139c9e0fa5c8a68995a15151149fdc49196563db7e
-  data.tar.gz: f2ad0ef65556495ac9d531e499ca8b38a532aab641d0e46aeca4ea5fc535efd0
+  metadata.gz: b3e0a0e804ed376999842c2f8f31ba5b2db0ca019bce0e94b6b85b5869256667
+  data.tar.gz: 27cea38b19cec28e95515256aafd2e4a7fb1a220d3147d1123edd2ac74aa45b3
 SHA512:
-  metadata.gz: 0f09da443c9427e5dd0b442f626bfbeb23011bceec74e6a9a9d52d28506f823e8d4d3fcf9cfdeb2af6a4b67f3b41552b09a23df18469831b2844a718adcee1a7
-  data.tar.gz: 07ed1b5a35404a584c79b7c9002159832a4a5ccacc5db330ee41b7ec7ed49a2011eee27c921e5db4cb2f887e33cfbf3ef97a0f66fab5b765a2168ba350ac1c39
+  metadata.gz: 4de80d5d689bb00369190f4b02093f56320309e6de856ed1e69ca570996e73987d6c27bbe3cfd124fae9ec274a19411d3935900c16e1d81e19cd40542f3714da
+  data.tar.gz: 453ac262c8314586ec6b1f68051871288659d4efffdbc442880efdae06ab435637508f7667e7dea93d543bbe82b291523d36fc2bfd67f801852c5416db8acdf6

data/lib/brick/config.rb

@@ -482,6 +482,14 @@ module Brick
       @mutex.synchronize { @ignore_migration_fks = relations }
     end
 
+    def salesforce_mode
+      @mutex.synchronize { @salesforce_mode }
+    end
+
+    def salesforce_mode=(true_or_false)
+      @mutex.synchronize { @salesforce_mode = true_or_false }
+    end
+
     # Add search page for general Elasticsearch / Opensearch querying
     def add_search
       true

data/lib/brick/extensions.rb

@@ -192,7 +192,7 @@ module ActiveRecord
         # If there's no DSL yet specified, just try to find the first usable column on this model
         unless (dsl = ::Brick.config.model_descrips[name])
           skip_columns = _brick_get_fks + (::Brick.config.metadata_columns || []) + [primary_key]
-          dsl = if (descrip_col = columns.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
+          dsl = if table_exists? && (descrip_col = columns.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
                   "[#{descrip_col.name}]"
                 else
                   "#{name} ##{_pk_as_array.map { |pk_part| "[#{pk_part}]" }.join(', ')}"
@@ -383,7 +383,7 @@ module ActiveRecord
 
     # Providing a relation object allows auto-modules built from table name prefixes to work
     def self._brick_index(mode = nil, separator = nil, relation = nil, not_path = nil)
-      return if abstract_class?
+      return if abstract_class? || !table_exists?
 
       ::Brick._brick_index(table_name, mode, separator, relation, not_path)
     end
@@ -467,7 +467,7 @@ module ActiveRecord
       end
       skip_klass_hms = ::Brick.config.skip_index_hms[self.name] || {}
       hms.each do |k, hm|
-        next if skip_klass_hms.key?(k)
+        next if skip_klass_hms.key?(k) || !hm.klass.table_exists?
 
         if hm.macro == :has_one
           # For our purposes a :has_one is similar enough to a :belongs_to that we can just join forces

data/lib/brick/rails/form_tags.rb

@@ -69,7 +69,7 @@ module Brick::Rails::FormTags
                options[col[1].inheritance_column] = col[1].name unless col[1] == col[1].base_class
                x_order = " x-order=\"#{col_name}\"" if true
                s << "#{x_order}>#{col[2]} "
-               s << (col.first ? col[3].to_s : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
+               s << ((col.first || !col[1].table_exists?) ? col[3].to_s : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
              elsif cust_cols.key?(col_name) # Custom column
                x_order = " x-order=\"#{col_name}\"" if true
                s << "#{x_order}>#{col_name}"

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -299,7 +299,7 @@ module Brick
             end
           else
             this_fks = (this_fk = a.foreign_key).is_a?(Array) ? this_fk.uniq : [this_fk.to_s]
-            if !a.options.key?(:as) && (this_fks - a.klass.column_names).length.positive?
+            if !a.options.key?(:as) && a.klass.table_exists? && (this_fks - a.klass.column_names).length.positive?
               options = ", #{a.options.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(', ')}" if a.options.present?
               puts "WARNING:  Model #{model.name} has this association:
             has_many :#{a.name}#{options}

data/lib/generators/brick/install_generator.rb

@@ -119,15 +119,18 @@ module Brick
         end
         resembles_fks = resembles_fks.values.flatten
 
+        # Brick additional references
+        # Used to have:  ActiveRecord::Base.connection.current_database  -- but this doesn't work with SQLite3Adapter
+        current_db = ActiveRecord::Base.connection&.instance_variable_get(:@config)&.fetch(:database, nil)
         bar = case (possible_additional_references = possible_additional_references.values.flatten).length
               when 0
 +"  # Brick.additional_references = [['orders', 'customer_id', 'customer'],
   #                                ['customer', 'region_id', 'regions']]"
               when 1
-+"  # # Here is a possible additional reference that has been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
++"  # # Here is a possible additional reference that has been auto-identified for the #{current_db} database:
   # Brick.additional_references = [#{possible_additional_references.first}]"
               else
-+"  # # Here are possible additional references that have been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
++"  # # Here are possible additional references that have been auto-identified for the #{current_db} database:
   # Brick.additional_references = [
   #   #{possible_additional_references.join(",\n  #   ")}
   # ]"
@@ -146,12 +149,12 @@ module Brick
   #                      }"
       when 1
 ".
-  # # Here is a possible polymorphic association that has been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
+  # # Here is a possible polymorphic association that has been auto-identified for the #{current_db} database:
   # Brick.polymorphics = { #{possible_additional_references.first} }"
 
       else
 ".
-  # # Here are possible polymorphic associations that have been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
+  # # Here are possible polymorphic associations that have been auto-identified for the #{current_db} database:
   # Brick.polymorphics = {
   #   #{possible_polymorphics.join(",\n  #   ")}
   # }"
@@ -395,6 +398,19 @@ if ActiveRecord::Base.respond_to?(:brick_select) && !::Brick.initializer_loaded
   # Brick.default_route_fallback = 'customers'
   # Brick.default_route_fallback = 'orders#outstanding' # Example of a non-RESTful route
   # Brick.default_route_fallback = '' # Omits setting a default route in the absence of any other
+
+  # # GENERATORS
+  # # ==========
+
+  # # MIGRATIONS
+
+  # # Salesforce has table names which use multiple underscores in a row, more than two at a time.  This can greatly
+  # # confuse some of the other underscore support put into place for Oracle table names which can have up to two
+  # # underscores at a time.
+  # #
+  # # Setting this +true+ turns on \"salesforce mode\" which means that auto-created migrations will convert
+  # # underscores in filenames and class names to the letter 'x' in order to keep the peace.
+  # Brick.config.salesforce_mode = true
 end
 ")
       end

data/lib/generators/brick/migration_builder.rb

@@ -109,6 +109,7 @@ module Brick
             s[v_parts.first] = nil unless [::Brick.default_schema, 'public'].include?(v_parts.first)
           end
         end
+        separator = ::Brick.config.salesforce_mode ? 'x' : nil
         # Start the timestamps back the same number of minutes from now as expected number of migrations to create
         current_mig_time = [Time.now - (schemas.length + chosen.length).minutes]
         done = []
@@ -146,7 +147,7 @@ module Brick
                                         key_type, is_4x_rails, ar_version, do_fks_last, versions_to_create)
             after_fks.concat(add_fks) if do_fks_last
             current_mig_time[0] += 1.minute
-            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time, ar_version, mig)
+            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, separator)}", current_mig_time, ar_version, mig)
           end
           done.concat(fringe)
           chosen -= done
@@ -159,7 +160,7 @@ module Brick
                                         key_type, is_4x_rails, ar_version, do_fks_last, versions_to_create)
             after_fks.concat(add_fks)
             current_mig_time[0] += 1.minute
-            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, :migration, 'x')}", current_mig_time, ar_version, mig)
+            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, :migration, separator)}", current_mig_time, ar_version, mig)
           end
           done.concat(chosen)
           chosen.clear

data/lib/generators/brick/seeds_generator.rb

@@ -199,7 +199,7 @@ end\n"
                   ensure_has_atrts(updates)
                   updates << "atrt_ids[[#{obj.id}, '#{klass.name}']] = #{var_name}.id\n"
                 end
-              end
+              end if klass.respond_to?(:attachment_reflections)
             end
             updates.each { |update| seeds << update } # Anything that needs patching up after-the-fact
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.221
+  version: 1.0.222
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone