brick 1.0.96 → 1.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0061ad25b22deee43d1939b6541257924a61a67b3b8b004fb6a0072302746ca2
-  data.tar.gz: 99968b9de834f73c60842bf5da03b5bddd750f1ff8c3ac1dac294078f0eb2358
+  metadata.gz: c257a0a65807fa87a13d722f3cc30c38d51bde571a070df53f4277fc6db8b7ba
+  data.tar.gz: 74d7690a968fab671d9e9e8ac92e41885ceb44a700fd1cb293f3b79af819e463
 SHA512:
-  metadata.gz: 4958e2b0c18522be75134ab29df481213594189b4addd6ef9368ae8677aba603cbb278176c57c51217a49c0042e98927cb33465995bc4aae01f3af59b2d64f15
-  data.tar.gz: 1d486886f30ce384edc7d84a441617906b26b001c7c3562558289eedfd4b0c12e2a860c587f71acb6e6727649a3756223f1240c07f4e1013029cfe5b67a9c117
+  metadata.gz: 4337faa80a6f0d9c1dadcb3271aea14ec54bb91e72cd7eead7e59c860557f828ac073cab3768feaa2db2f664d63b1604bd8f8e0d53c64621b1fcf5cc041057d9
+  data.tar.gz: 541cade2070bd0a79b21dd7155df700b2739084ae81eaa02709f9e00164f956e62e8342330a78496c4b5fbf351cac9ea40483d3cdc32c1fb1dbe8d7e34499d2d

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1257,35 +1257,33 @@ module ActiveRecord
     # For AR >= 4.2
     if self.const_defined?('JoinDependency')
       class JoinDependency
-        if ActiveRecord.version >= ::Gem::Version.new('6.0')
-          # An intelligent .eager_load() and .includes() that creates t0_r0 style aliases only for the columns
-          # used in .select().  To enable this behaviour, include the flag :_brick_eager_load as the first
-          # entry in your .select().
-          # More information:  https://discuss.rubyonrails.org/t/includes-and-select-for-joined-data/81640
-          def apply_column_aliases(relation)
-            used_cols = {}
-            if (sel_vals = relation.select_values.map(&:to_s)).first == '_brick_eager_load'
-              # Find and expand out all column names being used in select(...)
-              new_select_values = sel_vals.each_with_object([]) do |col, s|
-                next if col == '_brick_eager_load'
-
-                if col.include?(' ') # Some expression? (No chance for a simple column reference)
-                  s << col # Just pass it through
-                else
-                  col = if (col_parts = col.split('.')).length == 1
-                          [col]
-                        else
-                          [col_parts[0..-2].join('.'), col_parts.last]
-                        end
-                  used_cols[col] = nil
-                end
-              end
-              if new_select_values.present?
-                relation.select_values = new_select_values
+        # An intelligent .eager_load() and .includes() that creates t0_r0 style aliases only for the columns
+        # used in .select().  To enable this behaviour, include the flag :_brick_eager_load as the first
+        # entry in your .select().
+        # More information:  https://discuss.rubyonrails.org/t/includes-and-select-for-joined-data/81640
+        def apply_column_aliases(relation)
+          used_cols = {}
+          if (sel_vals = relation.select_values.map(&:to_s)).first == '_brick_eager_load'
+            # Find and expand out all column names being used in select(...)
+            new_select_values = sel_vals.each_with_object([]) do |col, s|
+              next if col == '_brick_eager_load'
+
+              if col.include?(' ') # Some expression? (No chance for a simple column reference)
+                s << col # Just pass it through
               else
-                relation.select_values.clear
+                col = if (col_parts = col.split('.')).length == 1
+                        [col]
+                      else
+                        [col_parts[0..-2].join('.'), col_parts.last]
+                      end
+                used_cols[col] = nil
               end
             end
+            if new_select_values.present?
+              relation.select_values = new_select_values
+            else
+              relation.select_values.clear
+            end
 
             @aliases ||= Aliases.new(join_root.each_with_index.map do |join_part, i|
               join_alias = join_part.table&.table_alias || join_part.table_name
@@ -1315,9 +1313,9 @@ module ActiveRecord
               end
               Aliases::Table.new(join_part, columns)
             end)
-
-            relation._select!(-> { @aliases.columns })
           end
+
+          relation._select!(-> { aliases.columns })
         end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.96
+  version: 1.0.97
 platform: ruby
 authors:
 - Lorin Thwaits