brick 1.0.81 → 1.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2627490165a63200a49afb7707882489986217bc170491e88f64eb9faf880b6b
-  data.tar.gz: f12adff07785ffd5c4a877f555cd7899de859f99ae9b18b84eda6f3d20ac5c15
+  metadata.gz: 74df340edd3b41626ea7f72409064b27ae10ddfd6eb41dd66ecc6704044156bd
+  data.tar.gz: 82181c7ffe7a26b6ab02bfc4faaedf031d78e5e4880f6316e1ea2143da8a9655
 SHA512:
-  metadata.gz: f112e1bf44fc39e80bced64a2d9fb4dd16297e2c549f66d0842fb65d7f3644170fa18c3c784c59c5a93db57233a77bfa5f288dca89be1b3dec6172bb670f147b
-  data.tar.gz: 0c2061b9b662c00aeb85a76db20fb59962302dd8b6ab17225ded332eadf4485392e3f5e44538b8f99d525666b8a036bb2fbd53a2604bbf7f69aca3ad8400fa4d
+  metadata.gz: 644d3d343e774f8682a575c8fad849c27ee60c279e30a689874b608f056b1aee39a936ec85e91878d2200deeaf49ad78188866b6548ccf6dae43fbadbe80752a
+  data.tar.gz: '09f1f3383f9db0f3519215bb372a238478a0ae5176090bd2992a4f43f6e41b8aaef9f2a449573413ee886cc08cd94b868e0ec81a822b20d8dd0cc9e4eebf635e'

data/lib/brick/extensions.rb

@@ -59,6 +59,10 @@ end
 
 module ActiveRecord
   class Base
+    def self.is_brick?
+      instance_variables.include?(:@_brick_built) && instance_variable_get(:@_brick_built)
+    end
+
     def self._assoc_names
       @_assoc_names ||= {}
     end
@@ -521,7 +525,7 @@ module ActiveRecord
         # CUSTOM COLUMNS
         # ==============
         klass._br_cust_cols.each do |k, cc|
-          if respond_to?(k) # Name already taken?
+          if rel_dupe.respond_to?(k) # Name already taken?
             # %%% Use ensure_unique here in this kind of fashion:
             # cnstr_name = ensure_unique(+"(brick) #{for_tbl}_#{pri_tbl}", bts, hms)
             # binding.pry
@@ -641,11 +645,13 @@ module ActiveRecord
                            [a.table_name, a.foreign_key, a.source_reflection.macro]
                          end
                          next if bail_out
+
                          # count_column is determined from the originating HMT member
                          if (src_ref = hm.source_reflection).nil?
                            puts "*** Warning:  Could not determine destination model for this HMT association in model #{klass.name}:\n  has_many :#{hm.name}, through: :#{hm.options[:through]}"
+                           puts
                            nix << k
-                           bail_out = true
+                           next
                          elsif src_ref.macro == :belongs_to # Traditional HMT using an associative table
                            "br_t#{idx}.#{hm.foreign_key}"
                          else # A HMT that goes HM -> HM, something like Categories -> Products -> LineItems
@@ -676,15 +682,15 @@ module ActiveRecord
                          pri_tbl.table_name
                        end
         on_clause = []
-        if fk_col.is_a?(Array) # Composite key?
-          fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_tbl.primary_key[idx]}" }
-          selects = fk_col.dup
-        else
-          selects = [fk_col]
-          on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_tbl.primary_key}"
-        end
+        hm_selects = if fk_col.is_a?(Array) # Composite key?
+                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_tbl.primary_key[idx]}" }
+                       fk_col.dup
+                     else
+                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_tbl.primary_key}"
+                       [fk_col]
+                     end
         if poly_type
-          selects << poly_type
+          hm_selects << poly_type
           on_clause << "#{tbl_alias}.#{poly_type} = '#{name}'"
         end
         unless from_clause
@@ -696,9 +702,9 @@ module ActiveRecord
                             hm.table_name
                           end
         end
-        group_bys = ::Brick.is_oracle || is_mssql ? selects : (1..selects.length).to_a
+        group_bys = ::Brick.is_oracle || is_mssql ? hm_selects : (1..hm_selects.length).to_a
         join_clause = "LEFT OUTER
-JOIN (SELECT #{selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', ')}, COUNT(#{'DISTINCT ' if hm.options[:through]}#{count_column
+JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', ')}, COUNT(#{'DISTINCT ' if hm.options[:through]}#{count_column
           }) AS c_t_ FROM #{from_clause || hm_table_name} GROUP BY #{group_bys.join(', ')}) #{tbl_alias}"
         joins!("#{join_clause} ON #{on_clause.join(' AND ')}")
       end
@@ -735,8 +741,10 @@ JOIN (SELECT #{selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', ')},
             else
               s << v
             end
-          else # String stuff just comes straight through
+          else # String stuff (which defines a custom ORDER BY) just comes straight through
             s << v
+            # Avoid "PG::InvalidColumnReference: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list" in Postgres
+            selects << v if is_distinct
           end
         end
         order!(*final_order_by)
@@ -1138,6 +1146,7 @@ class Object
       end # class definition
       # Having this separate -- will this now work out better?
         built_model.class_exec do
+          @_brick_built = true
           hmts&.each do |hmt_fk, hms|
             hmt_fk = hmt_fk.tr('.', '_')
             hms.each do |hm|

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

@@ -130,15 +130,15 @@ module Brick
                                  next unless @_brick_model.instance_methods.include?(through) &&
                                              (associative = @_brick_model._br_associatives.fetch(hm.first, nil))
 
-                                 tbl_nm = if hm_assoc.options[:source]
-                                            associative.klass.reflect_on_association(hm_assoc.options[:source]).inverse_of&.name
+                                 tbl_nm = if (source = hm_assoc.source_reflection).macro == :belongs_to
+                                            hm_assoc.through_reflection&.name # for standard HMT, which is HM -> BT
                                           else
-                                            associative.name
+                                            source.inverse_of&.name # For HM -> HM style HMT
                                           end
                                  # If there is no inverse available for the source belongs_to association, make one based on the class name
                                  unless tbl_nm
                                    tbl_nm = associative.class_name.underscore
-                                   tbl_nm.slice!(0) if tbl_nm[0] == ('/')
+                                   tbl_nm.slice!(0) if tbl_nm[0] == '/'
                                    tbl_nm = tbl_nm.tr('/', '_').pluralize
                                  end
                                  "'#{tbl_nm}.#{associative.foreign_key}'"
@@ -1331,10 +1331,18 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
             prepend ::Brick::RouteSet
           end
           # Do the root route before the Rails Welcome one would otherwise take precedence
-          unless (route = ::Brick.config.default_route_fallback).blank? ||
-                 ::Rails.application.routes.named_routes.send(:routes)[:root]
-            ::Rails.application.routes.append do
-              send(:root, "#{route}#{'#index' unless route.index('#')}")
+          if (route = ::Brick.config.default_route_fallback).present?
+            action = "#{route}#{'#index' unless route.index('#')}"
+            if ::Brick.config.path_prefix
+              ::Rails.application.routes.append do
+                send(:namespace, ::Brick.config.path_prefix) do
+                  send(:root, action)
+                end
+              end
+            elsif ::Rails.application.routes.named_routes.send(:routes)[:root].nil?
+              ::Rails.application.routes.append do
+                send(:root, action)
+              end
             end
           end
         end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -113,15 +113,15 @@ if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') }
   require 'brick/frameworks/rails'
 end
 module Brick
-  def self.sti_models
-    @sti_models ||= {}
-  end
+  class << self
+    def sti_models
+      @sti_models ||= {}
+    end
 
-  def self.existing_stis
-    @existing_stis ||= Brick.config.sti_namespace_prefixes.each_with_object({}) { |snp, s| s[snp.first[2..-1]] = snp.last unless snp.first.end_with?('::') }
-  end
+    def existing_stis
+      @existing_stis ||= Brick.config.sti_namespace_prefixes.each_with_object({}) { |snp, s| s[snp.first[2..-1]] = snp.last unless snp.first.end_with?('::') }
+    end
 
-  class << self
     attr_accessor :default_schema, :db_schemas, :routes_done, :is_oracle, :is_eager_loading, :auto_models
 
     def set_db_schema(params = nil)
@@ -203,11 +203,9 @@ module Brick
       skip_hms = {}
       hms.each do |hmt|
         if (through = hmt.last.options[:through])
-          skip_hms[through] = nil # if hms[through]
-          # binding.pry if !hms[through]
+          # ::Brick.relations[hmt.last.through_reflection.table_name]
+          skip_hms[through] = nil if hms[through] && model.is_brick?
           # End up with a hash of HMT names pointing to join-table associations
-          # Last part was:  hmt.last.name
-          # Changed up because looking for:  hms[:issue_issue_duplicates]
           model._br_associatives[hmt.first] = hms[through] # || hms["#{(opt = hmt.last.options)[:through].to_s.singularize}_#{opt[:source].to_s.pluralize}".to_sym]
         elsif hmt.last.inverse_of.nil?
           puts "SKIPPING #{hmt.last.name.inspect}"

data/lib/generators/brick/install_generator.rb

@@ -298,7 +298,9 @@ if Object.const_defined?('Brick')
   # # route to go to the :index action for what would be a controller for that table.  You can specify any controller
   # # name and action you wish in order to override this and have that be the default route when none other has been
   # # specified in routes.rb or elsewhere.  (Or just use an empty string in order to disable this behaviour.)
-  # Brick.default_route_fallback = 'customers' # This defaults to \"customers#index\"
+  # This defaults to \"customers#index\", and if there was also a prefix set called \"admin\" then it would instead
+  # go to \"admin/customers#index\".
+  # Brick.default_route_fallback = 'customers'
   # Brick.default_route_fallback = 'orders#outstanding' # Example of a non-RESTful route
   # Brick.default_route_fallback = '' # Omits setting a default route in the absence of any other
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.81
+  version: 1.0.82
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord