brick 1.0.196 → 1.0.198

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5cff29063c150d35653274752bcda0ed44ce462563824f8b8a974dfacc8a81
-  data.tar.gz: 2d26e1e8a62b3a9e69c6a28a37e640fa5c5e0ced28a6527db4b68d2abdfc47f5
+  metadata.gz: 9de3c9df6786000fb662d7aa133a5c53b2ed5d06a114edd3165dfd0acd3ebe7c
+  data.tar.gz: 7750790ca7698e8291ebd2843692009ef29795aab60c5691911698a835808bda
 SHA512:
-  metadata.gz: 150e669bb088db49139311839cbca472317b371d24ab85bc096bea94221331c1f7122b8ed521a9c87691d9ded450d723954c2bd7d833b56fd07f248be5624339
-  data.tar.gz: cf000d92773ce9ec8db6a412e7f4fe642e6e9bc07db9412459931a69ebc7dff7fb41de9d1824d068b9c8568827cdbd1881073f3404b85eab1fc1c5670cd625ff
+  metadata.gz: dcb14263731745917eba2172d838b7eeb11910a1bab8c93dbe5d27b8923f98e16b24c08b74c52c550f75bc900cb61af1d1783d010ae9ed3000e03043749f47d8
+  data.tar.gz: ec2111be292b26489b972782478151f1468c2d02c6c84dc144c09bd4a8c0e34104fcb392c0ebdc9758eda6061ed62db982e4751e2e885edd282c4ba42c144bed

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 }
@@ -3468,9 +3468,9 @@ module Brick
       separator ||= '_'
       res_name = (tbl_name_parts = tbl_name.split('.'))[0..-2].first
       res_name << '.' if res_name
-      (res_name ||= +'') << (relation || ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
+      (res_name ||= +'') << (relation ||= ::Brick.relations.fetch(tbl_name, nil))&.fetch(:resource, nil) || tbl_name_parts.last
 
-      res_parts = ((mode == :singular) ? res_name.singularize : res_name).split('.')
+      res_parts = ((mode == :singular) ? tbl_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]
@@ -3487,7 +3487,7 @@ module Brick
       index = index.tr('_', 'x') if separator == 'x'
       # Rails applies an _index suffix to that route when the resource name isn't something plural
       index << '_index' if mode != :singular && separator == '_' &&
-                           index == (path_prefix + [name&.underscore&.tr('/', '_') || '_']).join(separator)
+                           index == (path_prefix + [relation[:class_name]&.underscore&.tr('/', '_') || '_']).join(separator)
       index
     end
 

data/lib/brick/route_mapper.rb

@@ -74,15 +74,15 @@ module Brick
           schema_prefix = "#{schema_name}."
         end
 
-        resource_name = v.fetch(:resource, nil)
+        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
 
-        full_schema_prefix = if (full_aps = aps = v.fetch(:auto_prefixed_schema, nil))
+        full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
                                aps = aps[0..-2] if aps[-1] == '_'
                                (schema_prefix&.dup || +'') << "#{aps}."
                              else
@@ -90,7 +90,6 @@ module Brick
                              end
 
         # Track routes being built
-        resource_name = v.fetch(:resource, nil) || k
         if (class_name = v.fetch(:class_name, nil))
           if v.key?(:isView)
             view_class_length = class_name.length if class_name.length > view_class_length
@@ -98,7 +97,7 @@ module Brick
           else
             table_class_length = class_name.length if class_name.length > table_class_length
             tables
-          end << [class_name, aps, "#{"#{schema_name}/" if schema_name}#{resource_name[full_aps&.length || 0 .. -1]}"]
+          end << [class_name, aps, "#{"#{schema_name}/" if schema_name}#{resource_name}"]
         end
 
         options = {}

data/lib/brick/version_number.rb

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

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'
@@ -141,7 +144,7 @@ module Brick
             mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []),
                                         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
@@ -153,43 +156,59 @@ module Brick
             mig = gen_migration_columns(relations, tbl, (tbl_parts = tbl.split('.')), (add_fks = []),
                                         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    column        to_table
+              puts "    [#{add_fk[3].to_s.inspect}, #{add_fk[1].inspect}, #{add_fk[0].to_s.inspect}]"
+            end
+            puts '  ]'
+          end
         end
 
         stuck_counts = Hash.new { |h, k| h[k] = 0 }

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.196
+  version: 1.0.198
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord