brick 1.0.209 → 1.0.210

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9727d5ff3dbf5edcb8ce91b03d0570eec5eb2e0f9ae2c4f456d9d50779321fc9
-  data.tar.gz: 32b32f909110d6eca464c775d9725ad049fabf8591daab1088da007ae9a95c5a
+  metadata.gz: 803d4790408a0b789ff8086b5b81346581071b260cbc528039fd8cfa8894b7ac
+  data.tar.gz: 4503e1b9feba62d33e83f3fadc25a34b70bf9c661dc750187a3c391e3b24d5e8
 SHA512:
-  metadata.gz: 1931290e472f472d93e1536e6517a3865bcc1acd23d15156d48e52c7f35987183b274c8a7c2ac00f09f2f6ac9a4d5663071c84ae4c896de6b4c0069d4a06b1da
-  data.tar.gz: 5064ef883fb66feb187fe80a92b3ec700da04feef0f390d720b51497f086bbc1062e505cd467d3624fadb6102bc8dec49b0b6b16a1c04a1a1ceb34e50f4f9ff5
+  metadata.gz: 1fe28c2a9ca30ef663f28fe79e65e1b2787686c6fce6d5738d9b6addd6070437411d5210e1ba641b28eae5215fb37756f3faa80f246d823d5d553c9db990a427
+  data.tar.gz: daa9bb88c21467075717062c1ede0ab38af4207bf96d9a2495ce84f99850a4d0cb09f4c1c95017cb3862ef915fab85036397375d43518f7bee2d7bd6f1255aed

data/lib/brick/extensions.rb

@@ -72,7 +72,7 @@ module ActiveRecord
 
       def real_model(params)
         if params && (sub_model = params.fetch(type_col = inheritance_column, nil))
-          sub_model = sub_model.first if sub_model.is_a?(Array) # Support the params style that gets returned from #brick_select
+          sub_model = sub_model.first if sub_model.is_a?(Array) # Support the params style that gets returned from #_brick_querying
           # Make sure the chosen model is really the same or a subclass of this model
           (possible_model = sub_model.constantize) <= self ? possible_model : self
         else
@@ -491,17 +491,12 @@ module ActiveRecord
       [order_by, order_by_txt]
     end
 
-    def self.brick_select(*args, params: {}, brick_col_names: false, **kwargs)
-      selects = if args[0].is_a?(Array)
-                  other_args = args[1..-1]
-                  args[0]
-                else
-                  other_args = []
-                  args
-                end
-      (relation = all).brick_select(selects, *other_args,
-                                    params: params, brick_col_names: brick_col_names, **kwargs)
-      relation.select(selects)
+    def self.brick_select(*args, **kwargs)
+      all.brick_select(*args, **kwargs)
+    end
+
+    def self.brick_pluck(*args, withhold_ids: true, **kwargs)
+      all.brick_pluck(*args, withhold_ids: withhold_ids, **kwargs)
     end
 
     def self.brick_where(*args)
@@ -559,7 +554,7 @@ module ActiveRecord
                           # 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.
                           brick_rel = is_a?(ActiveRecord::Associations::CollectionProxy) ? scope : self
-                          brick_rel = brick_rel.dup if do_dup
+                          brick_rel = (@_brick_rel_dup ||= brick_rel.dup) if do_dup
                           # Start out with a hash that has only the root table name
                           brick_rel.instance_variable_set(:@_brick_links, bl = { '' => table_name })
                           brick_rel.arel.ast if do_dup # Walk the AST tree in order to capture all the other correlation names
@@ -567,10 +562,22 @@ module ActiveRecord
                         end
     end
 
-    def brick_select(*args, params: {}, order_by: nil, translations: {},
-                     join_array: ::Brick::JoinArray.new,
-                     cust_col_override: nil,
-                     brick_col_names: true)
+    def brick_select(*args, **kwargs)
+      selects = args[0].is_a?(Array) ? args[0] : args
+      _brick_querying(selects, **kwargs)
+      select(selects)
+    end
+
+    def brick_pluck(*args, withhold_ids: true, **kwargs)
+      selects = args[0].is_a?(Array) ? args[0] : args
+      _brick_querying(selects, withhold_ids: withhold_ids, **kwargs)
+      pluck(selects)
+    end
+
+    def _brick_querying(*args, withhold_ids: nil, params: {}, order_by: nil, translations: {},
+                        join_array: ::Brick::JoinArray.new,
+                        cust_col_override: nil,
+                        brick_col_names: nil)
       selects = args[0].is_a?(Array) ? args[0] : args
       if selects.present? && cust_col_override.nil? # See if there's any fancy ones in the select list
         idx = 0
@@ -654,13 +661,13 @@ module ActiveRecord
                        "'<#{typ.end_with?('_TYP') ? typ[0..-5] : typ}>' AS #{col.name}"
                      end
         end
-      else # Having some select columns chosen, add any missing always_load_fields for this model ...
+      elsif !withhold_ids # Having some select columns chosen, add any missing always_load_fields for this model ...
         this_model = klass
         loop do
           ::Brick.config.always_load_fields.fetch(this_model.name, nil)&.each do |alf|
             selects << alf unless selects.include?(alf)
           end
-          # ... plus any and all STI superclasses it may inherit from
+          # ... plus ALF fields from any and all STI superclasses it may inherit from
           break if (this_model = this_model.superclass).abstract_class? || this_model == ActiveRecord::Base
         end
       end
@@ -673,15 +680,16 @@ module ActiveRecord
         end
       end
 
-      core_selects = selects.dup
+      # core_selects = selects.dup
       id_for_tables = Hash.new { |h, k| h[k] = [] }
       field_tbl_names = Hash.new { |h, k| h[k] = {} }
       used_col_aliases = {} # Used to make sure there is not a name clash
 
       # CUSTOM COLUMNS
       # ==============
-      (cust_col_override || klass._br_cust_cols).each do |k, cc|
-        if respond_to?(k) # Name already taken?
+      (cust_col_override || (!withhold_ids && klass._br_cust_cols))&.each do |k, cc|
+        brick_links # Intentionally create a relation duplicate
+        if @_brick_rel_dup.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
@@ -730,12 +738,14 @@ module ActiveRecord
           selects << "#{_br_quoted_name(tbl_name)}.#{_br_quoted_name(cc_part.last)} AS #{_br_quoted_name(col_alias)}"
           cc_part << col_alias
         end
-        # Add a key column unless we've already got it
-        if key_alias && !used_col_aliases.key?(key_alias)
-          selects << "#{_br_quoted_name(key_tbl_name)}.#{_br_quoted_name(dest_pk)} AS #{_br_quoted_name(key_alias)}"
-          used_col_aliases[key_alias] = nil
+        unless withhold_ids
+          # Add a key column unless we've already got it
+          if key_alias && !used_col_aliases.key?(key_alias)
+            selects << "#{_br_quoted_name(key_tbl_name)}.#{_br_quoted_name(dest_pk)} AS #{_br_quoted_name(key_alias)}"
+            used_col_aliases[key_alias] = nil
+          end
+          cc[2] = key_alias ? [key_klass, key_alias] : nil
         end
-        cc[2] = key_alias ? [key_klass, key_alias] : nil
       end
 
       # LEFT OUTER JOINs
@@ -751,7 +761,7 @@ module ActiveRecord
               # %%% Strangely in Rails 7.1 on a slower system then very rarely brick_link comes back nil...
               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.
+                # ... so if it is nil then here's a best-effort guess as to what the table name might be.
                 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 && brick_links.values.include?(field_tbl_name)
@@ -1022,9 +1032,10 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
       selects << 'customer_id' if klass.name == 'Pay::Subscription' && Pay::Subscription.columns_hash.key?('customer_id')
 
       pieces, my_dsl = klass.brick_parse_dsl(join_array = ::Brick::JoinArray.new, [], translations = {}, false, nil, true)
-      brick_select(
+      _brick_querying(
         selects, where_values_hash, nil, translations: translations, join_array: join_array,
-        cust_col_override: { '_br' => (descrip_cols = [pieces, my_dsl]) }
+        cust_col_override: { '_br' => (descrip_cols = [pieces, my_dsl]) },
+        brick_col_names: true
       )
       order_values = "#{_br_quoted_name(klass.table_name)}.#{_br_quoted_name(klass.primary_key)}"
       [self.select(selects), descrip_cols]
@@ -2246,9 +2257,10 @@ class Object
 
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? real_model.preload : real_model.all
             params['_brick_is_api'] = true if (is_api = request.format == :js || current_api_root)
-            @_brick_params = ar_relation.brick_select((selects ||= []), params: params, order_by: order_by,
-                                                      translations: (translations = {}),
-                                                      join_array: (join_array = ::Brick::JoinArray.new))
+            @_brick_params = ar_relation._brick_querying((selects ||= []), params: params, order_by: order_by,
+                                                         translations: (translations = {}),
+                                                         join_array: (join_array = ::Brick::JoinArray.new),
+                                                         brick_col_names: true)
 
             if is_api # Asking for JSON?
               # Apply column renaming
@@ -2342,7 +2354,7 @@ class Object
           _, order_by_txt = model._brick_calculate_ordering(default_ordering(table_name, pk, true)) if pk
           code << "  def index\n"
           code << "    @#{plural_table_name} = #{model.name}#{pk&.present? ? ".order(#{order_by_txt.join(', ')})" : '.all'}\n"
-          code << "    @#{plural_table_name}.brick_select(params)\n"
+          code << "    @#{plural_table_name}._brick_querying(params, brick_col_names: true)\n"
           code << "  end\n"
 
           is_pk_string = nil

data/lib/brick/version_number.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.209
+  version: 1.0.210
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-03-22 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.2.33
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone