brick 1.0.133 → 1.0.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6804b443d939d24da85968d5b75c4c0603c8880dcc5ab4d07b20be0a52e5a349
-  data.tar.gz: 17ed154ec5f8ec1f351a83120673e9354f892217da76957fdc49a31e663e9eba
+  metadata.gz: 28451931f3f43343f010a14d83dd3ed2d4c2fc80e61234d5a96775dd16ff4f11
+  data.tar.gz: aeb7327ab42e4252d60ec92bc25d93c778fe15d83744b830aad7673d833c3e75
 SHA512:
-  metadata.gz: 1b4e53fe24d3de942a7388453d6ee732b0263097b08cbed104d7499842ffaa4eb7239b1bdb81b7300d08df9a628b2a99aad74f47de1fd3579b1eefbf0382b18a
-  data.tar.gz: 3eb38e2a8f1e5c12493ff6e3a524d42157dcae2781d6d39f339d098b04b12d936989f3974977df589419ca04663a4c27f6b7425e09b9695817d9103fb7fd543f
+  metadata.gz: bd85040932260d4a6d68eb46a0406cdbce355a3beb793fa8b56fca51228f4227c430b44fdb7852a8280894720220af4e6564775dfd474bbecf722749909779c3
+  data.tar.gz: f4f34d81eab0bf2922c888d618dd1e115f605132578627f7a16c39420d78a574bf63b2fd3e4d3a9278ceab52c4abba6bbc16bf1884dfd4183c0473c8943e42ca

data/lib/brick/extensions.rb

@@ -388,18 +388,42 @@ module ActiveRecord
                      order_by_txt&.<<("Arel.sql(#{ord_expr})")
                      s << Arel.sql(ord_expr)
                    else # Expecting only Symbol
-                     if _br_hm_counts.key?(ord_part)
-                       ord_part = "\"b_r_#{ord_part}_ct\""
-                     elsif !_br_bt_descrip.key?(ord_part) && !_br_cust_cols.key?(ord_part) && !column_names.include?(ord_part.to_s)
+                     ord_part = ord_part.to_s
+                     if ord_part[0] == '-' # First char '-' means descending order
+                       ord_part.slice!(0)
+                       is_desc = true
+                     end
+                     if ord_part[0] == '~' # Char '~' means order NULLs as highest values instead of lowest
+                       ord_part.slice!(0)
+                       # (Unfortunately SQLServer does not support NULLS FIRST / NULLS LAST, so leave them out.)
+                       is_nulls_switch = case ActiveRecord::Base.connection.adapter_name
+                                         when 'PostgreSQL', 'OracleEnhanced', 'SQLite'
+                                           :pg
+                                         when 'Mysql2', 'Trilogy'
+                                           :mysql
+                                         end
+                     end
+                     if _br_hm_counts.key?(ord_part_sym = ord_part.to_sym)
+                       ord_part = +"\"b_r_#{ord_part}_ct\""
+                     elsif _br_bt_descrip.key?(ord_part_sym)
+                       ord_part = _br_bt_descrip.fetch(ord_part_sym, nil)&.first&.last&.first&.last&.dup
+                     elsif !_br_cust_cols.key?(ord_part_sym) && !column_names.include?(ord_part)
                        # Disallow ordering by a bogus column
                        # %%% Note this bogus entry so that Javascript can remove any bogus _brick_order
                        # parameter from the querystring, pushing it into the browser history.
                        ord_part = nil
                      end
+
                      if ord_part
-                       # Retain any reference to a bt_descrip as being a symbol
-                       # Was:  "#{quoted_table_name}.\"#{ord_part}\""
-                       order_by_txt&.<<(_br_bt_descrip.key?(ord_part) ? ord_part : ord_part.inspect)
+                       ord_part << ' DESC' if is_desc
+                       ord_part << (is_desc ? ' NULLS LAST' : ' NULLS FIRST') if is_nulls_switch == :pg
+                       ord_part.insert(0, '-') if is_nulls_switch == :mysql
+
+                       order_by_txt&.<<("Arel.sql(#{ord_part.inspect})")
+
+                       # # Retain any reference to a bt_descrip as being a symbol
+                       # # Was:  "#{quoted_table_name}.\"#{ord_part}\""
+                       # order_by_txt&.<<(_br_bt_descrip.key?(ord_part) ? ord_part : ord_part.inspect)
                        s << ord_part
                      end
                    end
@@ -670,7 +694,6 @@ module ActiveRecord
       # Add derived table JOIN for the has_many counts
       nix = []
       klass._br_hm_counts.each do |k, hm|
-        num_bt_things = 0
         count_column = if hm.options[:through]
                          # Build the chain of JOINs going to the final destination HMT table
                          # (Usually just one JOIN, but could be many.)
@@ -691,7 +714,11 @@ module ActiveRecord
                          # Turn the last member of link_back into a foreign key
                          link_back << hmt_assoc.source_reflection.foreign_key
                          # If it's a HMT based on a HM -> HM, must JOIN the last table into the mix at the end
-                         through_sources.push(hm.source_reflection) unless hm.source_reflection.belongs_to?
+                         this_hm = hm
+                         while !(src_ref = this_hm.source_reflection).belongs_to? && (thr = src_ref.options[:through])
+                           through_sources.push(this_hm = src_ref.active_record.reflect_on_association(thr))
+                         end
+                         through_sources.push(src_ref) unless src_ref.belongs_to?
                          from_clause = +"#{through_sources.first.table_name} br_t0"
                          fk_col = through_sources.shift.foreign_key
 
@@ -700,9 +727,7 @@ module ActiveRecord
                          through_sources.map do |a|
                            from_clause << "\n LEFT OUTER JOIN #{a.table_name} br_t#{idx += 1} "
                            from_clause << if (src_ref = a.source_reflection).macro == :belongs_to
-                                            nm = hmt_assoc.source_reflection.inverse_of&.name
-                                            link_back << nm
-                                            num_bt_things += 1
+                                            link_back << (nm = hmt_assoc.source_reflection.inverse_of&.name)
                                             # puts "BT #{a.table_name}"
                                             "ON br_t#{idx}.#{a.active_record.primary_key} = br_t#{idx - 1}.#{a.foreign_key}"
                                           elsif src_ref.options[:as]
@@ -723,9 +748,8 @@ module ActiveRecord
                                             end
                                           else # Standard has_many or has_one
                                             # puts "HM #{a.table_name}"
-                                            # binding.pry unless (
                                             nm = hmt_assoc.source_reflection.inverse_of&.name
-                                            # )
+                                            # binding.pry unless nm
                                             link_back << nm # if nm
                                             "ON br_t#{idx}.#{a.foreign_key} = br_t#{idx - 1}.#{a.active_record.primary_key}"
                                           end
@@ -742,16 +766,8 @@ module ActiveRecord
                            nix << k
                            next
                          elsif src_ref.macro == :belongs_to # Traditional HMT using an associative table
-                           # binding.pry if link_back.length > 2
                            "br_t#{idx}.#{hm.foreign_key}"
                          else # A HMT that goes HM -> HM, something like Categories -> Products -> LineItems
-                           # %%% Currently flaky, so will revisit this soon, probably while implementing the whole link_back architecture
-                           if num_bt_things > 1
-                             # binding.pry
-                             nix << k
-                             next
-                           end
-
                            "br_t#{idx}.#{src_ref.active_record.primary_key}"
                          end
                        else
@@ -845,7 +861,8 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
       # or custom columns as they must be expanded to find the corresponding b_r_model__column
       # or br_cc_column naming for each.
       if order_by.present?
-        final_order_by = *order_by.each_with_object([]) do |v, s|
+        order_by, _ = klass._brick_calculate_ordering(order_by, true) # Don't do the txt part
+        final_order_by = order_by.each_with_object([]) do |v, s|
           if v.is_a?(Symbol)
             # Add the ordered series of columns derived from the BT based on its DSL
             if (bt_cols = klass._br_bt_descrip[v])
@@ -1140,7 +1157,7 @@ Module.class_exec do
                base_module.const_set(schema_name.to_sym, (built_module = Module.new))
 
                [built_module, "module #{schema_name}; end\n"]
-               #  # %%% Perhaps an option to use the first module just as schema, and additional modules as namespace with a table name prefix applied
+               # %%% Perhaps an option to use the first module just as schema, and additional modules as namespace with a table name prefix applied
 
              # AVO Resource
              elsif base_module == Object && Object.const_defined?('Avo') && requested.end_with?('Resource') &&
@@ -1786,8 +1803,7 @@ class Object
 
             # %%% Allow params to define which columns to use for order_by
             # Overriding the default by providing a querystring param?
-            ordering = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
-            order_by, _ = real_model._brick_calculate_ordering(ordering, true) # Don't do the txt part
+            order_by = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
 
             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)

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

@@ -1711,9 +1711,9 @@ end
           <tr><td>(none)</td></tr>
      <% else
           collection2.each do |#{hm_singular_name}| %>
-            <tr><td><%= br_descrip ||= #{hm_singular_name}.brick_descrip(
-                                         descrip_cols&.first&.map { |col| #{hm_singular_name}.send(col.last) }
-                                       )
+            <tr><td><%= br_descrip = #{hm_singular_name}.brick_descrip(
+                                       descrip_cols&.first&.map { |col| #{hm_singular_name}.send(col.last) }
+                                     )
                         link_to(br_descrip, #{hm.first.klass._brick_index(:singular)}_path(slashify(#{obj_pk}))) %></td></tr>
           <% end %>
         <% end %>

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 133
+    TINY = 135
 
     # 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.133
+  version: 1.0.135
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord