activerecord 7.1.5.2 → 8.1.2.1

data/lib/arel/visitors/to_sql.rb

@@ -20,6 +20,7 @@ module Arel # :nodoc: all
 
       private
         def visit_Arel_Nodes_DeleteStatement(o, collector)
+          collector.retryable = false
           o = prepare_delete_statement(o)
 
           if has_join_sources?(o)
@@ -34,9 +35,11 @@ module Arel # :nodoc: all
           collect_nodes_for o.wheres, collector, " WHERE ", " AND "
           collect_nodes_for o.orders, collector, " ORDER BY "
           maybe_visit o.limit, collector
+          maybe_visit o.comment, collector
         end
 
         def visit_Arel_Nodes_UpdateStatement(o, collector)
+          collector.retryable = false
           o = prepare_update_statement(o)
 
           collector << "UPDATE "
@@ -46,9 +49,11 @@ module Arel # :nodoc: all
           collect_nodes_for o.wheres, collector, " WHERE ", " AND "
           collect_nodes_for o.orders, collector, " ORDER BY "
           maybe_visit o.limit, collector
+          maybe_visit o.comment, collector
         end
 
         def visit_Arel_Nodes_InsertStatement(o, collector)
+          collector.retryable = false
           collector << "INSERT INTO "
           collector = visit o.relation, collector
 
@@ -72,13 +77,7 @@ module Arel # :nodoc: all
 
         def visit_Arel_Nodes_Exists(o, collector)
           collector << "EXISTS ("
-          collector = visit(o.expressions, collector) << ")"
-          if o.alias
-            collector << " AS "
-            visit o.alias, collector
-          else
-            collector
-          end
+          visit(o.expressions, collector) << ")"
         end
 
         def visit_Arel_Nodes_Casted(o, collector)
@@ -381,16 +380,11 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_NamedFunction(o, collector)
+          collector.retryable = false
           collector << o.name
           collector << "("
           collector << "DISTINCT " if o.distinct
-          collector = inject_join(o.expressions, collector, ", ") << ")"
-          if o.alias
-            collector << " AS "
-            visit o.alias, collector
-          else
-            collector
-          end
+          inject_join(o.expressions, collector, ", ") << ")"
         end
 
         def visit_Arel_Nodes_Extract(o, collector)
@@ -582,10 +576,11 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_In(o, collector)
-          collector.preparable = false
           attr, values = o.left, o.right
 
           if Array === values
+            collector.preparable = false
+
             unless values.empty?
               values.delete_if { |value| unboundable?(value) }
             end
@@ -598,10 +593,11 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_NotIn(o, collector)
-          collector.preparable = false
           attr, values = o.left, o.right
 
           if Array === values
+            collector.preparable = false
+
             unless values.empty?
               values.delete_if { |value| unboundable?(value) }
             end
@@ -618,18 +614,7 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_Or(o, collector)
-          stack = [o.right, o.left]
-
-          while o = stack.pop
-            if o.is_a?(Arel::Nodes::Or)
-              stack.push o.right, o.left
-            else
-              visit o, collector
-              collector << " OR " unless stack.empty?
-            end
-          end
-
-          collector
+          inject_join o.children, collector, " OR "
         end
 
         def visit_Arel_Nodes_Assignment(o, collector)
@@ -768,10 +753,12 @@ module Arel # :nodoc: all
 
         def visit_Arel_Nodes_SqlLiteral(o, collector)
           collector.preparable = false
+          collector.retryable &&= o.retryable
           collector << o.to_s
         end
 
         def visit_Arel_Nodes_BoundSqlLiteral(o, collector)
+          collector.retryable = false
           bind_index = 0
 
           new_bind = lambda do |value|
@@ -968,30 +955,40 @@ module Arel # :nodoc: all
           collector = if o.left.class == o.class
             infix_value_with_paren(o.left, collector, value, true)
           else
-            visit o.left, collector
+            grouping_parentheses o.left, collector, false
           end
           collector << value
           collector = if o.right.class == o.class
             infix_value_with_paren(o.right, collector, value, true)
           else
-            visit o.right, collector
+            grouping_parentheses o.right, collector, false
           end
           collector << " )" unless suppress_parens
           collector
         end
 
