brick 1.0.217 → 1.0.218

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6058423ea3fdcc6b213efcbffc1dd2d5171a08949c08338950f0dd75c35d9351
-  data.tar.gz: 876598fc0c0bd95725340fe830af39d318bb4aa1893c6178ef2ff0547dbd1960
+  metadata.gz: e7506d15c361c2a616088fb916af6f5505dc19793f7267026cdd94a5e158a61c
+  data.tar.gz: d556d92d6063e764779c1a1e03910e151ecc75e288dd4b29d2ee44f721580f5e
 SHA512:
-  metadata.gz: 93604235b727723b236ce5fca50f6644b53a478918acd7d20e4e60f454f62d46cf98d5c791f043db98268ad6ee77a43ed29278abf47c60ca3228347ebcd9c739
-  data.tar.gz: 0f2a06b4b4261bf186823dca721d09c3e18a808f9449448f233738167a640d990391b309b55247c45fe8850ceab173cf2c5e5e5d62b05c0e129351bc37b61251
+  metadata.gz: f8092f8367ef9d86792f04f7457d8ede37ccb6502ff4396340c4b1b59a9f7ae47fbeac29a5632b44877eca27b4d0ca1296186c3749f190291da95cd68c80e29a
+  data.tar.gz: 706c6bd3b648abe0c44eae56c47aa17d36ee9b775d0915f517a1c7e218bfbc4997dae7b6828c4531b2fa283947234d748b6f3e615af4b1818ac0b7ee46be57ab

data/lib/brick/config.rb

@@ -243,7 +243,6 @@ module Brick
                                   tables.each_with_object({}) do |v, s|
                                     # If it's :constellation, or anything else in a hash, we'll take its value
                                     # (and hopefully in this case that would be either a string or nil)
-                                    # binding.pry
                                     dsl = ((v.last.is_a?(Symbol) && v.last) || v.last&.values&.last)
                                     unless (dsl ||= '').is_a?(String) || dsl.is_a?(Symbol)
                                       puts "Was really expecting #{v.first} / #{v.last.first&.first} / #{dsl} to be a string, " +

data/lib/brick/extensions.rb

@@ -691,7 +691,7 @@ module ActiveRecord
         #     ActiveRecord::StatementInvalid (TinyTds::Error: DBPROCESS is dead or not enabled)
         #     Relevant info here:  https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues/402
         is_api = params['_brick_is_api']
-        columns.each do |col|
+        columns[0..450].each do |col|
           next if (col.type.nil? || col.type == :binary) && is_api
 
           col_alias = " AS #{col.name}_" if (col_name = col.name) == 'class'
@@ -867,15 +867,6 @@ module ActiveRecord
               end
               v1 << id_for_tables[v.first].compact
             end
-            # if k1.name == 'ActiveStorage::Attachment'
-            #   binding.pry
-            #   (@_brick_includes ||= {})[v1.first.first.to_s] = [v1.first[1..-1], 'blob']
-            #   # x = 5
-            # # elsif k1.name == 'ActiveStorage::Blob'
-            # #   binding.pry
-            # #   (@_brick_includes ||= {})[v1.first.first.to_s] = v1[0..1]
-            # #   # x = 5
-            # end
           end
         end
         join_array.each do |assoc_name|
@@ -917,12 +908,7 @@ module ActiveRecord
                          through_sources.push(src_ref) unless src_ref.belongs_to?
                          from_clause = +"#{_br_quoted_name(through_sources.first.table_name)} br_t0"
                          # ActiveStorage will not get the correct count unless we do some extra filtering later
-                         if Object.const_defined?('ActiveStorage') && through_sources.first.klass <= ::ActiveStorage::Attachment
-                           # binding.pry
-                           tbl_nm = 'br_t0'
-                           # Need to somehow have this kind of an include in order to avoid an N+1 problem:
-                           # .include(images_attachments: [blob: { variant_records: :blob }])
-                         end
+                         tbl_nm = 'br_t0' if Object.const_defined?('ActiveStorage') && through_sources.first.klass <= ::ActiveStorage::Attachment
                          fk_col = through_sources.shift.foreign_key
 
                          idx = 0
@@ -1094,7 +1080,16 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
         self.order_values |= final_order_by # Same as:  order!(*final_order_by)
       end
       # By default just 1000 rows
-      row_limit = params['_brick_limit'] || params['_brick_page_size'] || 1000
+      default_row_limit = if columns.length > 300
+                            50
+                          elsif columns.length > 200
+                            100
+                          elsif columns.length > 100
+                            250
+                          else
+                            1000
+                          end
+      row_limit = params['_brick_limit'] || params['_brick_page_size'] || default_row_limit
       offset = if (page = params['_brick_page']&.to_i)
                  page = 1 if page < 1
                  (page - 1) * row_limit.to_i
@@ -1125,12 +1120,8 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
       end
 
       # ActiveStorage compatibility
