brick 1.0.240 → 1.0.242

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9305066dea63f3492fab7147dd3ae0ce1b6e3b12a444a66bbf4dfd164c4d024
-  data.tar.gz: bc5ad1f8ddbae015ccb3954cd632f7fe7ca50e3349575e7b7995dd74b4339939
+  metadata.gz: 1e28a33c378751e44778744e81bd2841b6bdd61d06587860b2a5f9bccccbaa85
+  data.tar.gz: 13f3272c5f8eabac2fb7c9253a1ce499fd2dd208d468b048e60c2542f3456eb9
 SHA512:
-  metadata.gz: ff606a5af0257fac32914e1891a0977d770866394396ccbcf1993b0898bedad4612f18bc00fdb45da175cd9a9aee28304b51d920d5a6d574e9be5c09db4e970f
-  data.tar.gz: c253b9d7976a25d9bd4beab9b8cc3eb1bf18d3238139af6763d14c3de40641ec1538337b8896eb6717cb5a41f2dc02c97cbcbcce1098e401d6eae86ccc73623f
+  metadata.gz: b7f7c82a56a1097cd710a27f229988949e2327f9de6539302acd05a15ceea61d01b2960d98e9708fa823c24022509258ef2879b41c700822f1d8769c5734792a
+  data.tar.gz: 679dc5f6151313ef1d7bcd9912cbe4770741c5d03a7c3a29a1d139e72f96cdf778d096fffbf2018c80b8148a91310127a184072d0a63f07905c67c157a9d3e55

data/lib/brick/extensions.rb

@@ -661,6 +661,8 @@ module ActiveRecord
 
       is_distinct = nil
       wheres = {}
+      params = params.to_unsafe_h unless params.is_a?(Hash)
+      params.merge!(args[1]) if args[1]
       params.each do |k, v|
         k = k.to_s # Rails < 4.2 comes in as a symbol
         next unless k.start_with?('__')
@@ -1048,7 +1050,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
                                [brick_links[v_parts[0..-2].join('.')].split('.').last]
                              end
           tbl_and_col_name << v_parts.last
-          if ['>', '<'].include?(first_char = v.last.first[0]) # Greater than or less than?
+          if v.last.is_a?(String) && ['>', '<'].include?(first_char = v.last.first[0]) # Greater than or less than?
             col_name = v.last.first[1..-1]
             col_name = "'#{col_name}'" unless [:integer, :boolean, :decimal, :float].include?(klass.columns_hash[v.first].type)
             where_comparisons << "#{tbl_and_col_name.join('.')} #{first_char} #{col_name}"
@@ -1120,7 +1122,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
     end
 
     # Build out an AR relation that queries for a list of objects, and include all the appropriate JOINs to later apply DSL using #brick_descrip
-    def brick_list
+    def brick_list(wheres = nil)
       selects = klass._pk_as_array.each_with_object([]) { |pk, s| s << pk unless s.include?(pk) }
       # Get foreign keys for anything marked to be auto-preloaded, or a self-referencing JOIN
       klass_cols = klass.column_names
@@ -1139,6 +1141,9 @@ 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)
+      if wheres
+        where_values_hash = (where_values_hash || {}).merge(wheres)
+      end
       _brick_querying(
         selects, where_values_hash, nil, translations: translations, join_array: join_array,
         cust_col_override: { '_br' => (descrip_cols = [pieces, my_dsl]) },
@@ -1803,8 +1808,8 @@ class Object
           # No primary key, but is there anything UNIQUE?
           # (Sort so that if there are multiple UNIQUE constraints we'll pick one that uses the least number of columns.)
           our_pks = relation[:ukeys].values.sort { |a, b| a.length <=> b.length }.first unless our_pks&.present?
-          if has_pk
-            code << "  # Primary key: #{_brick_primary_key.join(', ')}\n" unless _brick_primary_key == ['id']
+          if has_pk && _brick_primary_key != ['id']
+            code << "  # Primary key: #{_brick_primary_key.join(', ')}\n"
           elsif our_pks&.present?
             pk_mutator = if respond_to?(:'primary_keys=')
                            'primary_keys=' # Using the composite_primary_keys gem

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 240
+    TINY = 242
 
     # 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.240
+  version: 1.0.242
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-27 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord