brick 1.0.45 → 1.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678e1295006174594606dc731cd650afa60d2cc727be08bd416c9503faeb1ca4
-  data.tar.gz: b00802df45b7e388523b29cfab38feaaaf7c61d057cf509c71a6a08860373b15
+  metadata.gz: c9c3989f395bc81df36b3f295c72029e92911bd24f8d146db5627fb29c1875f4
+  data.tar.gz: 97ae12a1562f9f9bae5f401016e219a5ad58218068f80d7fc0e732d61c4f3f90
 SHA512:
-  metadata.gz: 7962bbc61bd43b68062d188ac3565e38f4840d52ca76b4c675e0da55d213104f13e007578658441359323899ed881d10497bb8285384abe42a2d15bd9c26b64b
-  data.tar.gz: 449e74d3ab9558eed77c89aac5a871927ed0842fc043c910d04d1cca29221508332a7def78940ed67048a29e4384576aa8a176beb117c0bc7ff8a48a87f64af6
+  metadata.gz: c64d02f90b992640698523190a920467204a2fbb40fb9e21a3e7872ae469db3506bdf7fb535e54cd33157feb93ed43c2d1c11b2bea952bc9f034ac7e7dfb6b06
+  data.tar.gz: 6c01156b2b35f387e531ed6835a7517f5249b72ec53bb23d5d965c4b298a443d9a62e5694f9c1b4587f6ab04ef30590d7d9077e13c66b651ee8ed12b76282932

data/lib/brick/extensions.rb

@@ -353,7 +353,6 @@ module ActiveRecord
           next if bt[2] # Polymorphic?
 
           # join_array will receive this relation name when calling #brick_parse_dsl
-          # binding.pry if bt.length > 2
           bt_descrip[bt.first] = if bt[1].is_a?(Array)
                                    bt[1].each_with_object({}) { |bt_class, s| s[bt_class] = bt_class.brick_parse_dsl(join_array, bt.first, translations, true) }
                                  else
@@ -597,7 +596,7 @@ Module.class_exec do
                # See if a file is there in the same way that ActiveSupport::Dependencies#load_missing_constant
                # checks for it in ~/.rvm/gems/ruby-2.7.5/gems/activesupport-5.2.6.2/lib/active_support/dependencies.rb
 
-               if (base_model = ::Brick.config.sti_namespace_prefixes&.fetch("::#{name}::", nil)&.constantize) || # Are we part of an auto-STI namespace? ...
+               if (base_model = ::Brick.config.sti_namespace_prefixes&.fetch("::#{self.name}::", nil)&.constantize) || # Are we part of an auto-STI namespace? ...
                   self != Object # ... or otherwise already in some namespace?
                  schema_name = [(singular_schema_name = name.underscore),
                                 (schema_name = singular_schema_name.pluralize),
@@ -620,7 +619,7 @@ Module.class_exec do
                               else
                                 ActiveSupport::Inflector.pluralize(singular_table_name)
                               end
-                 if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+                 if ::Brick.apartment_multitenant &&
                     Apartment.excluded_models.include?(table_name.singularize.camelize)
                    schema_name = Apartment.default_schema
                  end
@@ -655,7 +654,7 @@ class Object
   private
 
     def build_model(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
-      if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+      if ::Brick.apartment_multitenant &&
          schema_name == Apartment.default_schema
         relation = relations["#{schema_name}.#{matching}"]
       end
@@ -666,7 +665,7 @@ class Object
                                       schema_name
                                     else
                                       matching = "#{schema_name}.#{matching}"
-                                      (Brick.db_schemas[schema_name] ||= self.const_get(schema_name.singularize.camelize))
+                                      (Brick.db_schemas[schema_name] ||= self.const_get(schema_name.camelize))
                                     end
                     "#{schema_module&.name}::#{inheritable_name || model_name}"
                   end
@@ -774,33 +773,47 @@ class Object
       end # class definition
       # Having this separate -- will this now work out better?
         built_model.class_exec do
-          hmts&.each do |hmt_fk, fks|
+          hmts&.each do |hmt_fk, hms|
             hmt_fk = hmt_fk.tr('.', '_')
-            fks.each do |fk|
-              # %%% Will not work with custom has_many name
-              through = ::Brick.config.schema_behavior[:multitenant] ? fk.first[:assoc_name] : fk.first[:inverse_table].tr('.', '_').pluralize
-              hmt_name = if fks.length > 1
-                           if fks[0].first[:inverse][:assoc_name] == fks[1].first[:inverse][:assoc_name] # Same BT names pointing back to us? (Most common scenario)
-                             "#{hmt_fk}_through_#{fk.first[:assoc_name]}"
+            hms.each do |hm|
+              # %%% Need to confirm that HMTs work when they are built from has_manys with custom names
+              through = ::Brick.config.schema_behavior[:multitenant] ? hm.first[:assoc_name] : hm.first[:inverse_table].tr('.', '_').pluralize
+              options = {}
+              hmt_name = if hms.length > 1
+                           if hms[0].first[:inverse][:assoc_name] == hms[1].first[:inverse][:assoc_name] # Same BT names pointing back to us? (Most common scenario)
+                             "#{hmt_fk}_through_#{hm.first[:assoc_name]}"
                            else # Use BT names to provide uniqueness
-                             through = fk.first[:alternate_name].pluralize
-                             singular_assoc_name = fk.first[:inverse][:assoc_name].singularize
+                             if self.name.underscore.singularize == hm.first[:alternate_name]
+                              #  Has previously been:
+                              # # If it folds back on itself then look at the other side
+                              # # (At this point just infer the source be the inverse of the first has_many that
+                              # # we find that is not ourselves.  If there are more than two then uh oh, can't
+                              # # yet handle that rare circumstance!)
+                              # other = hms.find { |hm1| hm1 != hm } # .first[:fk]
+                              # options[:source] = other.first[:inverse][:assoc_name].to_sym
+                              #  And also has been:
+                              # hm.first[:inverse][:assoc_name].to_sym
+                               options[:source] = hm.last.to_sym
+                             else
+                               through = hm.first[:alternate_name].pluralize
+                             end
+                             singular_assoc_name = hm.first[:inverse][:assoc_name].singularize
                              "#{singular_assoc_name}_#{hmt_fk}"
                            end
                          else
                            hmt_fk
                          end
-              options = { through: through.to_sym }
+              options[:through] = through.to_sym
               if relation[:fks].any? { |k, v| v[:assoc_name] == hmt_name }
-                hmt_name = "#{hmt_name.singularize}_#{fk.first[:assoc_name]}"
+                hmt_name = "#{hmt_name.singularize}_#{hm.first[:assoc_name]}"
                 # Was:
-                # options[:class_name] = fk.first[:inverse_table].singularize.camelize
-                # options[:foreign_key] = fk.first[:fk].to_sym
-                far_assoc = relations[fk.first[:inverse_table]][:fks].find { |_k, v| v[:assoc_name] == fk.last }
+                # options[:class_name] = hm.first[:inverse_table].singularize.camelize
+                # options[:foreign_key] = hm.first[:fk].to_sym
+                far_assoc = relations[hm.first[:inverse_table]][:fks].find { |_k, v| v[:assoc_name] == hm.last }
                 options[:class_name] = far_assoc.last[:inverse_table].singularize.camelize
                 options[:foreign_key] = far_assoc.last[:fk].to_sym
               end
-              options[:source] = fk.last.to_sym unless hmt_name.singularize == fk.last
+              options[:source] ||= hm.last.to_sym unless hmt_name.singularize == hm.last
               code << "  has_many :#{hmt_name}#{options.map { |opt| ", #{opt.first}: #{opt.last.inspect}" }.join}\n"
               self.send(:has_many, hmt_name.to_sym, **options)
             end
@@ -831,13 +844,13 @@ class Object
                   need_fk = "#{assoc_name}_id" != assoc[:fk]
                 end
                 if (inverse = assoc[:inverse])
-                  inverse_assoc_name, _x = _brick_get_hm_assoc_name(relations[inverse_table], inverse)
                   # If it's multitenant with something like:  public.____ ...
                   if (it_parts = inverse_table.split('.')).length > 1 &&
-                     ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+                     ::Brick.apartment_multitenant &&
                      it_parts.first == Apartment.default_schema
                     it_parts.shift # ... then ditch the generic schema name
                   end
+                  inverse_assoc_name, _x = _brick_get_hm_assoc_name(relations[inverse_table], inverse, it_parts.join('_').singularize)
                   has_ones = ::Brick.config.has_ones&.fetch(it_parts.join('/').singularize.camelize, nil)
                   if has_ones&.key?(singular_inv_assoc_name = ActiveSupport::Inflector.singularize(inverse_assoc_name.tr('.', '_')))
                     inverse_assoc_name = if has_ones[singular_inv_assoc_name]
@@ -1085,9 +1098,9 @@ class Object
       [built_controller, code]
     end
 
-    def _brick_get_hm_assoc_name(relation, hm_assoc)
+    def _brick_get_hm_assoc_name(relation, hm_assoc, source = nil)
       if (relation[:hm_counts][hm_assoc[:assoc_name]]&.> 1) &&
-         hm_assoc[:alternate_name] != hm_assoc[:inverse][:assoc_name]
+         hm_assoc[:alternate_name] != (source || name.underscore)
         plural = ActiveSupport::Inflector.pluralize(hm_assoc[:alternate_name])
         new_alt_name = (hm_assoc[:alternate_name] == name.underscore) ? "#{hm_assoc[:assoc_name].singularize}_#{plural}" : plural
         # uniq = 1
@@ -1129,7 +1142,8 @@ module ActiveRecord::ConnectionHandling
       end
       # Load the initializer for the Apartment gem a little early so that if .excluded_models and
       # .default_schema are specified then we can work with non-tenanted models more appropriately
-      if Object.const_defined?('Apartment') && File.exist?(apartment_initializer = Rails.root.join('config/initializers/apartment.rb'))
+      apartment = Object.const_defined?('Apartment')
+      if apartment && File.exist?(apartment_initializer = Rails.root.join('config/initializers/apartment.rb'))
         load apartment_initializer
         apartment_excluded = Apartment.excluded_models
       end
@@ -1332,17 +1346,20 @@ module ActiveRecord::ConnectionHandling
       end
     end
 
-    apartment = Object.const_defined?('Apartment') && Apartment
     tables = []
     views = []
     relations.each do |k, v|
       name_parts = k.split('.')
+      idx = 1
+      name_parts = name_parts.map do |x|
+        ((idx += 1) < name_parts.length ? x.singularize : x).camelize
+      end
       if v.key?(:isView)
         views
       else
         name_parts.shift if apartment && name_parts.length > 1 && name_parts.first == Apartment.default_schema
         tables
-      end << name_parts.map { |x| x.singularize.camelize }.join('::')
+      end << name_parts.join('::')
     end
     unless tables.empty?
       puts "\nClasses that can be built from tables:"
@@ -1424,7 +1441,7 @@ module Brick
       unless (cnstr_name = fk[5])
         # For any appended references (those that come from config), arrive upon a definitely unique constraint name
         pri_tbl = is_class ? fk[4][:class].underscore : pri_tbl
-        pri_tbl = "#{bt_assoc_name}_#{pri_tbl}" if pri_tbl.singularize != bt_assoc_name
+        pri_tbl = "#{bt_assoc_name}_#{pri_tbl}" if pri_tbl&.singularize != bt_assoc_name
         cnstr_base = cnstr_name = "(brick) #{for_tbl}_#{pri_tbl}"
         cnstr_added_num = 1
         cnstr_name = "#{cnstr_base}_#{cnstr_added_num += 1}" while bts&.key?(cnstr_name) || hms&.key?(cnstr_name)
@@ -1450,6 +1467,8 @@ module Brick
           return
         end
       end
+      return unless bts # Rails 5.0 and older can have bts end up being nil
+
       if (assoc_bt = bts[cnstr_name])
         if is_polymorphic
           # Assuming same fk (don't yet support composite keys for polymorphics)

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

@@ -105,13 +105,26 @@ module Brick
                 hms_columns = [] # Used for 'index'
                 skip_klass_hms = ::Brick.config.skip_index_hms[model_name] || {}
                 hms_headers = hms.each_with_object([]) do |hm, s|
-                  hm_stuff = [(hm_assoc = hm.last), "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]}", (assoc_name = hm.first)]
+                  hm_stuff = [(hm_assoc = hm.last),
+                              "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]}",
+                              (assoc_name = hm.first)]
                   hm_fk_name = if hm_assoc.options[:through]
-                                associative = associatives[hm_assoc.name]
-                                associative && "'#{associative.name}.#{associative.foreign_key}'"
-                              else
-                                hm_assoc.foreign_key
-                              end
+                                 associative = associatives[hm.first]
+                                 tbl_nm = if hm_assoc.options[:source]
+                                            associative.klass.reflect_on_association(hm_assoc.options[:source]).inverse_of&.name
+                                          else
+                                            associative.name
+                                          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 = tbl_nm.tr('/', '_').pluralize
+                                 end
+                                 "'#{tbl_nm}.#{associative.foreign_key}'"
+                               else
+                                 hm_assoc.foreign_key
+                               end
                   case args.first
                   when 'index'
                     hms_columns << if hm_assoc.macro == :has_many
@@ -149,7 +162,7 @@ module Brick
               schema_options = ::Brick.db_schemas.keys.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
               # %%% If we are not auto-creating controllers (or routes) then omit by default, and if enabled anyway, such as in a development
               # environment or whatever, then get either the controllers or routes list instead
-              apartment_default_schema = ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') && Apartment.default_schema
+              apartment_default_schema = ::Brick.apartment_multitenant && Apartment.default_schema
               table_options = (::Brick.relations.keys - ::Brick.config.exclude_tables).map do |tbl|
                                 if (tbl_parts = tbl.split('.')).first == apartment_default_schema
                                   tbl = tbl_parts.last
@@ -218,9 +231,6 @@ table tbody tr.active-row {
   color: #009879;
 }
 
-td.val {
-  display: block;
-}
 a.show-arrow {
   font-size: 1.5em;
   text-decoration: none;
@@ -266,7 +276,6 @@ input+svg.revert {
   background-color: #004998;
   color: #FFF;
 }
-
 </style>
 <% is_includes_dates = nil
 
@@ -528,7 +537,7 @@ if (headerTop) {
        k, id = @_brick_params.first
        id = id.first if id.is_a?(Array) && id.length == 1
        origin = (key_parts = k.split('.')).length == 1 ? #{model_name} : #{model_name}.reflect_on_association(key_parts.first).klass
-       if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| puts fk.inspect; fk[:fk] == key_parts.last }) &&
+       if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| fk[:fk] == key_parts.last }) &&
           (obj = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id)) %>
          <h3>for <%= link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination.name.underscore.tr('/', '_')\}_path\".to_sym, id) %></h3><%
        end
@@ -685,7 +694,7 @@ end
       <%= k %>
     <% end %>
     </th>
-    <td class=\"val\">
+    <td>
     <% dt_pickers = { datetime: 'datetimepicker', timestamp: 'datetimepicker', time: 'timepicker', date: 'datepicker' }
     if bt
       html_options = { prompt: \"Select #\{bt_name\}\" }

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -47,7 +47,6 @@ end
 
 # Add left_outer_join! to Associations::JoinDependency and Relation::QueryMethods
 if ActiveRecord.version < ::Gem::Version.new('5')
-  is_add_left_outer_join = true
   ::Brick::Util._patch_require(
     'active_record/associations/join_dependency.rb', '/activerecord', # /associations
       ["def join_constraints(outer_joins)
@@ -140,6 +139,13 @@ module Brick
       (@relations ||= {})[ActiveRecord::Base.connection_pool.object_id] ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = {} } }
     end
 
+    def apartment_multitenant
+      if @apartment_multitenant.nil?
+        @apartment_multitenant = ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment')
+      end
+      @apartment_multitenant
+    end
+
     # If multitenancy is enabled, a list of non-tenanted "global" models
     def non_tenanted_models
       @pending_models ||= {}
@@ -168,8 +174,12 @@ module Brick
       skip_hms = {}
       associatives = hms.each_with_object({}) do |hmt, s|
         if (through = hmt.last.options[:through])
-          skip_hms[through] = nil
-          s[hmt.first] = hms[through] # End up with a hash of HMT names pointing to join-table associations
+          skip_hms[through] = nil # if hms[through]
+          # binding.pry if !hms[through]
+          # 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]
+          s[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}"
           # %%% If we don't do this then below associative.name will find that associative is nil
@@ -447,7 +457,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
         ::Brick.relations.each do |rel_name, v|
           rel_name = rel_name.split('.').map(&:underscore)
           schema_names = rel_name[0..-2]
-          schema_names.shift if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') && schema_names.first == Apartment.default_schema
+          schema_names.shift if ::Brick.apartment_multitenant && schema_names.first == Apartment.default_schema
           k = rel_name.last
           unless existing_controllers.key?(controller_name = k.pluralize)
             options = {}
@@ -477,7 +487,8 @@ require 'brick/version_number'
 # Older versions of ActiveRecord would only show more serious error information from "panic" level, which is
 # a level only available in Postgres 12 and older.  This patch will allow older and newer versions of Postgres
 # to work along with fairly old versions of Rails.
-if Object.const_defined?('PG::VERSION') && ActiveRecord.version < ::Gem::Version.new('4.2.6')
+if (is_postgres = (Object.const_defined?('PG::VERSION') || Gem::Specification.find_all_by_name('pg').present?)) &&
+   ActiveRecord.version < ::Gem::Version.new('4.2.6')
   ::Brick::Util._patch_require(
     'active_record/connection_adapters/postgresql_adapter.rb', '/activerecord', ["'panic'", "'error'"]
   )
@@ -485,13 +496,28 @@ end
 
 require 'active_record'
 require 'active_record/relation'
-require 'active_record/relation/query_methods' if is_add_left_outer_join
+# To support adding left_outer_join
+require 'active_record/relation/query_methods' if ActiveRecord.version < ::Gem::Version.new('5')
+require 'rails/railtie' if ActiveRecord.version < ::Gem::Version.new('4.2')
 
 # Rake tasks
 class Railtie < Rails::Railtie
   Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
 end
 
+# Rails < 4.2 does not have env
+module Rails
+  unless respond_to?(:env)
+    def self.env
+      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+    end
+
+    def self.env=(environment)
+      @_env = ActiveSupport::StringInquirer.new(environment)
+    end
+  end
+end
+
 # Major compatibility fixes for ActiveRecord < 4.2
 # ================================================
 ActiveSupport.on_load(:active_record) do
@@ -506,6 +532,15 @@ ActiveSupport.on_load(:active_record) do
           end
         end
       end
+      # ActiveRecord < 4.2 does not have default_timezone
+      # :singleton-method:
+      # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling
+      # dates and times from the database. This is set to :utc by default.
+      unless respond_to?(:default_timezone)
+        puts "ADDING!!! 4.w"
+        mattr_accessor :default_timezone, instance_writer: false
+        self.default_timezone = :utc
+      end
     end
 
     # Rails < 4.0 cannot do #find_by, #find_or_create_by, or do #pluck on multiple columns, so here are the patches:
@@ -711,58 +746,60 @@ ActiveSupport.on_load(:active_record) do
         end
       end
 
-      if is_add_left_outer_join
-        # Final pieces for left_outer_joins support, which was derived from this commit:
-        # https://github.com/rails/rails/commit/3f46ef1ddab87482b730a3f53987e04308783d8b
-        module Associations
-          class JoinDependency
-            def make_left_outer_joins(parent, child)
-              tables    = child.tables
-              join_type = Arel::Nodes::OuterJoin
-              info      = make_constraints parent, child, tables, join_type
-
-              [info] + child.children.flat_map { |c| make_left_outer_joins(child, c) }
-            end
+      # Final pieces for left_outer_joins support, which was derived from this commit:
+      # https://github.com/rails/rails/commit/3f46ef1ddab87482b730a3f53987e04308783d8b
+      module Associations
+        class JoinDependency
+          def make_left_outer_joins(parent, child)
+            tables    = child.tables
+            join_type = Arel::Nodes::OuterJoin
+            info      = make_constraints parent, child, tables, join_type
+
+            [info] + child.children.flat_map { |c| make_left_outer_joins(child, c) }
           end
         end
-        module Querying
-          delegate :left_outer_joins, to: :all
+      end
+      module Querying
+        delegate :left_outer_joins, to: :all
+      end
+      class Relation
+        unless MULTI_VALUE_METHODS.include?(:left_outer_joins)
+          _multi_value_methods = MULTI_VALUE_METHODS + [:left_outer_joins]
+          send(:remove_const, :MULTI_VALUE_METHODS)
+          MULTI_VALUE_METHODS = _multi_value_methods
         end
-        class Relation
-          MULTI_VALUE_METHODS = MULTI_VALUE_METHODS + [:left_outer_joins] unless MULTI_VALUE_METHODS.include?(:left_outer_joins)
+      end
+      module QueryMethods
+        attr_writer :left_outer_joins_values
+        def left_outer_joins_values
+          @left_outer_joins_values ||= []
         end
-        module QueryMethods
-          attr_writer :left_outer_joins_values
-          def left_outer_joins_values
-            @left_outer_joins_values ||= []
-          end
 
-          def left_outer_joins(*args)
-            check_if_method_has_arguments!(:left_outer_joins, args)
+        def left_outer_joins(*args)
+          check_if_method_has_arguments!(:left_outer_joins, args)
 
-            args.compact!
-            args.flatten!
+          args.compact!
+          args.flatten!
 
-            spawn.left_outer_joins!(*args)
-          end
+          spawn.left_outer_joins!(*args)
+        end
 
-          def left_outer_joins!(*args) # :nodoc:
-            self.left_outer_joins_values += args
-            self
-          end
+        def left_outer_joins!(*args) # :nodoc:
+          self.left_outer_joins_values += args
+          self
+        end
 
-          def build_left_outer_joins(manager, outer_joins)
-            buckets = outer_joins.group_by do |join|
-              case join
-              when Hash, Symbol, Array
-                :association_join
-              else
-                raise ArgumentError, 'only Hash, Symbol and Array are allowed'
-              end
+        def build_left_outer_joins(manager, outer_joins)
+          buckets = outer_joins.group_by do |join|
+            case join
+            when Hash, Symbol, Array
+              :association_join
+            else
+              raise ArgumentError, 'only Hash, Symbol and Array are allowed'
             end
-
-            build_join_query(manager, buckets, Arel::Nodes::OuterJoin)
           end
+
+          build_join_query(manager, buckets, Arel::Nodes::OuterJoin)
         end
       end
       # (End of left_outer_joins support)
@@ -784,7 +821,8 @@ ActiveSupport.on_load(:active_record) do
 end
 
 # Do this earlier because stuff here gets mixed into JoinDependency::JoinAssociation and AssociationScope
-if ActiveRecord.version < ::Gem::Version.new('5.0') && Object.const_defined?('PG::Connection')
+if is_postgres && ActiveRecord.version < ::Gem::Version.new('5.0') # Was:  && Object.const_defined?('PG::Connection')
+  require 'pg' # For ActiveRecord < 4.2
   # Avoid pg gem deprecation warning:  "You should use PG::Connection, PG::Result, and PG::Error instead"
   PGconn = PG::Connection
   PGresult = PG::Result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.45
+  version: 1.0.48
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: fancy_gets
   requirement: !ruby/object:Gem::Requirement