+        # Used by some visitors to enclose select queries in parentheses
+        def grouping_parentheses(o, collector, always_wrap_selects = true)
+          if o.is_a?(Nodes::SelectStatement) && (always_wrap_selects || require_parentheses?(o))
+            collector << "("
+            visit o, collector
+            collector << ")"
+            collector
+          else
+            visit o, collector
+          end
+        end
+
+        def require_parentheses?(o)
+          !o.orders.empty? || o.limit || o.offset
+        end
+
         def aggregate(name, o, collector)
           collector << "#{name}("
           if o.distinct
             collector << "DISTINCT "
           end
-          collector = inject_join(o.expressions, collector, ", ") << ")"
-          if o.alias
-            collector << " AS "
-            visit o.alias, collector
-          else
-            collector
-          end
+          inject_join(o.expressions, collector, ", ") << ")"
         end
 
         def is_distinct_from(o, collector)

data/lib/arel.rb

@@ -45,16 +45,22 @@ module Arel
   # that this behavior only applies when bind value parameters are
   # supplied in the call; without them, the placeholder tokens have no
   # special meaning, and will be passed through to the query as-is.
-  def self.sql(sql_string, *positional_binds, **named_binds)
-    if positional_binds.empty? && named_binds.empty?
-      Arel::Nodes::SqlLiteral.new sql_string
+  #
+  # The +:retryable+ option can be used to mark the SQL as safe to retry.
+  # Use this option only if the SQL is idempotent, as it could be executed
+  # more than once.
+  def self.sql(sql_string, *positional_binds, retryable: false, **named_binds)
+    if Arel::Nodes::SqlLiteral === sql_string
+      sql_string
+    elsif positional_binds.empty? && named_binds.empty?
+      Arel::Nodes::SqlLiteral.new(sql_string, retryable: retryable)
     else
       Arel::Nodes::BoundSqlLiteral.new sql_string, positional_binds, named_binds
     end
   end
 
   def self.star # :nodoc:
-    sql "*"
+    sql("*", retryable: true)
   end
 
   def self.arel_node?(value) # :nodoc:

data/lib/rails/generators/active_record/application_record/USAGE

@@ -5,4 +5,4 @@ Example:
     `bin/rails generate application_record`
 
     This generates the base class. A test is not generated because no
-    behaviour is included in `ApplicationRecord` by default.
+    behavior is included in `ApplicationRecord` by default.

data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt

@@ -12,7 +12,10 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
 <% end -%>
-<% if options[:timestamps] %>
+<% unless attributes.empty? -%>
+
+<% end -%>
+<% if options[:timestamps] -%>
       t.timestamps
 <% end -%>
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 7.1.5.2
+  version: 8.1.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 8.1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 8.1.2.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 8.1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.5.2
+        version: 8.1.2.1
 - !ruby/object:Gem::Dependency
   name: timeout
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,9 @@ files:
 - lib/active_record/associations/builder/singular_association.rb
 - lib/active_record/associations/collection_association.rb
 - lib/active_record/associations/collection_proxy.rb
+- lib/active_record/associations/deprecation.rb
 - lib/active_record/associations/disable_joins_association_scope.rb
+- lib/active_record/associations/errors.rb
 - lib/active_record/associations/foreign_association.rb
 - lib/active_record/associations/has_many_association.rb
 - lib/active_record/associations/has_many_through_association.rb
@@ -93,6 +95,7 @@ files:
 - lib/active_record/associations/join_dependency/join_association.rb
 - lib/active_record/associations/join_dependency/join_base.rb
 - lib/active_record/associations/join_dependency/join_part.rb
+- lib/active_record/associations/nested_error.rb
 - lib/active_record/associations/preloader.rb
 - lib/active_record/associations/preloader/association.rb
 - lib/active_record/associations/preloader/batch.rb
@@ -104,6 +107,7 @@ files:
 - lib/active_record/attribute_assignment.rb
 - lib/active_record/attribute_methods.rb
 - lib/active_record/attribute_methods/before_type_cast.rb
+- lib/active_record/attribute_methods/composite_primary_key.rb
 - lib/active_record/attribute_methods/dirty.rb
 - lib/active_record/attribute_methods/primary_key.rb
 - lib/active_record/attribute_methods/query.rb
@@ -239,6 +243,7 @@ files:
 - lib/active_record/encryption/key_generator.rb
 - lib/active_record/encryption/key_provider.rb
 - lib/active_record/encryption/message.rb
+- lib/active_record/encryption/message_pack_message_serializer.rb
 - lib/active_record/encryption/message_serializer.rb
 - lib/active_record/encryption/null_encryptor.rb
 - lib/active_record/encryption/properties.rb
@@ -248,7 +253,7 @@ files:
 - lib/active_record/errors.rb
 - lib/active_record/explain.rb
 - lib/active_record/explain_registry.rb
-- lib/active_record/explain_subscriber.rb
+- lib/active_record/filter_attribute_handler.rb
 - lib/active_record/fixture_set/file.rb
 - lib/active_record/fixture_set/model_metadata.rb
 - lib/active_record/fixture_set/render_context.rb
@@ -275,6 +280,7 @@ files:
 - lib/active_record/migration.rb
 - lib/active_record/migration/command_recorder.rb
 - lib/active_record/migration/compatibility.rb
+- lib/active_record/migration/default_schema_versions_formatter.rb
 - lib/active_record/migration/default_strategy.rb
 - lib/active_record/migration/execution_strategy.rb
 - lib/active_record/migration/join_table.rb
@@ -282,7 +288,6 @@ files:
 - lib/active_record/model_schema.rb
 - lib/active_record/nested_attributes.rb
 - lib/active_record/no_touching.rb
-- lib/active_record/normalization.rb
 - lib/active_record/persistence.rb
 - lib/active_record/promise.rb
 - lib/active_record/query_cache.rb
@@ -293,6 +298,7 @@ files:
 - lib/active_record/railties/console_sandbox.rb
 - lib/active_record/railties/controller_runtime.rb
 - lib/active_record/railties/databases.rake
+- lib/active_record/railties/job_checkpoints.rb
 - lib/active_record/railties/job_runtime.rb
 - lib/active_record/readonly_attributes.rb
 - lib/active_record/reflection.rb
@@ -313,7 +319,6 @@ files:
 - lib/active_record/relation/predicate_builder/relation_handler.rb
 - lib/active_record/relation/query_attribute.rb
 - lib/active_record/relation/query_methods.rb
-- lib/active_record/relation/record_fetch_warning.rb
 - lib/active_record/relation/spawn_methods.rb
 - lib/active_record/relation/where_clause.rb
 - lib/active_record/result.rb
@@ -331,17 +336,21 @@ files:
 - lib/active_record/signed_id.rb
 - lib/active_record/statement_cache.rb
 - lib/active_record/store.rb
+- lib/active_record/structured_event_subscriber.rb
 - lib/active_record/suppressor.rb
 - lib/active_record/table_metadata.rb
+- lib/active_record/tasks/abstract_tasks.rb
 - lib/active_record/tasks/database_tasks.rb
 - lib/active_record/tasks/mysql_database_tasks.rb
 - lib/active_record/tasks/postgresql_database_tasks.rb
 - lib/active_record/tasks/sqlite_database_tasks.rb
 - lib/active_record/test_databases.rb
 - lib/active_record/test_fixtures.rb
+- lib/active_record/testing/query_assertions.rb
 - lib/active_record/timestamp.rb
 - lib/active_record/token_for.rb
 - lib/active_record/touch_later.rb
+- lib/active_record/transaction.rb
 - lib/active_record/transactions.rb
 - lib/active_record/translation.rb
 - lib/active_record/type.rb
@@ -385,7 +394,6 @@ files:
 - lib/arel/insert_manager.rb
 - lib/arel/math.rb
 - lib/arel/nodes.rb
-- lib/arel/nodes/and.rb
 - lib/arel/nodes/ascending.rb
 - lib/arel/nodes/binary.rb
 - lib/arel/nodes/bind_param.rb
@@ -414,6 +422,7 @@ files:
 - lib/arel/nodes/leading_join.rb
 - lib/arel/nodes/matches.rb
 - lib/arel/nodes/named_function.rb
+- lib/arel/nodes/nary.rb
 - lib/arel/nodes/node.rb
 - lib/arel/nodes/node_expression.rb
 - lib/arel/nodes/ordering.rb
@@ -469,10 +478,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.5.2/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.5.2/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.2.1/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.2.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.5.2/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.2.1/activerecord
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"
@@ -483,14 +492,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []

data/lib/active_record/explain_subscriber.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/notifications"
-require "active_record/explain_registry"
-
-module ActiveRecord
-  class ExplainSubscriber # :nodoc:
-    def start(name, id, payload)
-      # unused
-    end
-
-    def finish(name, id, payload)
-      if ExplainRegistry.collect? && !ignore_payload?(payload)
-        ExplainRegistry.queries << payload.values_at(:sql, :binds)
-      end
-    end
-
-    # SCHEMA queries cannot be EXPLAINed, also we do not want to run EXPLAIN on
-    # our own EXPLAINs no matter how loopingly beautiful that would be.
-    #
-    # On the other hand, we want to monitor the performance of our real database
-    # queries, not the performance of the access to the query cache.
-    IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN)
-    EXPLAINED_SQLS = /\A\s*(\/\*.*\*\/)?\s*(with|select|update|delete|insert)\b/i
-    def ignore_payload?(payload)
-      payload[:exception] ||
-        payload[:cached] ||
-        IGNORED_PAYLOADS.include?(payload[:name]) ||
-        !payload[:sql].match?(EXPLAINED_SQLS)
-    end
-
-    ActiveSupport::Notifications.subscribe("sql.active_record", new)
-  end
-end

data/lib/active_record/normalization.rb

@@ -1,167 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord # :nodoc:
-  module Normalization
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :normalized_attributes, default: Set.new
-
-      before_validation :normalize_changed_in_place_attributes
-    end
-
-    # Normalizes a specified attribute using its declared normalizations.
-    #
-    # ==== Examples
-    #
-    #   class User < ActiveRecord::Base
-    #     normalizes :email, with: -> email { email.strip.downcase }
-    #   end
-    #
-    #   legacy_user = User.find(1)
-    #   legacy_user.email # => " CRUISE-CONTROL@EXAMPLE.COM\n"
-    #   legacy_user.normalize_attribute(:email)
-    #   legacy_user.email # => "cruise-control@example.com"
-    #   legacy_user.save
-    def normalize_attribute(name)
-      # Treat the value as a new, unnormalized value.
-      self[name] = self[name]
-    end
-
-    module ClassMethods
-      # Declares a normalization for one or more attributes. The normalization
-      # is applied when the attribute is assigned or updated, and the normalized
-      # value will be persisted to the database. The normalization is also
-      # applied to the corresponding keyword argument of query methods. This
-      # allows a record to be created and later queried using unnormalized
-      # values.
-      #
-      # However, to prevent confusion, the normalization will not be applied
-      # when the attribute is fetched from the database. This means that if a
-      # record was persisted before the normalization was declared, the record's
-      # attribute will not be normalized until either it is assigned a new
-      # value, or it is explicitly migrated via Normalization#normalize_attribute.
-      #
-      # Because the normalization may be applied multiple times, it should be
-      # _idempotent_. In other words, applying the normalization more than once
-      # should have the same result as applying it only once.
-      #
-      # By default, the normalization will not be applied to +nil+ values. This
-      # behavior can be changed with the +:apply_to_nil+ option.
-      #
-      # Be aware that if your app was created before Rails 7.1, and your app
-      # marshals instances of the targeted model (for example, when caching),
-      # then you should set ActiveRecord.marshalling_format_version to +7.1+ or
-      # higher via either <tt>config.load_defaults 7.1</tt> or
-      # <tt>config.active_record.marshalling_format_version = 7.1</tt>.
-      # Otherwise, +Marshal+ may attempt to serialize the normalization +Proc+
-      # and raise +TypeError+.
-      #
-      # ==== Options
-      #
-      # * +:with+ - Any callable object that accepts the attribute's value as
-      #   its sole argument, and returns it normalized.
-      # * +:apply_to_nil+ - Whether to apply the normalization to +nil+ values.
-      #   Defaults to +false+.
-      #
-      # ==== Examples
-      #
-      #   class User < ActiveRecord::Base
-      #     normalizes :email, with: -> email { email.strip.downcase }
-      #     normalizes :phone, with: -> phone { phone.delete("^0-9").delete_prefix("1") }
-      #   end
-      #
-      #   user = User.create(email: " CRUISE-CONTROL@EXAMPLE.COM\n")
-      #   user.email                  # => "cruise-control@example.com"
-      #
-      #   user = User.find_by(email: "\tCRUISE-CONTROL@EXAMPLE.COM ")
-      #   user.email                  # => "cruise-control@example.com"
-      #   user.email_before_type_cast # => "cruise-control@example.com"
-      #
-      #   User.where(email: "\tCRUISE-CONTROL@EXAMPLE.COM ").count         # => 1
-      #   User.where(["email = ?", "\tCRUISE-CONTROL@EXAMPLE.COM "]).count # => 0
-      #
-      #   User.exists?(email: "\tCRUISE-CONTROL@EXAMPLE.COM ")         # => true
-      #   User.exists?(["email = ?", "\tCRUISE-CONTROL@EXAMPLE.COM "]) # => false
-      #
-      #   User.normalize_value_for(:phone, "+1 (555) 867-5309") # => "5558675309"
-      def normalizes(*names, with:, apply_to_nil: false)
-        names.each do |name|
-          attribute(name) do |cast_type|
-            NormalizedValueType.new(cast_type: cast_type, normalizer: with, normalize_nil: apply_to_nil)
-          end
-        end
-
-        self.normalized_attributes += names.map(&:to_sym)
-      end
-
-      # Normalizes a given +value+ using normalizations declared for +name+.
-      #
-      # ==== Examples
-      #
-      #   class User < ActiveRecord::Base
-      #     normalizes :email, with: -> email { email.strip.downcase }
-      #   end
-      #
-      #   User.normalize_value_for(:email, " CRUISE-CONTROL@EXAMPLE.COM\n")
-      #   # => "cruise-control@example.com"
-      def normalize_value_for(name, value)
-        type_for_attribute(name).cast(value)
-      end
-    end
-
-    private
-      def normalize_changed_in_place_attributes
-        self.class.normalized_attributes.each do |name|
-          normalize_attribute(name) if attribute_changed_in_place?(name)
-        end
-      end
-
-      class NormalizedValueType < DelegateClass(ActiveModel::Type::Value) # :nodoc:
-        include ActiveModel::Type::SerializeCastValue
-
-        attr_reader :cast_type, :normalizer, :normalize_nil
-        alias :normalize_nil? :normalize_nil
-
-        def initialize(cast_type:, normalizer:, normalize_nil:)
-          @cast_type = cast_type
-          @normalizer = normalizer
-          @normalize_nil = normalize_nil
-          super(cast_type)
-        end
-
-        def cast(value)
-          normalize(super(value))
-        end
-
-        def serialize(value)
-          serialize_cast_value(cast(value))
-        end
-
-        def serialize_cast_value(value)
-          ActiveModel::Type::SerializeCastValue.serialize(cast_type, value)
-        end
-
-        def ==(other)
-          self.class == other.class &&
-            normalize_nil? == other.normalize_nil? &&
-            normalizer == other.normalizer &&
-            cast_type == other.cast_type
-        end
-        alias eql? ==
-
-        def hash
-          [self.class, cast_type, normalizer, normalize_nil?].hash
-        end
-
-        def inspect
-          Kernel.instance_method(:inspect).bind_call(self)
-        end
-
-        private
-          def normalize(value)
-            normalizer.call(value) unless value.nil? && !normalize_nil?
-          end
-      end
-  end
-end

data/lib/active_record/relation/record_fetch_warning.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  class Relation
-    module RecordFetchWarning
-      # When this module is prepended to ActiveRecord::Relation and
-      # +config.active_record.warn_on_records_fetched_greater_than+ is
-      # set to an integer, if the number of records a query returns is
-      # greater than the value of +warn_on_records_fetched_greater_than+,
-      # a warning is logged. This allows for the detection of queries that
-      # return a large number of records, which could cause memory bloat.
-      #
-      # In most cases, fetching large number of records can be performed
-      # efficiently using the ActiveRecord::Batches methods.
-      # See ActiveRecord::Batches for more information.
-      def exec_queries
-        QueryRegistry.reset
-
-        super.tap do |records|
-          if logger && ActiveRecord.warn_on_records_fetched_greater_than
-            if records.length > ActiveRecord.warn_on_records_fetched_greater_than
-              logger.warn "Query fetched #{records.size} #{@klass} records: #{QueryRegistry.queries.join(";")}"
-            end
-          end
-        end
-      end
-
-      # :stopdoc:
-      ActiveSupport::Notifications.subscribe("sql.active_record") do |*, payload|
-        QueryRegistry.queries << payload[:sql]
-      end
-      # :startdoc:
-
-      module QueryRegistry # :nodoc:
-        extend self
-
-        def queries
-          ActiveSupport::IsolatedExecutionState[:active_record_query_registry] ||= []
-        end
-
-        def reset
-          queries.clear
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Relation.prepend ActiveRecord::Relation::RecordFetchWarning