brick 1.0.205 → 1.0.206

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3abdf25aeb401676febcc1ea98ce104a9e005ecae652f17daf3736baab63d5ea
-  data.tar.gz: 195eb8e27607f719808954914a409b356c249384cacd0535fab65652b02cd4ec
+  metadata.gz: 7cd4c557cd4baa06fc68ab683444da5b018c1c0c63436d36d7648c259167c418
+  data.tar.gz: 62d2260128b72a0a6db5d0af14054ae9518e4516ccf18a04010d2e187c8768d2
 SHA512:
-  metadata.gz: 187b1740a3f0e54f061c9b293df233c32993eb00ca4a218e1b32b7888c8b72c4fb9d2889ec7a2a469f95d3b39242b9adc8c02167c76065a5dcfd45262714793c
-  data.tar.gz: 132fecbea3bcf8783a0ad2ca540747af4a74e882d0fdba60bf0491c0ee19e52e9ef378d6a39ab3df89cbac3bcd6dee760959f969f45e17587b6a0b643f9e1bb3
+  metadata.gz: 43743d8447db6daa39e2fc506e7eef3260ba63abc3a4cb4990ace1d33e56e38d15dd7eaf9c9bbdb2873ea2b5dae6d308c12bd04ea2f073b04fefccac564ee3e3
+  data.tar.gz: 144317e91f03fdf2ca66db2c78d8f851e9ab21c4c016190ad3a48ef97a3594f2df8125a1d4f4a59214501429e1c16b6baca9878c22bb2d026eeee20a83929f53

data/lib/brick/extensions.rb

@@ -536,10 +536,35 @@ module ActiveRecord
   class Relation
     attr_accessor :_brick_page_num
 
-    # Links from ActiveRecord association pathing names over to real table correlation names
-    # that get chosen when the AREL AST tree is walked.
+    # Links from ActiveRecord association pathing names over to the real table
+    # correlation names that get chosen when the AREL AST tree is walked.
     def brick_links
-      @brick_links ||= { '' => table_name }
+      # Touching AREL AST walks the JoinDependency tree, and in that process uses our
+      # "brick_links" patch to find how every AR chain of association names relates to exact
+      # table correlation names chosen by AREL.  We use a duplicate relation object for this
+      # because an important side-effect of referencing the AST is that the @arel instance
+      # variable gets set, and this is a signal to ActiveRecord that a relation has now
+      # become immutable.  (We aren't quite ready for our "real deal" relation object to be
+      # set in stone ... still need to add .select(), and possibly .where() and .order()
+      # things ... also if there are any HM counts then an OUTER JOIN for each of them out
+      # to a derived table to do that counting.  All of these things need to know proper
+      # table correlation names, which will now become available from brick_links on the
+      # @_brick_rel_dupe object.)
+      @_brick_links ||= begin
+                          # If it's a CollectionProxy (which inherits from Relation) then need to dig
+                          # out the core Relation object which is found in the association scope.
+                          rel_dupe = (is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self).dup
+                          # This will become a fully populated hash of correlation names
+                          rel_dupe.instance_variable_set(:@_brick_links, bl = { '' => table_name })
+                          # Walk the AST tree in order to capture all the correlation names
+                          rel_dupe.arel.ast
+                          # Now that @_brick_links are captured, we can garbage collect the @_brick_rel_dupe object
+                          # remove_instance_variable(:@_brick_rel_dupe)
+                          bl
+                        end
+      # if @_brick_rel_dupe
+      # end
+      # @_brick_links
     end
 
     def brick_select(*args, params: {}, order_by: nil, translations: {},
@@ -648,23 +673,6 @@ module ActiveRecord
         end
       end
 
-      # If it's a CollectionProxy (which inherits from Relation) then need to dig out the
-      # core Relation object which is found in the association scope.
-      rel_dupe = (is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self).dup
-
-      # Touching AREL AST walks the JoinDependency tree, and in that process uses our
-      # "brick_links" patch to find how every AR chain of association names relates to exact
-      # table correlation names chosen by AREL.  We use a duplicate relation object for this
-      # because an important side-effect of referencing the AST is that the @arel instance
-      # variable gets set, and this is a signal to ActiveRecord that a relation has now
-      # become immutable.  (We aren't quite ready for our "real deal" relation object to be
-      # set in stone ... still need to add .select(), and possibly .where() and .order()
-      # things ... also if there are any HM counts then an OUTER JOIN for each of them out
-      # to a derived table to do that counting.  All of these things need to know proper
-      # table correlation names, which will now become available in brick_links on the
-      # rel_dupe object.)
-      rel_dupe.arel.ast
-
       core_selects = selects.dup
       id_for_tables = Hash.new { |h, k| h[k] = [] }
       field_tbl_names = Hash.new { |h, k| h[k] = {} }
@@ -673,7 +681,7 @@ module ActiveRecord
       # CUSTOM COLUMNS
       # ==============
       (cust_col_override || klass._br_cust_cols).each do |k, cc|
-        if rel_dupe.respond_to?(k) # Name already taken?
+        if respond_to?(k) # Name already taken?
           # %%% Use ensure_unique here in this kind of fashion:
           # cnstr_name = ensure_unique(+"(brick) #{for_tbl}_#{pri_tbl}", nil, bts, hms)
           # binding.pry
@@ -690,7 +698,7 @@ module ActiveRecord
             # binding.pry unless kl.reflect_on_association(cc_part_term)
             kl.reflect_on_association(cc_part_term)&.klass || klass
           end
-          tbl_name = rel_dupe.brick_links[cc_part[0..-2].map(&:to_s).join('.')]
+          tbl_name = brick_links[cc_part[0..-2].map(&:to_s).join('.')]
           # Deal with the conflict if there are two parts in the custom column named the same,
           # "category.name" and "product.name" for instance will end up with aliases of "name"
           # and "product__name".
@@ -734,19 +742,19 @@ module ActiveRecord
       unless cust_col_override
         klass._br_bt_descrip.each do |v|
           v.last.each do |k1, v1| # k1 is class, v1 is array of columns to snag
-            next unless (tbl_name = rel_dupe.brick_links[v.first.to_s]&.split('.')&.last)
+            next unless (tbl_name = brick_links[v.first.to_s]&.split('.')&.last)
 
             # If it's Oracle, quote any AREL aliases that had been applied
-            tbl_name = "\"#{tbl_name}\"" if ::Brick.is_oracle && rel_dupe.brick_links.values.include?(tbl_name)
+            tbl_name = "\"#{tbl_name}\"" if ::Brick.is_oracle && brick_links.values.include?(tbl_name)
             field_tbl_name = nil
             v1.map { |x| [x[0..-2].map(&:to_s).join('.'), x.last] }.each_with_index do |sel_col, idx|
               # %%% Strangely in Rails 7.1 on a slower system then very rarely brick_link comes back nil...
-              brick_link = rel_dupe.brick_links[sel_col.first]
+              brick_link = brick_links[sel_col.first]
               field_tbl_name = brick_link&.split('.')&.last ||
                 # ... so here's a best-effort guess for what the table name might be.
-                rel_dupe.klass.reflect_on_association(sel_col.first)&.klass&.table_name
+                klass.reflect_on_association(sel_col.first)&.klass&.table_name
               # If it's Oracle, quote any AREL aliases that had been applied
-              field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && rel_dupe.brick_links.values.include?(field_tbl_name)
+              field_tbl_name = "\"#{field_tbl_name}\"" if ::Brick.is_oracle && brick_links.values.include?(field_tbl_name)
 
               # Postgres can not use DISTINCT with any columns that are XML, so for any of those just convert to text
               is_xml = is_distinct && Brick.relations[k1.table_name]&.[](:cols)&.[](sel_col.last)&.first&.start_with?('xml')
@@ -788,7 +796,7 @@ module ActiveRecord
         join_array.each do |assoc_name|
           next unless assoc_name.is_a?(Symbol)
 
-          table_alias = rel_dupe.brick_links[assoc_name.to_s]
+          table_alias = brick_links[assoc_name.to_s]
           _assoc_names[assoc_name] = [table_alias, klass]
         end
       end
@@ -931,7 +939,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
           if (v_parts = v.first.split('.')).length == 1
             (is_not ? where_nots : s)[v.first] = v.last
           else
-            tbl_name = rel_dupe.brick_links[v_parts.first].split('.').last
+            tbl_name = brick_links[v_parts.first].split('.').last
             (is_not ? where_nots : s)["#{tbl_name}.#{v_parts.last}"] = v.last
           end
         end
@@ -1042,10 +1050,9 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
           else
             self.joins!(ja)
           end
-          (ast_tree = self.dup).arel.ast # Walk the AST tree so we can rewrite the prefixes accordingly
           conditions = opts.each_with_object({}) do |v, s|
             if (ref_parts = v.first.split('.')).length > 1 &&
-               (tbl = ast_tree.brick_links[ref_parts[0..-2].join('.')])
+               (tbl = brick_links[ref_parts[0..-2].join('.')])
               s["#{tbl}.#{ref_parts.last}"] = v.last
             else
               s[v.first] = v.last
@@ -1315,10 +1322,15 @@ end
          # Try to require the respective Ruby file
          # ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore)) &&
          #  (require_dependency(filename) || true) &&
-         ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
+         (!anonymous? &&
+          (filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
                       (self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
           ) && (require_dependency(filename) || true) &&
-          (!anonymous? && (possible = self.const_get(args.first)) && possible.name == desired_classname)
+          (filename != Module.instance_variable_get(:@_brick_last_filename) || # Avoid trying the same exact file twice in a row
+           Module.instance_variable_set(:@_brick_last_filename, nil)) &&
+           Module.instance_variable_set(:@_brick_last_filename, filename) &&
+
+          (possible = self.const_get(args.first)) && possible.name == desired_classname
          ) ||
 
          # If any class has turned up so far (and we're not in the middle of eager loading)
@@ -1337,6 +1349,7 @@ end
           return possible
         end
       end
+      Module.instance_variable_set(:@_brick_last_filename, nil) # Clear out the check for trying the same exact file twice in a row
     end
     class_name = ::Brick.namify(requested)
     is_avo_present = Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace)

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1560,9 +1560,7 @@ module ActiveRecord
             used_cols = {}
             # Find and expand out all column names being used in select(...)
             new_select_values = relation.select_values.map(&:to_s).each_with_object([]) do |col, s|
-              if col.include?(' ') # Some expression? (No chance for a simple column reference)
-                s << col # Just pass it through
-              else
+              unless col.include?(' ') # Pass it through if it's some expression (No chance for a simple column reference)
                 col = if (col_parts = col.split('.')).length == 1
                         [col]
                       else
@@ -1570,6 +1568,7 @@ module ActiveRecord
                       end
                 used_cols[col] = nil
               end
+              s << col
             end
             if new_select_values.present?
               relation.select_values = new_select_values

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.205
+  version: 1.0.206
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-25 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone