brick 1.0.212 → 1.0.213

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e954e525ea7a17eea2b33a125283f8af47a7bad1e457780815a8f53e06ed8fc
-  data.tar.gz: 9ded8bfa75d407294eb3e34895d1fc36ffa17767b9cbdeee0c961d6d9e821653
+  metadata.gz: 02a0436d0c71a40e1aa3858e4fdf20822f32b02864e621964bce288b8b21ad60
+  data.tar.gz: 8257218e3c1e9c26842753590e627802842c67dec93891aec7139fd2f31d67c0
 SHA512:
-  metadata.gz: 6c2d33f2a6247cc001071929731d2b2543d2b91ba0e8c22afeda7d9fa40e37ae9c3957d4046f8157a34b1549dca8e542de97a58f22b25a312532eed775d3989c
-  data.tar.gz: 4e63b7986eb7b683421ef92d00fe61a3970ed0d24fb57403a89d05c114760ad00310e6c635d66bc0388e5ca26b6c6fd2061574c83e1f70b60f90baa22babcb92
+  metadata.gz: 222b736da74b699a1f352ffff9f087f39048fceaf995dc28733823b4d38271c0bc04ecba506fb6fd027a7f39883009baede3d9c70f81a46dc023f692d6c831e4
+  data.tar.gz: bdee88e65dad07aa66b6ce9458a44ba8d1ad069b937d5bceae65f020162107336b6d7619aee03ed4c56c25a3e38b4c17ce0352677883426802dfe28ac3c8567a

data/lib/brick/config.rb

@@ -429,6 +429,19 @@ module Brick
       end
     end
 
+    def acts_as_list_cols
+      @mutex.synchronize { @acts_as_list || {} }
+    end
+
+    # Get something like:
+    #   { 'on_call_list' => { _brick_default: [:last_name, :first_name] } }
+    #   { 'on_call_list' => { _brick_default: :sequence } }
+    def acts_as_list_cols=(position_cols)
+      @mutex.synchronize do
+        @acts_as_list ||= position_cols
+      end
+    end
+
     def metadata_columns
       @mutex.synchronize { @metadata_columns ||= ['created_at', 'updated_at', 'deleted_at'] }
     end

data/lib/brick/extensions.rb

@@ -196,6 +196,33 @@ module ActiveRecord
       def _brick_monetized_attributes
         @_brick_monetized_attributes ||= respond_to?(:monetized_attributes) ? monetized_attributes.values : {}
       end
+
+      # def acts_as_list(aal_cols = nil)
+      #   if aal_cols
+      #     aal_cols = [aal_cols] unless aal_cols.is_a?(Array)
+      #     @acts_as_list_cols = aal_cols.each_with_object([]) do |aal_col, s|
+      #       if column_names.include?(aal_col = aal_col.to_s) && !s.include?(aal_col)
+      #         s << aal_col
+      #       end
+      #     end
+      #   else
+      #     if [:integer, :bigint].include?(columns_hash['position']&.type)
+      #       @acts_as_list_cols = ['position']
+      #     else
+      #       return
+      #     end
+      #   end
+      #   # Override save in order to update neighbours when necessary
+      #   alias _brick_save save
+      #   def save
+      #     # @acts_as_list_cols
+      #     # -1
+      #     @acts_as_list_cols.each do |aal_col|
+      #       binding.pry if (aal_change = changes[aal_col])
+      #     end
+      #     _brick_save
+      #   end
+      # end
     end
 
     def self.brick_parse_dsl(join_array = nil, prefix = [], translations = {}, is_polymorphic = false, dsl = nil, emit_dsl = false)
@@ -230,11 +257,7 @@ module ActiveRecord
             end
             if first_parts
               if (parts = prefix + first_parts + [parts[-1]]).length > 1 && klass
-                unless is_polymorphic
-                  s = join_array
-                  parts[0..-3].each { |v| s = s[v.to_sym] }
-                  s[parts[-2]] = nil # unless parts[-2].empty? # Using []= will "hydrate" any missing part(s) in our whole series
-                end
+                join_array.add_parts(parts) unless is_polymorphic
                 translations[parts[0..-2].join('.')] = klass
               end
               if klass&.column_names.exclude?(parts.last) &&
@@ -538,7 +561,11 @@ module ActiveRecord
     end
 
     def self.brick_where(*args)
-      (relation = all).brick_where(*args)
+      all.brick_where(*args)
+    end
+
+    def self.brick_group(*args, withhold_ids: true, **kwargs)
+      all.brick_group(*args, withhold_ids: withhold_ids, **kwargs)
     end
 
   private
@@ -612,27 +639,36 @@ module ActiveRecord
       pluck(selects)
     end
 
-    def _brick_querying(*args, withhold_ids: nil, params: {}, order_by: nil, translations: {},
+    def brick_group(*args, **kwargs)
+      grouping = args[0].is_a?(Array) ? args[0] : args
+      _brick_querying(select_values.frozen? ? select_values.dup : select_values,
+                      grouping: grouping, **kwargs)
+      self
+    end
+
+    def _brick_querying(*args, grouping: nil, 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
-        while idx < selects.length
-          v = selects[idx]
-          if v.is_a?(String) && v.index('.')
-            # No prefixes and not polymorphic
-            pieces = self.brick_parse_dsl(join_array, [], translations, false, dsl = "[#{v}]")
-            (cust_col_override ||= {})[v.tr('.', '_').to_sym] = [pieces, dsl, true]
-            selects.delete_at(idx)
-          else
-            idx += 1
+      unless cust_col_override
+        if selects.present? # See if there's any fancy ones in the select list
+          idx = 0
+          while idx < selects.length
+            v = selects[idx]
+            if v.is_a?(String) && v.index('.')
+              # No prefixes and not polymorphic
+              pieces = self.brick_parse_dsl(join_array, [], translations, false, dsl = "[#{v}]")
+              (cust_col_override ||= {})[v.tr('.', '_').to_sym] = [pieces, dsl, true]
+              selects.delete_at(idx)
+            else
+              idx += 1
+            end
           end
+        elsif selects.is_a?(Hash) && params.empty? # Make sense of things if they've passed in only params
+          params = selects
+          selects = []
         end
-      elsif selects.is_a?(Hash) && params.empty? && cust_col_override.nil? # Make sense of things if they've passed in only params
-        params = selects
-        selects = []
       end
       is_add_bts = is_add_hms = !cust_col_override
 
@@ -710,6 +746,14 @@ module ActiveRecord
         end
       end
 
+      # Establish necessary JOINs for any custom GROUP BY columns
+      grouping&.each do |group_item|
+        # JOIN in all the same ways as the pathing describes
+        if group_item.is_a?(String) && (ref_parts = group_item.split('.')).length > 1
+          join_array.add_parts(ref_parts)
+        end
+      end
+
       if join_array.present?
         if ActiveRecord.version < Gem::Version.new('4.2')
           self.joins_values += join_array # Same as:  joins!(join_array)
@@ -725,7 +769,9 @@ module ActiveRecord
 
       # CUSTOM COLUMNS
       # ==============
-      (cust_col_override || (!withhold_ids && klass._br_cust_cols))&.each do |k, cc|
+      cust_cols = cust_col_override
+      cust_cols ||= klass._br_cust_cols unless withhold_ids
+      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:
@@ -753,7 +799,7 @@ module ActiveRecord
             col_alias = "#{col_prefix}#{k}__#{table_name.tr('.', '_')}_#{cc_part.first}"
           elsif brick_col_names ||
                 used_col_aliases.key?(col_alias = k.to_s) # This sets a simpler custom column name if possible
-            while cc_part_idx > 0 &&
+            while cc_part_idx >= 0 &&
                   (col_alias = "#{col_prefix}#{k}__#{cc_part[cc_part_idx..-1].map(&:to_s).join('__').tr('.', '_')}") &&
                   used_col_aliases.key?(col_alias)
               cc_part_idx -= 1
@@ -988,6 +1034,20 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
         klass._br_hm_counts.delete(n)
       end
 
+      # Rewrite the group values to reference table and correlation names built out by AREL
+      if grouping
+        group2 = (gvgu = (group_values + grouping).uniq).each_with_object([]) do |v, s|
+          if v.is_a?(Symbol) || (v_parts = v.split('.')).length == 1
+            s << v
+          elsif (tbl_name = brick_links[v_parts[0..-2].join('.')]&.split('.')&.last)
+            s << "#{tbl_name}.#{v_parts.last}"
+          else
+            s << v
+          end
+        end
+        group!(*group2)
+      end
+
       unless wheres.empty?
         # Rewrite the wheres to reference table and correlation names built out by AREL
         where_nots = {}
@@ -998,7 +1058,7 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
           if (v_parts = v.first.split('.')).length == 1
             (is_not ? where_nots : s)[v.first] = v.last
           else
-            tbl_name = brick_links[v_parts.first].split('.').last
+            tbl_name = brick_links[v_parts[0..-2].join('.')].split('.').last
             (is_not ? where_nots : s)["#{tbl_name}.#{v_parts.last}"] = v.last
           end
         end
@@ -1095,13 +1155,9 @@ JOIN (SELECT #{hm_selects.map { |s| _br_quoted_name("#{'br_t0.' if from_clause}#
         # && joins_values.empty? # Make sure we don't step on any toes if they've already specified JOIN things
         ja = nil
         opts.each do |k, v|
+          # JOIN in all the same ways as the pathing describes
           if k.is_a?(String) && (ref_parts = k.split('.')).length > 1
-            # JOIN in all the same ways as the pathing describes
-            linkage = (ja ||= ::Brick::JoinArray.new)
-            ref_parts[0..-3].each do |prefix_part|
-              linkage = linkage[prefix_part.to_sym]
-            end
-            linkage[ref_parts[-2].to_sym] = nil
+            (ja ||= ::Brick::JoinArray.new).add_parts(ref_parts)
           end
         end
         if ja&.present?
@@ -1846,6 +1902,12 @@ class Object
           end
         end
 
+        # Apply any acts_as_list things
+        if (aal_col = ::Brick.config.acts_as_list_cols.fetch(matching, nil))
+          new_model_class.send(:acts_as_list, aal_col.to_sym)
+          code << "  acts_as_list :#{aal_col}\n"
+        end
+
         # Auto-support Ransack if it's present
         if self.respond_to?(:ransackable_attributes)
           def self.ransackable_attributes(auth_object = nil)

data/lib/brick/frameworks/rails.rb

@@ -173,7 +173,6 @@ erDiagram
 <%=  erd_sidelinks(shown_classes, hm_class).html_safe %>
 <% end
    def dt_lookup(dt)
-     puts dt.inspect
      { 'integer' => 'int', 'character varying' => 'varchar', 'double precision' => 'float',
        'timestamp without time zone' => 'timestamp',
        'timestamp with time zone' => 'timestamp',

data/lib/brick/join_array.rb

@@ -165,6 +165,12 @@ module Brick
         end.tap { |member| push(member) }
       end
     end
+
+    def add_parts(parts)
+      s = self
+      parts[0..-3].each { |part| s = s[part.to_sym] }
+      s[parts[-2].to_sym] = nil # unless parts[-2].empty? # Using []= will "hydrate" any missing part(s) in our whole series
+    end
   end
 
   class JoinHash < Hash

data/lib/brick/version_number.rb

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

data/lib/generators/brick/seeds_generator.rb

@@ -53,7 +53,12 @@ module Brick
           s[v_parts.first] = nil unless [::Brick.default_schema, 'public'].include?(v_parts.first)
         end
       end
-      seeds = +"# Seeds file for #{ActiveRecord::Base.connection.current_database}:\n"
+      seeds = +'# Seeds file for '
+      if (arbc = ActiveRecord::Base.connection).respond_to?(:current_database) # SQLite3 can't do this!
+        seeds << "#{arbc.current_database}:\n"
+      elsif (filename = arbc.instance_variable_get(:@connection_parameters)&.fetch(:database, nil))
+        seeds << "#{filename}:\n"
+      end
       done = []
       fks = {}
       stuck = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.212
+  version: 1.0.213
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord