activerecord-virtual_attributes 6.1.2 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e19652ea9b4883f4acae661b63dcc69b4fa4b0bdd0b286a0eb8b17a87892278e
-  data.tar.gz: 2ba220783720e1bc5b67e0af787c1396127b3fef2f2e0813deb7e34b766579b8
+  metadata.gz: e4a4b9dd1a4f51cfef16c50545afe8c064f1727a4580016b400b78afe4279a15
+  data.tar.gz: 8a4c28698b8191586fb25dfe0885b54300306ac2f5a3866e7731bc789bd85654
 SHA512:
-  metadata.gz: 2b60fcf44b86210f1dbe3ab9be5585158c027bc9c81c0f2ccad77a0079a77b0918bc58feca99f550f4ad2aff4e61defaf7229b125f6091dd770df0242af645fe
-  data.tar.gz: e691ea9679a9fda6db72fc3f057dd7d5aee163e9fd1d4aff035292da1e03c23eb711920bad8cf79ad41054bb28c2ba29ac9a03a4a38d7b44a52b9ca322245e16
+  metadata.gz: 0b06ebb3ad544e2c19f4b0a103ec54cd471fa9a187cee566399b985446244baadac66d35a343dc7311b7b73963bb55a15d87a3968287ea434f1093595073c974
+  data.tar.gz: e904ebef2e7594f37055971d738a20343c546834ec7597d10816949a005f1ba6dbd979cc422b1ba1b99a079e699c9219b97907e798d9eee5e3fbfa7ce114e1f6

data/CHANGELOG.md

@@ -4,6 +4,24 @@ The versioning of this gem follows ActiveRecord versioning, and does not follow
 
 ## [Unreleased]
 
+## [7.1.0] - 2025-02-19
+
+* Use TableAlias for table aliasing [#168](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/168)
+* Rails 7.1 support
+
+## [7.0.0] - 2024-08-01
+
+* Use Arel.literal [#154](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/154)
+* drop attribute_builder [#153](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/153)
+* dropped virtual_aggregate [#152](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/152)
+* resolve rubocops (also fix bin/console) [#151](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/151)
+* Rails 7.0 support / dropping 6.1 [#150](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/150)
+* condense includes produced by replace_virtual_fields [#149](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/149)
+* fix bin/console [#148](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/148)
+* Rails 7.0 support pt1 [#146](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/146)
+* Fix sqlite3 v2 and rails [#140](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/140)
+* Use custom Arel node [#114](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/114)
+
 ## [6.1.2] - 2023-10-26
 
 * Fix bind variables for joins with static strings [#124](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/124)
@@ -93,7 +111,9 @@ The versioning of this gem follows ActiveRecord versioning, and does not follow
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.2...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.1.0...HEAD
+[7.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.0.0...v7.1.0
+[7.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.2...v7.0.0
 [6.1.2]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.1...v6.1.2
 [6.1.1]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.0...v6.1.1
 [6.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v3.0.0...v6.1.0

data/Gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.1.4"
+gem "activerecord", "~>7.1.5"
 gem "mysql2"
 gem "pg"
-gem "sqlite3"
+gem "sqlite3", "< 2"
 
 gemspec

data/activerecord-virtual_attributes.gemspec

@@ -9,29 +9,37 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Keenan Brock"]
   spec.email         = ["keenan@thebrocks.net"]
 
-  spec.summary       = %q{Access non-sql attributes from sql}
-  spec.description   = %q{Define attributes in arel}
+  spec.summary       = "Access non-sql attributes from sql"
+  spec.description   = "Define attributes in arel"
   spec.homepage      = "https://github.com/ManageIQ/activerecord-virtual_attributes"
   spec.license       = "Apache 2.0"
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/ManageIQ/activerecord-virtual_attributes"
-  spec.metadata["changelog_uri"] = "https://github.com/ManageIQ/activerecord-virtual_attributes/blob/master/CHANGELOG.md"
+  spec.metadata      = {
+    "homepage_uri"          => spec.homepage,
+    "source_code_uri"       => "https://github.com/ManageIQ/activerecord-virtual_attributes",
+    "changelog_uri"         => "https://github.com/ManageIQ/activerecord-virtual_attributes/blob/master/CHANGELOG.md",
+    "rubygems_mfa_required" => "true"
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) || f.match(/^(\.)|renovate.json/) }
   end
 
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 6.1.0"
+  spec.add_dependency "concurrent-ruby", "< 1.3.5" # Temporary pin down as concurrent-ruby 1.3.5 breaks Rails 7.0, and rails-core doesn't
+                                                   # plan to ship a new 7.0 to fix it. See https://github.com/rails/rails/pull/54264
+  spec.add_runtime_dependency "activerecord", "~> 7.0", ">=7.0.8.7"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "database_cleaner-active_record", "~> 2.1"
   spec.add_development_dependency "db-query-matchers"
-  spec.add_development_dependency "manageiq-style"
+  spec.add_development_dependency "manageiq-style", ">= 1.5.3"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", ">= 0.21.2"
+  spec.add_development_dependency "sqlite3"
 end

data/lib/active_record/virtual_attributes/rspec/have_virtual_attribute.rb

@@ -1,4 +1,4 @@
-RSpec::Matchers.define :have_virtual_attribute do |name, type|
+RSpec::Matchers.define(:have_virtual_attribute) do |name, type|
   match do |klass|
     expect(klass.has_attribute?(name)).to be_truthy
     expect(klass.virtual_attribute?(name)).to be_truthy

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "6.1.2".freeze
+    VERSION = "7.1.0".freeze
   end
 end

data/lib/active_record/virtual_attributes/virtual_arel.rb

@@ -10,8 +10,13 @@ module ActiveRecord
     # Model.select(Model.arel_table.grouping(Model.arel_table[:field2]).as(:field))
     # Model.attribute_supported_by_sql?(:field) # => true
 
-    # in essence, this is our Arel::Nodes::VirtualAttribute
-    class Arel::Nodes::Grouping
+    class VirtualAttribute < Arel::Nodes::Grouping
+      def initialize(arel, name = nil, relation = nil)
+        super(arel)
+        @name = name
+        @relation = relation
+      end
+
       attr_accessor :name, :relation
 
       # methods from Arel::Nodes::Attribute
@@ -95,10 +100,12 @@ module ActiveRecord
           return unless arel_lambda
 
           arel = arel_lambda.call(table)
-          arel = Arel::Nodes::Grouping.new(arel) unless arel.kind_of?(Arel::Nodes::Grouping)
-          arel.name = column_name
-          arel.relation = table
-          arel
+          # By convention, all attributes are defined with a grouping.
+          # Since we're adding a VirtualAttribute node, which is essentially a
+          # grouping, there is no need to keep both and end up with double parens
+          arel = arel.expr if arel.kind_of?(Arel::Nodes::Grouping)
+
+          VirtualAttribute.new(arel, column_name, table)
         end
 
         private
@@ -111,6 +118,8 @@ module ActiveRecord
   end
 end
 
+# fixed in https://github.com/rails/rails/pull/45642
+if ActiveRecord.version < Gem::Version.new(7.1)
 module Arel # :nodoc: all
   # rubocop:disable Naming/MethodName
   # rubocop:disable Naming/MethodParameterName
@@ -150,3 +159,4 @@ module Arel # :nodoc: all
   # rubocop:enable Naming/MethodParameterName
   # rubocop:enable Style/ConditionalAssignment
 end
+end

data/lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -74,12 +74,13 @@ module ActiveRecord
           type = options[:type] || to_ref.klass.type_for_attribute(col)
           type = ActiveRecord::Type.lookup(type) if type.kind_of?(Symbol)
           raise "unknown attribute #{to}##{col} referenced in #{name}" unless type
+
           arel = virtual_delegate_arel(col, to_ref)
           define_virtual_attribute(method_name, type, :uses => (options[:uses] || to), :arel => arel)
         end
 
         # see activesupport module/delegation.rb
-        def define_delegate(method_name, method, to: nil, allow_nil: nil, default: nil)
+        def define_delegate(method_name, method, to: nil, allow_nil: nil, default: nil) # rubocop:disable Naming/MethodParameterName
           location = caller_locations(2, 1).first
           file, line = location.path, location.lineno
 
@@ -125,7 +126,7 @@ module ActiveRecord
           module_eval(method_def, file, line)
         end
 
-        def virtual_delegate_name_prefix(prefix, to)
+        def virtual_delegate_name_prefix(prefix, to) # rubocop:disable Naming/MethodParameterName
           "#{prefix == true ? to : prefix}_" if prefix
         end
 
@@ -260,7 +261,7 @@ module ActiveRecord
 
         yield arel if block_given?
 
-        ::Arel::Nodes::Grouping.new(arel)
+        arel
       end
 
       # determine table reference to use for a sub query
@@ -270,11 +271,9 @@ module ActiveRecord
       def self.select_from_alias_table(to_klass, src_relation)
         to_table = to_klass.arel_table
         # if a self join, alias the second table to a different name
-        if to_table.table_name == src_relation.table_name
-          # use a dup to not modify the primary table in the model
-          to_table = to_table.dup
+        if to_table.name == src_relation.name
           # use a table alias to not conflict with table name in the primary query
-          to_table.table_alias = "#{to_table.table_name}_sub"
+          to_table = to_table.alias("#{to_table.name}_sub")
         end
         to_table
       end

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -5,6 +5,7 @@ module ActiveRecord
       include ActiveRecord::VirtualAttributes
       include ActiveRecord::VirtualAttributes::VirtualReflections
 
+      # rubocop:disable Style/SingleLineMethods
       module NonARModels
         def dangerous_attribute_method?(_); false; end
 
@@ -14,6 +15,7 @@ module ActiveRecord
 
         def belongs_to_required_by_default; false; end
       end
+      # rubocop:enable Style/SingleLineMethods
 
       included do
         unless respond_to?(:dangerous_attribute_method?)
@@ -31,18 +33,20 @@ module ActiveRecord
         end
 
         def replace_virtual_fields(associations)
-          return associations if associations.blank?
-
-          case associations
-          when String, Symbol
-            virtual_field?(associations) ? replace_virtual_fields(virtual_includes(associations)) : associations.to_sym
-          when Array
-            associations.collect { |association| replace_virtual_fields(association) }.compact
-          when Hash
-            replace_virtual_field_hash(associations)
-          else
-            associations
-          end
+          return nil if associations.blank?
+
+          ret =
+            case associations
+            when String, Symbol
+              virtual_field?(associations) ? replace_virtual_fields(virtual_includes(associations)) : associations.to_sym
+            when Array
+              associations.filter_map { |association| replace_virtual_fields(association) }
+            when Hash
+              replace_virtual_field_hash(associations)
+            else
+              associations
+            end
+          simplify_includes(ret)
         end
 
         def replace_virtual_field_hash(associations)
@@ -96,11 +100,42 @@ module ActiveRecord
             merge_includes(include_to_hash(v1), v2)
           end
         end
+
+        # @param [Hash|Array|Symbol|nil]
+        def simplify_includes(ret)
+          case ret
+          when Hash
+            ret.size <= 1 && ret.values.first.blank? ? ret.keys.first : ret
+          when Array
+            ret.size <= 1 ? ret.first : ret
+          else
+            ret
+          end
+        end
       end
     end
   end
 end
 
+def assert_klass_has_instance_method(klass, instance_method)
+  klass.instance_method(instance_method)
+rescue NameError => err
+  msg = "#{klass} is missing the method our prepended code is expecting to patch. Was the undefined method removed or renamed upstream?\nSee: #{__FILE__}.\nThe NameError was: #{err}. "
+  raise NameError, msg
+end
+
+# Expect these methods to exist. (Otherwise we are patching the wrong methods)
+%w[
+  grouped_records
+  preloaders_for_reflection
+].each { |method| assert_klass_has_instance_method(ActiveRecord::Associations::Preloader::Branch, method) }
+
+%w[
+  build_select
+  arel_column
+  construct_join_dependency
+].each { |method| assert_klass_has_instance_method(ActiveRecord::Relation, method) }
+
 module ActiveRecord
   class Base
     include ActiveRecord::VirtualAttributes::VirtualFields
@@ -109,105 +144,81 @@ module ActiveRecord
   module Associations
     class Preloader
       prepend(Module.new {
-        # preloader.rb active record 6.0
-        # changed:
-        # since grouped_records can return a hash/array, we need to handle those 2 new cases
-        def preloaders_for_reflection(reflection, records, scope, polymorphic_parent)
-          case reflection
-          when Array
-            reflection.flat_map { |ref| preloaders_on(ref, records, scope, polymorphic_parent) }
-          when Hash
-            preloaders_on(reflection, records, scope, polymorphic_parent)
-          else
-            super(reflection, records, scope)
+        # preloader is called with virtual attributes - need to resolve
+        def call
+          # Possibly overkill since all records probably have the same class and associations
+          # use a cache so we only convert includes once per base class
+          assoc_cache = Hash.new { |h, klass| h[klass] = klass.replace_virtual_fields(associations) }
+
+          # convert the includes with virtual attributes to includes with proper associations
+          records_by_assoc = records.group_by { |rec| assoc_cache[rec.class] }
+          # if these are the same includes, then do the preloader work
+          return super if records_by_assoc.size == 1 && records_by_assoc.keys.first == associations
+
+          # for each of the associations, run a preloader
+          records_by_assoc.each do |klass_associations, klass_records|
+            next if klass_associations.blank?
+
+            Array.wrap(klass_associations).each do |klass_association|
+              # this calls back into itself, but it will take the short circuit
+              Preloader.new(:records => klass_records, :associations => klass_association, :scope => scope, :available_records => @available_records, :associate_by_default => @associate_by_default).call
+            end
           end
         end
+      })
 
-        # rubocop:disable Style/BlockDelimiters, Lint/AmbiguousBlockAssociation, Style/MethodCallWithArgsParentheses
-        # preloader.rb active record 6.0
-        # changed:
-        # passing polymorphic around (and makes 5.2 more similar to 6.0)
-        def preloaders_for_hash(association, records, scope, polymorphic_parent)
-          association.flat_map { |parent, child|
-            grouped_records(parent, records, polymorphic_parent).flat_map do |reflection, reflection_records|
-              loaders = preloaders_for_reflection(reflection, reflection_records, scope, polymorphic_parent)
-              recs = loaders.flat_map(&:preloaded_records).uniq
-              child_polymorphic_parent = reflection && reflection.respond_to?(:options) && reflection.options[:polymorphic]
-              loaders.concat Array.wrap(child).flat_map { |assoc|
-                preloaders_on assoc, recs, scope, child_polymorphic_parent
-              }
-              loaders
-            end
-          }
-        end
+      class Branch
+        prepend(Module.new {
+          # from branched.rb 7.0
+          def grouped_records
+            h = {}
+            polymorphic_parent = !root? && parent.polymorphic?
+            source_records.each do |record|
+              # begin virtual_attributes changes
+              association = record.class.replace_virtual_fields(self.association)
+              # end virtual_attributes changes
 
-        # preloader.rb active record 6.0
-        # changed:
-        # passing polymorphic_parent to preloaders_for_reflection
-        def preloaders_for_one(association, records, scope, polymorphic_parent)
-          grouped_records(association, records, polymorphic_parent)
-            .flat_map do |reflection, reflection_records|
-              preloaders_for_reflection(reflection, reflection_records, scope, polymorphic_parent)
+              reflection = record.class._reflect_on_association(association)
+              next if polymorphic_parent && !reflection || !record.association(association).klass
+              (h[reflection] ||= []) << record
             end
-        end
+            h
+          end
 
-        # preloader.rb active record 6.0, 6.1
-        def grouped_records(orig_association, records, polymorphic_parent)
-          h = {}
-          records.each do |record|
-            # The virtual_field lookup can return Symbol/Nil/Other (typically a Hash)
-            #   so the case statement and the cases for Nil/Other are new
+          # branched.rb 7.0
+          def preloaders_for_reflection(reflection, reflection_records)
+            reflection_records.group_by do |record|
+              # begin virtual_attributes changes
+              needed_association = record.class.replace_virtual_fields(association)
+              # end virtual_attributes changes
 
-            # each class can resolve virtual_{attributes,includes} differently
-            association = record.class.replace_virtual_fields(orig_association)
-            # 1 line optimization for single element array:
-            association = association.first if association.kind_of?(Array) && association.size == 1
+              klass = record.association(needed_association).klass
 
-            case association
-            when Symbol, String
-              reflection = record.class._reflect_on_association(association)
-              next if polymorphic_parent && !reflection || !record.association(association).klass
-            when nil
-              next
-            else # need parent (preloaders_for_{hash,one}) to handle this Array/Hash
-              reflection = association
+              if reflection.scope && reflection.scope.arity != 0
+                # For instance dependent scopes, the scope is potentially
+                # different for each record. To allow this we'll group each
+                # object separately into its own preloader
+                reflection_scope = reflection.join_scopes(klass.arel_table, klass.predicate_builder, klass, record).inject(&:merge!)
+              end
+
+              [klass, reflection_scope]
+            end.map do |(rhs_klass, reflection_scope), rs|
+              preloader_for(reflection).new(rhs_klass, rs, reflection, scope, reflection_scope, associate_by_default)
             end
-            (h[reflection] ||= []) << record
           end
-          h
-        end
-        # rubocop:enable Style/BlockDelimiters, Lint/AmbiguousBlockAssociation, Style/MethodCallWithArgsParentheses
-      })
+        })
+      end
     end
   end
 
   class Relation
-    def without_virtual_includes
-      filtered_includes = includes_values && klass.replace_virtual_fields(includes_values)
-      if filtered_includes != includes_values
-        spawn.tap { |other| other.includes_values = filtered_includes }
-      else
-        self
-      end
-    end
-
     include(Module.new {
-      # From ActiveRecord::FinderMethods
-      def apply_join_dependency(*args, **kargs, &block)
-        real = without_virtual_includes
-        if real.equal?(self)
-          super
-        else
-          real.apply_join_dependency(*args, **kargs, &block)
-        end
-      end
-
       # From ActiveRecord::QueryMethods (rails 5.2 - 6.1)
       def build_select(arel)
         if select_values.any?
-          cols = arel_columns(select_values.uniq).map do |col|
+          cols = arel_columns(select_values).map do |col|
             # if it is a virtual attribute, then add aliases to those columns
-            if col.kind_of?(Arel::Nodes::Grouping) && col.name
+            if col.kind_of?(VirtualAttributes::VirtualAttribute)
               col.as(connection.quote_column_name(col.name))
             else
               col
@@ -219,9 +230,8 @@ module ActiveRecord
         end
       end
 
-      # from ActiveRecord::QueryMethods (rails 5.2 - 6.0)
-      # TODO: remove from rails 7.0
-      def arel_column(field, &block)
+      # from ActiveRecord::QueryMethods (rails 5.2 - 7.0)
+      def arel_column(field)
         if virtual_attribute?(field) && (arel = table[field])
           arel
         else
@@ -230,19 +240,9 @@ module ActiveRecord
       end
 
       def construct_join_dependency(associations, join_type) # :nodoc:
-        associations = klass.replace_virtual_fields(associations)
+        associations = klass.replace_virtual_fields(associations) || {}
         super
       end
-
-      # From ActiveRecord::Calculations
-      # introduces virtual includes support for calculate (we mostly use COUNT(*))
-      def calculate(operation, attribute_name)
-        # allow calculate to work with includes and a virtual attribute
-        real = without_virtual_includes
-        return super if real.equal?(self)
-
-        real.calculate(operation, attribute_name)
-      end
     })
   end
 end

data/lib/active_record/virtual_attributes/virtual_reflections.rb

@@ -17,7 +17,7 @@ module ActiveRecord
         end
 
         def virtual_has_many(name, options = {})
-          define_method("#{name.to_s.singularize}_ids") do
+          define_method(:"#{name.to_s.singularize}_ids") do
             records = send(name)
             records.respond_to?(:ids) ? records.ids : records.collect(&:id)
           end
@@ -57,11 +57,11 @@ module ActiveRecord
         end
 
         def follow_associations(association_names)
-          association_names.inject(self) { |klass, name| klass.try!(:reflect_on_association, name).try!(:klass) }
+          association_names.inject(self) { |klass, name| klass&.reflect_on_association(name)&.klass }
         end
 
         def follow_associations_with_virtual(association_names)
-          association_names.inject(self) { |klass, name| klass.try!(:reflection_with_virtual, name).try!(:klass) }
+          association_names.inject(self) { |klass, name| klass&.reflection_with_virtual(name)&.klass }
         end
 
         # invalid associations return a nil
@@ -97,6 +97,7 @@ module ActiveRecord
 
         def add_virtual_reflection(reflection, name, uses, _options)
           raise ArgumentError, "macro must be specified" unless reflection
+
           reset_virtual_reflection_information
           _virtual_reflections[name.to_sym] = reflection
           define_virtual_include(name.to_s, uses)

data/lib/active_record/virtual_attributes/virtual_total.rb

@@ -49,35 +49,6 @@ module VirtualAttributes
         define_virtual_aggregate_method(name, relation, column, :average) { |values| values.count == 0 ? 0 : values.sum / values.count }
       end
 
-      #  @param method_name
-      #    :count :average :minimum :maximum :sum
-      #
-      #  example:
-      #
-      #    class Hardware
-      #      has_many :disks
-      #      virtual_sum :allocated_disk_storage, :disks, :size
-      #    end
-      #
-      #    generates:
-      #
-      #    def allocated_disk_storage
-      #      if disks.loaded?
-      #        disks.map(&:size).compact.sum
-      #      else
-      #        disks.sum(:size) || 0
-      #      end
-      #    end
-      #
-      #    virtual_attribute :allocated_disk_storage, :integer, :uses => :disks, :arel => ...
-      #
-      #    # arel => (SELECT sum("disks"."size") where "hardware"."id" = "disks"."hardware_id")
-
-      def virtual_aggregate(name, relation, method_name = :sum, column = nil, options = {})
-        return virtual_total(name, relation, options) if method_name == :size
-        return virtual_sum(name, relation, column, options) if method_name == :sum
-      end
-
       def define_virtual_aggregate_attribute(name, relation, method_name, column, options)
         reflection = reflect_on_association(relation)
 
@@ -101,7 +72,7 @@ module VirtualAttributes
           if has_attribute?(name)
             self[name] || 0
           elsif (rel = send(relation)).loaded?
-            values = rel.map { |t| t.send(column) }.compact
+            values = rel.filter_map { |t| t.send(column) }
             if block_given?
               yield values
             else
@@ -138,7 +109,7 @@ module VirtualAttributes
           query.where(join.right.expr)
 
           # add coalesce to ensure correct value comes out
-          t.grouping(Arel::Nodes::NamedFunction.new('COALESCE', [t.grouping(query), Arel::Nodes::SqlLiteral.new("0")]))
+          Arel::Nodes::NamedFunction.new('COALESCE', [t.grouping(query), Arel.sql("0")])
         end
       end
     end

data/lib/active_record/virtual_attributes.rb

@@ -83,14 +83,6 @@ module ActiveRecord
         end
       end
 
-      def attributes_builder # :nodoc:
-        unless defined?(@attributes_builder) && @attributes_builder
-          defaults = _default_attributes.except(*(column_names - [primary_key]))
-          @attributes_builder = ActiveModel::AttributeSet::Builder.new(attribute_types, defaults)
-        end
-        @attributes_builder
-      end
-
       private
 
       def load_schema!

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 7.1.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '7.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '7.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.8.7
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +88,34 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: manageiq-style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.2
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Define attributes in arel
 email:
 - keenan@thebrocks.net
@@ -129,23 +191,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".github/workflows/ci.yaml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_cc.yml"
-- ".rubocop_local.yml"
-- ".whitesource"
-- ".yamllint"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-virtual_attributes.gemspec
-- bin/console
-- bin/setup
 - init.rb
 - lib/active_record-virtual_attributes.rb
 - lib/active_record/virtual_attributes.rb
@@ -166,6 +217,7 @@ metadata:
   homepage_uri: https://github.com/ManageIQ/activerecord-virtual_attributes
   source_code_uri: https://github.com/ManageIQ/activerecord-virtual_attributes
   changelog_uri: https://github.com/ManageIQ/activerecord-virtual_attributes/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -181,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Access non-sql attributes from sql

data/.codeclimate.yml

@@ -1,34 +0,0 @@
-version: '2'
-prepare:
-  fetch:
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml
-    path: ".rubocop_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
-    path: ".rubocop_cc_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml
-    path: styles/base.yml
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml
-    path: styles/cc_base.yml
-checks:
-  argument-count:
-    enabled: false
-  complex-logic:
-    enabled: false
-  file-lines:
-    enabled: false
-  method-complexity:
-    config:
-      threshold: 11
-  method-count:
-    enabled: false
-  method-lines:
-    enabled: false
-  nested-control-flow:
-    enabled: false
-  return-statements:
-    enabled: false
-plugins:
-  rubocop:
-    enabled: true
-    config: ".rubocop_cc.yml"
-    channel: rubocop-0-82

data/.github/workflows/ci.yaml

@@ -1,71 +0,0 @@
-name: CI
-
-on:
-  push:
-  pull_request:
-  schedule:
-  - cron: '0 0 * * 0'
-
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version:
-        - '2.7'
-        - '3.0'
-        - '3.1'
-    services:
-      postgres:
-        image: postgres:13
-        env:
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: virtual_attributes
-        options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 5
-        ports:
-        - 5432:5432
-      mysql:
-        image: mysql:8.0
-        env:
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: virtual_attributes
-        options: --health-cmd="mysqladmin ping -h 127.0.0.1 -P 3306 --silent" --health-interval 10s --health-timeout 5s --health-retries 3
-        ports:
-        - 3306:3306
-    env:
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      # for the pg cli (psql, pg_isready) and rails
-      PGHOST: localhost
-      PGPORT: 5432
-      PGUSER: postgres
-      PGPASSWORD: password
-      # for the mysql cli (mysql, mysqladmin)
-      MYSQL_HOST: 127.0.0.1
-      MYSQL_PWD: password
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-        timeout-minutes: 30
-      - name: Run SQLite tests
-        env:
-          DB: sqlite3
-        run: bundle exec rake
-      - name: Run PostgreSQL tests
-        env:
-          DB: postgresql
-          COLLATE_SYMBOLS: false
-        run: bundle exec rake
-      - name: Run MySQL tests
-        env:
-          DB: mysql2
-        run: bundle exec rake
-      - name: Report code coverage
-        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
-        continue-on-error: true
-        uses: paambaati/codeclimate-action@v5
-        env:
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

data/.gitignore

@@ -1,17 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-test/database.yml
-**/*.log
-**/*.db
-Gemfile.lock
-gemfiles/*.lock
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,4 +0,0 @@
-inherit_from:
-- ".rubocop_local.yml"
-inherit_gem:
-  manageiq-style: ".rubocop_base.yml"

data/.rubocop_cc.yml

@@ -1,4 +0,0 @@
-inherit_from:
-- ".rubocop_base.yml"
-- ".rubocop_cc_base.yml"
-- ".rubocop_local.yml"

data/.whitesource

@@ -1,3 +0,0 @@
-{
-  "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
-}

data/.yamllint

@@ -1,8 +0,0 @@
----
-extends: relaxed
-
-rules:
-  indentation:
-    indent-sequences: false
-  line-length:
-    max: 1000

data/bin/console

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "active_record-virtual_attributes"
-
-# models for local testing
-require "rspec"
-Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -e
-
-bundle install
-echo
-
-echo "Setting up the postgres database for specs..."
-echo "SELECT 'CREATE DATABASE virtual_attributes' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'virtual_attributes')\gexec" | psql -U postgres
-
-echo "Setting up the mysql database for specs..."
-mysql -u root -e 'CREATE SCHEMA IF NOT EXISTS 'virtual_attributes';'