brick 1.0.197 → 1.0.199

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd8798f339e1bb363ca73f7b3285cdb32471cbae2c6ff5a500b43db6536840a
-  data.tar.gz: be5744fd98d6323ecb33be2b77f50e9ee5b872bc8356ef4d08372cddab4d9920
+  metadata.gz: 45f0082e1fac37af74b7ee802123ba84b8f670596fbd6f47c704ce6e660a6a2e
+  data.tar.gz: aad9255dbb59fda237d733508268f817666158984633b5e2965ed2fcfa909d9b
 SHA512:
-  metadata.gz: 8848e2c6a93a75f454b0b9ebd4712769c39868583fc6d6659548c6eb3818eec12bfb7968580a4c684eab67095fca754553a42bc4b71729b223f79882731ebfd3
-  data.tar.gz: b764da2f667e22e5d02e6f5354e3b4b30164827c5b40647b7fca672038f7435ebe14f32dc22d05c54375a29e94c68d82b61dc590099f9e26f2b4843092861bed
+  metadata.gz: f1ec256df47b3091bf23ad128ae74e3e3baef71052fc6353fa24fefe2744bf8d28bf8ba1aea595c583049745c7addf26a5cbd992b91406a5b457a4e6e6a4e2e7
+  data.tar.gz: e6c9cc621f4cd184be0da3c924b3e529f2964b1125c518aeb93f9c1fd1a7e55c94ab278d1573522a01f5b9f5969c044685659f2ffb4656dce0fd001df759990d

data/lib/brick/extensions.rb

@@ -438,7 +438,7 @@ module ActiveRecord
                    when String
                      ord_expr = _br_quoted_name(ord_part.gsub('^^^', table_name))
                      s << Arel.sql(ord_expr)
-                     order_by_txt&.<<(ord_expr.index('.') ? "Arel.sql(#{ord_expr.inspect})" : ord_expr)
+                     order_by_txt&.<<(ord_expr.index('.') ? "Arel.sql(#{ord_expr.inspect})" : ord_part.inspect)
                    else # Expecting only Symbol
                      ord_part = ord_part.to_s
                      if ord_part[0] == '-' # First char '-' means descending order
@@ -3050,8 +3050,8 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         colliding_thing ||= klass
       end
       v[:class_name] = proposed_name_parts.join('::')
-      # Was:  v[:resource] = v[:class_name].underscore.tr('/', '.').pluralize
-      v[:resource] = proposed_name_parts.last.underscore.pluralize
+      # Was:  v[:resource] = v[:class_name].underscore.tr('/', '.')
+      v[:resource] = proposed_name_parts.last.underscore
       if colliding_thing
         message_start = if colliding_thing.is_a?(Module) && Object.const_defined?(:Rails) &&
                            colliding_thing.constants.find { |c| colliding_thing.const_get(c) < Rails::Application }
@@ -3470,11 +3470,11 @@ module Brick
       res_name << '.' if res_name
       (res_name ||= +'') << (relation ||= ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
 
-      res_parts = ((mode == :singular) ? tbl_name.singularize : tbl_name).split('.')
+      res_parts = ((mode == :singular) ? res_name.singularize : res_name).split('.')
       res_parts.shift if ::Brick.apartment_multitenant && res_parts.length > 1 && res_parts.first == ::Brick.apartment_default_tenant
-      if (aps = relation&.fetch(:auto_prefixed_schema, nil)) && res_parts.last.start_with?(aps)
-        last_part = res_parts.last[aps.length..-1]
+      if (aps = relation&.fetch(:auto_prefixed_schema, nil)) # && res_parts.last.start_with?(aps)
         aps = aps[0..-2] if aps[-1] == '_'
+        last_part = res_parts.last # [aps.length..-1]
         res_parts[-1] = aps
         res_parts << last_part
       end

data/lib/brick/frameworks/rails/engine.rb

@@ -788,13 +788,6 @@ window.addEventListener(\"popstate\", linkSchemas);
                                 next if rel.first.blank? || rel.last[:cols].empty? ||
                                         ::Brick.config.exclude_tables.include?(rel.first)
 
-                                tbl_parts = rel.first.split('.')
-                                if (aps = rel.last.fetch(:auto_prefixed_schema, nil))
-                                  tbl_parts << tbl_parts.last[aps.length..-1]
-                                  aps = aps[0..-2] if aps[-1] == '_'
-                                  tbl_parts[-2] = aps
-                                end
-                                tbl_parts.shift if tbl_parts.first == apartment_default_schema
                                 # %%% When table_name_prefixes are use then during rendering empty non-TNP
                                 # entries get added at some point when an attempt is made to find the table.
                                 # Will have to hunt that down at some point.
@@ -1623,7 +1616,7 @@ end %>#{"
 <td><%= link_to_brick(
    ::Brick::Rails::AA_PNG.html_safe,
    { show_proc: Proc.new do |aa_model, relation|
-                  path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{rk = aa_model.model_name.singular_route_key}_path\".to_sym
+                  path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{aa_model.model_name.singular_route_key}_path\".to_sym
                   send(path_helper, obj) if respond_to?(path_helper)
                 end,
      title: \"#\{page_title} in ActiveAdmin\" }

data/lib/brick/frameworks/rails/form_tags.rb

@@ -73,7 +73,7 @@ module Brick::Rails::FormTags
           <td>#{link_to_brick(
             ::Brick::Rails::AA_PNG.html_safe,
             { index_proc: Proc.new do |aa_model, relation|
-                            path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{rk = aa_model.model_name.route_key}_path".to_sym
+                            path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{aa_model.model_name.route_key}_path".to_sym
                             send(path_helper) if respond_to?(path_helper)
                           end,
               title: "#{klass.name} in ActiveAdmin" }
@@ -137,7 +137,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]}" : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
+               s << (col.first ? 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/route_mapper.rb

@@ -77,7 +77,7 @@ module Brick
         resource_name = v.fetch(:resource, nil) || k
         next if !resource_name ||
                 existing_controllers.key?(
-                  controller_prefix + (resource_name = "#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize)
+                  "#{controller_prefix}#{schema_prefix&.tr('.', '/')}#{resource_name}".pluralize
                 )
 
         object_name = k.split('.').last # Take off any first schema part

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -224,7 +224,7 @@ module Brick
         if !a.polymorphic? && (a.belongs_to? || (through && (thr = a.through_reflection))) &&
            !((kls = thr&.klass || a.klass) && ::Brick.config.exclude_tables.exclude?(kls.table_name) &&
               (!a.belongs_to? ||
-                ((fk_type = a.foreign_key.is_a?(Array) ? a.foreign_key.map { |fk_part| model_cols[fk_part.to_s].type } : model_cols[a.foreign_key.to_s].type) &&
+                ((fk_type = a.foreign_key.is_a?(Array) ? a.foreign_key.map { |fk_part| model_cols[fk_part.to_s].type } : model_cols[a.foreign_key.to_s]&.type) &&
                  (primary_cols = primary_klass.columns_hash) &&
                  (pk_type = a_pk.is_a?(Array) ? a_pk.map { |pk_part| primary_cols[pk_part.to_s].type } : primary_cols[a_pk].type) &&
                  (same_type = (pk_type == fk_type))

data/lib/generators/brick/migration_builder.rb

@@ -93,7 +93,10 @@ module Brick
                               relations = ::Brick.relations, do_fks_last: nil, do_schema_migrations: true)
         if do_fks_last.nil?
           puts 'Would you like for the foreign keys to be built inline inside of each migration file, or as a final migration?'
-          do_fks_last = (gets_list(list: ['Inline', 'Separate final migration for all FKs']).start_with?('Separate'))
+          options = ['Inline', 'Separate final migration for all FKs']
+          options << 'Create "additional_references" entries in brick.rb that emulate foreign keys'
+          do_fks = gets_list(list: options).split(' ').first
+          do_fks_last = do_fks unless do_fks == 'Inline'
         end
 
         is_sqlite = ActiveRecord::Base.connection.adapter_name == 'SQLite'
@@ -138,10 +141,10 @@ module Brick
                           end
                         end).present?
           fringe.each do |tbl|
-            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []),
+            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []), built_schemas, mig_path, current_mig_time,
                                         key_type, is_4x_rails, ar_version, do_fks_last)
             after_fks.concat(add_fks) if do_fks_last
-            versions_to_create << migration_file_write(mig_path, ::Brick._brick_index("create_#{tbl}", nil, 'x'), current_mig_time += 1.minute, ar_version, mig)
+            versions_to_create << migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time += 1.minute, ar_version, mig)
           end
           done.concat(fringe)
           chosen -= done
@@ -150,46 +153,65 @@ module Brick
         if do_fks_last
           # Write out any more tables that haven't been done yet
           chosen.each do |tbl|
-            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []),
+            mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []), built_schemas, mig_path, current_mig_time,
                                         key_type, is_4x_rails, ar_version, do_fks_last)
             after_fks.concat(add_fks)
-            migration_file_write(mig_path, ::Brick._brick_index("create_#{tbl}", nil, 'x'), current_mig_time += 1.minute, ar_version, mig)
+            migration_file_write(mig_path, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time += 1.minute, ar_version, mig)
           end
           done.concat(chosen)
           chosen.clear
 
-          # Add a final migration to create all the foreign keys
-          mig = +"  def change\n"
-          after_fks.each do |add_fk|
-            next unless add_fk[2] # add_fk[2] holds the inverse relation
+          case do_fks_last
+          when 'Separate' # Add a final migration to create all the foreign keys
+            mig = +"  def change\n"
+            after_fks.each do |add_fk|
+              next unless add_fk[2] # add_fk[2] holds the inverse relation
 
-            unless (pk = add_fk[2][:pkey].values.flatten&.first)
-              # No official PK, but if coincidentally there's a column of the same name, take a chance on it
-              pk = (add_fk[2][:cols].key?(add_fk[1]) && add_fk[1]) || '???'
+              unless (pk = add_fk[2][:pkey].values.flatten&.first)
+                # No official PK, but if coincidentally there's a column of the same name, take a chance on it
+                pk = (add_fk[2][:cols].key?(add_fk[1]) && add_fk[1]) || '???'
+              end
+              mig << "    add_foreign_key #{add_fk[3]}, " # The tbl_code
+              #         to_table               column
+              mig << "#{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
             end
-            mig << "    add_foreign_key #{add_fk[3]}, " # The tbl_code
-            #         to_table               column
-            mig << "#{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
-          end
-          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"
+            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"
 
-            mig << "      # Vacuum takes only about ten seconds when all the tables are empty,
+              mig << "      # Vacuum takes only about ten seconds when all the tables are empty,
       # and about 2 minutes when the tables are fairly full.
       execute('COMMIT')
       execute('VACUUM FULL')
       execute('BEGIN TRANSACTION')
     end\n"
-          end
-
-          mig << +"  end\n"
-          migration_file_write(mig_path, 'create_brick_fks.rbx', current_mig_time += 1.minute, ar_version, mig)
-          puts "Have written out a final migration called 'create_brick_fks.rbx' which creates #{after_fks.length} foreign keys.
+            end
+            mig << +"  end\n"
+            migration_file_write(mig_path, 'create_brick_fks.rbx', current_mig_time += 1.minute, 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'.
   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."
+
+          when 'Create' # Show additional_references entries that can be added into brick.rb
+            puts 'Place this block into your brick.rb file:'
+            puts '  ::Brick.additional_references = ['
+            after_fks.each do |add_fk|
+              next unless add_fk[2] # add_fk[2] holds the inverse relation
+
+              unless (pk = add_fk[2][:pkey].values.flatten&.first)
+                # No official PK, but if coincidentally there's a column of the same name, take a chance on it
+                pk = (add_fk[2][:cols].key?(add_fk[1]) && add_fk[1]) || '???'
+              end
+              from_table = add_fk[3]
+              from_table = "'#{from_table[1..-1]}'" if from_table[0] == ':'
+              to_table = add_fk[0]
+              to_table = "'#{to_table[1..-1]}'" if to_table[0] == ':'
+              puts "    [#{from_table}, #{add_fk[1].inspect}, #{to_table}],"
+            end
+            puts '  ]'
+          end
         end
 
         stuck_counts = Hash.new { |h, k| h[k] = 0 }
@@ -232,7 +254,7 @@ module Brick
 
     private
 
-      def gen_migration_columns(relations, tbl, tbl_parts, add_fks,
+      def gen_migration_columns(relations, tbl, tbl_parts, add_fks, built_schemas, mig_path, current_mig_time,
                                 key_type, is_4x_rails, ar_version, do_fks_last)
         return unless (relation = relations.fetch(tbl, nil))&.fetch(:cols, nil)&.present?
 

data/lib/generators/brick/salesforce_migrations_generator.rb

@@ -74,7 +74,7 @@ module Brick
                     end
         # Build but do not have foreign keys established yet, and do not put version entries info the schema_migrations table
         ::Brick::MigrationBuilder.generate_migrations(chosen, mig_path, is_insert_versions, is_delete_versions, relations,
-                                                      do_fks_last: true, do_schema_migrations: false)
+                                                      do_fks_last: 'Separate', do_schema_migrations: false)
       end
       parser = Nokogiri::XML::SAX::Parser.new(::Brick::SalesforceSchema.new(end_document_proc))
       # The WSDL file must have a .xml extension, and can be in any folder in the project

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.197
+  version: 1.0.199
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord