brick 1.0.198 → 1.0.199

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de3c9df6786000fb662d7aa133a5c53b2ed5d06a114edd3165dfd0acd3ebe7c
-  data.tar.gz: 7750790ca7698e8291ebd2843692009ef29795aab60c5691911698a835808bda
+  metadata.gz: 45f0082e1fac37af74b7ee802123ba84b8f670596fbd6f47c704ce6e660a6a2e
+  data.tar.gz: aad9255dbb59fda237d733508268f817666158984633b5e2965ed2fcfa909d9b
 SHA512:
-  metadata.gz: dcb14263731745917eba2172d838b7eeb11910a1bab8c93dbe5d27b8923f98e16b24c08b74c52c550f75bc900cb61af1d1783d010ae9ed3000e03043749f47d8
-  data.tar.gz: ec2111be292b26489b972782478151f1468c2d02c6c84dc144c09bd4a8c0e34104fcb392c0ebdc9758eda6061ed62db982e4751e2e885edd282c4ba42c144bed
+  metadata.gz: f1ec256df47b3091bf23ad128ae74e3e3baef71052fc6353fa24fefe2744bf8d28bf8ba1aea595c583049745c7addf26a5cbd992b91406a5b457a4e6e6a4e2e7
+  data.tar.gz: e6c9cc621f4cd184be0da3c924b3e529f2964b1125c518aeb93f9c1fd1a7e55c94ab278d1573522a01f5b9f5969c044685659f2ffb4656dce0fd001df759990d

data/lib/brick/extensions.rb

@@ -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 : res_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/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 198
+    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

@@ -141,7 +141,7 @@ 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, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time += 1.minute, ar_version, mig)
@@ -153,7 +153,7 @@ 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, "create_#{::Brick._brick_index(tbl, nil, 'x')}", current_mig_time += 1.minute, ar_version, mig)
@@ -204,8 +204,11 @@ module Brick
                 # 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}]"
+              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
@@ -251,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?
 

metadata

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