-      if klass.name == 'ActiveStorage::Blob' && ::ActiveStorage::Blob.columns_hash.key?('service_name')
-        selects << 'service_name'
-      end
-      if klass.name == 'ActiveStorage::Attachment' && ::ActiveStorage::Attachment.columns_hash.key?('blob_id')
-        selects << 'blob_id'
-      end
+      selects << 'service_name' if klass.name == 'ActiveStorage::Blob' && ::ActiveStorage::Blob.columns_hash.key?('service_name')
+      selects << 'blob_id' if klass.name == 'ActiveStorage::Attachment' && ::ActiveStorage::Attachment.columns_hash.key?('blob_id')
       # Pay gem compatibility
       selects << 'processor' if klass.name == 'Pay::Customer' && Pay::Customer.columns_hash.key?('processor')
       selects << 'customer_id' if klass.name == 'Pay::Subscription' && Pay::Subscription.columns_hash.key?('customer_id')
@@ -1396,29 +1387,30 @@ end
     end
     base_module = if self < ActiveRecord::Migration || !self.name
                     brick_root || Object
-                  elsif split_self_name&.length&.> 1 # Classic mode
-                    begin
-                      base = self
-                      unless (base_goal = requested.split('::')[0..-2].join('::')).empty?
-                        base = base.parent while base.name != base_goal && base != Object
-                      end
-                      return base._brick_const_missing(*args)
-
-                    rescue NameError # %%% Avoid the error "____ cannot be autoloaded from an anonymous class or module"
-                      return self.const_get(args.first) if self.const_defined?(args.first)
-
-                      # unless self == (prnt = (respond_to?(:parent) ? parent : module_parent))
-                      unless self == Object
-                        begin
-                          return Object._brick_const_missing(*args)
-
-                        rescue NameError
-                          return Object.const_get(args.first) if Object.const_defined?(args.first)
-
-                        end
-                      end
-                    end
-                    Object
+                  # elsif split_self_name&.length&.> 1 # Classic mode
+                  #   begin
+                  #     base = self
+                  #     unless (base_goal = requested.split('::')[0..-2].join('::')).empty?
+                  #       base = base.parent while base.name != base_goal && base != Object
+                  #     end
+                  #     binding.pry
+                  #     return base._brick_const_missing(*args)
+
+                  #   rescue NameError # %%% Avoid the error "____ cannot be autoloaded from an anonymous class or module"
+                  #     return self.const_get(args.first) if self.const_defined?(args.first)
+
+                  #     # unless self == (prnt = (respond_to?(:parent) ? parent : module_parent))
+                  #     unless self == Object
+                  #       begin
+                  #         return Object._brick_const_missing(*args)
+
+                  #       rescue NameError
+                  #         return Object.const_get(args.first) if Object.const_defined?(args.first)
+
+                  #       end
+                  #     end
+                  #   end
+                  #   Object
                   else
                     sti_base = (::Brick.config.sti_namespace_prefixes&.fetch("::#{name}::#{requested}", nil) ||
                                 ::Brick.config.sti_namespace_prefixes&.fetch("::#{name}::", nil))&.constantize
@@ -1685,7 +1677,10 @@ class Object
           schema_name = ::Brick.apartment_default_tenant
         end
         # Maybe, just maybe there's a database table that will satisfy this need
-        matching = ::Brick.table_name_lookup&.fetch(class_name, nil)
+        matching = ::Brick.table_name_lookup&.fetch(
+          base_module == Object ? class_name : "#{base_name}::#{class_name}",
+          nil
+        )
         if (matching ||= [table_name, singular_table_name, plural_class_name, model_name, table_name.titleize].find { |m| relations.key?(schema_name ? "#{schema_name}.#{m}" : m) })
           build_model_worker(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching, is_generator)
         end
@@ -2936,6 +2931,10 @@ module Brick
                       end
       hms = (relation = relations.fetch(primary_table, nil))&.fetch(:fks) { relation[:fks] = {} } unless is_class
 
+      unless fk[4]
+        puts "WARNING:  Foreign key \"#{fk[5]}\" for \"#{"#{fk[0]}." if fk[0]}#{fk[1]}.#{fk[2]}\" does not reference a valid primary key or column(s) configured with a unique constraint."
+        return
+      end
       unless (cnstr_name = fk[5])
         # For any appended references (those that come from config), arrive upon a definitely unique constraint name
         pri_tbl = is_class ? fk[4][:class].underscore : pri_tbl

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

@@ -582,7 +582,7 @@ window.addEventListener(\"popstate\", linkSchemas);
               alias :_brick_lookup_context :lookup_context
               def lookup_context(*args)
                 ret = _brick_lookup_context(*args)
-                @_lookup_context.instance_variable_set(:@_brick_req_params, params) if self.class < AbstractController::Base && params
+                @_lookup_context.instance_variable_set(:@_brick_req_params, params) if self.class < AbstractController::Base && request && params.present?
                 ret
               end
             end

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

@@ -93,7 +93,6 @@ module Brick::Rails::FormTags
     #     TinyTds::Error: Adaptive Server connection timed out
     #     (After restarting the server it worked fine again.)
     row_count = 0
-    # binding.pry
     # if @_brick_join_array&.include?()
     enumerator = relation.each # Runs the SQL query
     # Add proxied info for @_brick_includes
@@ -118,7 +117,6 @@ module Brick::Rails::FormTags
         (classes ||= []) << 'right' if val.is_a?(Numeric) && !bt
         out << " class=\"#{classes.join(' ')}\"" if classes&.present?
         out << '>'
-        # binding.pry if col_name == 'event_image_attachment' && obj.id == 6
         if bt
           if bt[2] && obj.respond_to?(poly_id_col = "#{bt.first}_id") # Polymorphic?
             if (poly_id = obj.send(poly_id_col))

data/lib/brick/frameworks/rails.rb

@@ -139,9 +139,10 @@ erDiagram
    @_brick_bt_descrip&.each do |bt|
      bt_class = bt[1].first.first
      callbacks[bt_name = bt_class.name.split('::').last] = bt_class
-     is_has_one = #{model.name}.reflect_on_association(bt.first)&.inverse_of&.macro == :has_one ||
+     # Used to have:  &.inverse_of  before  &.macro
+     is_has_one = #{model.name}.reflect_on_association(bt.first)&.macro == :has_one ||
                   ::Brick.config.has_ones&.fetch('#{model.name}', nil)&.key?(bt.first.to_s)
-    %>  <%= \"#{model_short_name} #\{is_has_one ? '||' : '}o'}--|| #\{bt_name} : \\\"#\{
+    %>  <%= \"#{model_short_name} #\{is_has_one ? '||--o|' : '}o--||'} #\{bt_name} : \\\"#\{
         bt_underscored = bt[1].first.first.name.underscore.singularize
         bt.first unless bt.first.to_s == bt_underscored.split('/').last # Was:  bt_underscored.tr('/', '_')
         }\\\"\".html_safe %>

data/lib/brick/reflect_tables.rb

@@ -417,7 +417,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
           puts "WARNING:  #{message_start} already exists.\n  Will set up to auto-create model #{v[:class_name]} for table #{k}."
         end
         # Track anything that's out-of-the-ordinary
-        table_name_lookup[v[:class_name]] = k unless v[:class_name].underscore.pluralize == k
+        table_name_lookup[v[:class_name]] = k.split('.').last unless v[:class_name].underscore.pluralize == k
       end
       ::Brick.load_additional_references if ::Brick.initializer_loaded
 

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -189,6 +189,7 @@ module Brick
       has_uppers = name =~ /[A-Z]+/
       has_lowers = name =~ /[a-z]+/
       name.downcase! if has_uppers && action == :downcase
+      name = "Z#{name}" if name.start_with?('_') # Entity Framework creates a table named __EFMigrationsHistory
       if name.include?(' ')
         # All uppers or all lowers?
         if !has_uppers || !has_lowers
@@ -197,6 +198,9 @@ module Brick
           name.tr(' ', '')
         end
       else
+        # .NET has a background job processor called "Hangfire" which creates several tables,
+        # two of which get named the same as core Ruby classes -- "Set" and "Hash".
+        name = "#{name}x" if ['Hash', 'Set', 'hash', 'set'].include?(name)
         action == :underscore ? name.underscore : name
       end
     end

data/lib/generators/brick/migration_builder.rb

@@ -363,8 +363,8 @@ module Brick
               if (idx_name = ActiveRecord::Base.connection.index_name(tbl, {column: col})).length > 63
                 # Try to find a shorter name that hasn't been used yet
                 unless indexes.key?(shorter = idx_name[0..62]) ||
-                      indexes.key?(shorter = idx_name.tr('_', '')[0..62]) ||
-                      indexes.key?(shorter = idx_name.tr('aeio', '')[0..62])
+                       indexes.key?(shorter = idx_name.tr('_', '')[0..62]) ||
+                       indexes.key?(shorter = idx_name.tr('aeio', '')[0..62])
                   puts "Unable to easily find unique name for index #{idx_name} that is shorter than 64 characters,"
                   puts "so have resorted to this GUID-based identifier: #{shorter = "#{tbl[0..25]}_#{::SecureRandom.uuid}"}."
                 end
@@ -379,7 +379,12 @@ module Brick
               rescue NameError => e
                 primary_key = ::Brick.ar_base.primary_key
               end
-              fk_stuff = ", foreign_key: { to_table: #{to_table}#{", primary_key: :#{primary_key}" if primary_key != ::Brick.ar_base.primary_key} }"
+              need_pk_specifics = (primary_key != ::Brick.ar_base.primary_key)
+              fk_stuff = if need_pk_specifics || to_table != ":#{fk[:assoc_name].pluralize}"
+                           ", foreign_key: { to_table: #{to_table}#{", primary_key: :#{primary_key}" if need_pk_specifics} }"
+                         else
+                           ", foreign_key: true"
+                         end
               mig << "      t.references :#{fk[:assoc_name]}#{suffix}#{fk_stuff}\n"
             end
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.217
+  version: 1.0.218
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-15 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -126,16 +126,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.42.0
-- !ruby/object:Gem::Dependency
-  name: rswag-ui
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -271,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.3.26
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone