activerecord 7.1.0.rc1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 740af6b88b6b54646450a59ad5dfa1b03ca0848f6a0e35d144c0501450c95813
-  data.tar.gz: 116d5b18e58370804b0888cd01443af9c0d3d760f9ef8c6f0374572e592c1396
+  metadata.gz: 8c1c4576a55f62b03c5c65f85726c7a054dcf2265c0596ab2b836366f70de537
+  data.tar.gz: 8e1a2827cfc53bef1deaba5901134b589bac138711e37ac34fcf95254372b875
 SHA512:
-  metadata.gz: 4f6fd78b9fcd2d861501a1fb76e1c0575da14b158de781ef466c0568b1b3842efcf8213128a95e71cb8414e1ea5bc617850eb19cb30a05e45f5239633fa5023e
-  data.tar.gz: ed6ccf8f8470fba640ea0a18ccf2c2e5c62cabcd0a21cd9635acd2a9f1db63b22dd4fbd13d2474a020182f703ed3b0e9a11d34389654ae2fb6b7da23deab25f2
+  metadata.gz: 13a36c3bbd80622c3a266fd79883baa35dec93e3624d92718cc0fa56f6f4c23dfab83e6fd702e4a8e35b6e4a6f2e81fcc24f8c9e7a71c8d9e791f71bccb9536e
+  data.tar.gz: 0b132373d4dda124cc61707c5cd9e08e5cabb68815ed8650de2250becc5d0856610b3622a0d18434bd5182d84cf31fb6b20117d5b0d8ef28ef7698fdcfcc28b4

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Rails 7.1.0 (October 05, 2023) ##
+
+*   No changes.
+
+
+## Rails 7.1.0.rc2 (October 01, 2023) ##
+
+*   Remove -shm and -wal SQLite files when `rails db:drop` is run.
+
+    *Niklas Häusele*
+
+*   Revert the change to raise an `ArgumentError` when `#accepts_nested_attributes_for` is declared more than once for
+    an association in the same class.
+
+    The reverted behavior broke the case where the `#accepts_nested_attributes_for` was defined in a concern and
+    where overridden in the class that included the concern.
+
+    *Rafael Mendonça França*
+
+
 ## Rails 7.1.0.rc1 (September 27, 2023) ##
 
 *   Better naming for unique constraints support.

data/lib/active_record/associations/preloader.rb

@@ -75,7 +75,7 @@ module ActiveRecord
       #   for an Author.
       # - an Array which specifies multiple association names. This array
       #   is processed recursively. For example, specifying <tt>[:avatar, :books]</tt>
-      #   allows this method to preload an author's avatar as well as all of his
+      #   allows this method to preload an author's avatar as well as all of their
       #   books.
       # - a Hash which specifies multiple association names, as well as
       #   association names for the to-be-preloaded association objects. For

data/lib/active_record/associations.rb

@@ -1505,7 +1505,7 @@ module ActiveRecord
         # [+:query_constraints+]
         #   Serves as a composite foreign key. Defines the list of columns to be used to query the associated object.
         #   This is an optional option. By default Rails will attempt to derive the value automatically.
-        #   When the value is set the Array size must match associated model's primary key or `query_constraints` size.
+        #   When the value is set the Array size must match associated model's primary key or +query_constraints+ size.
         #
         # Option examples:
         #   has_many :comments, -> { order("posted_on") }
@@ -1689,7 +1689,7 @@ module ActiveRecord
         # [+:query_constraints+]
         #   Serves as a composite foreign key. Defines the list of columns to be used to query the associated object.
         #   This is an optional option. By default Rails will attempt to derive the value automatically.
-        #   When the value is set the Array size must match associated model's primary key or `query_constraints` size.
+        #   When the value is set the Array size must match associated model's primary key or +query_constraints+ size.
         #
         # Option examples:
         #   has_one :credit_card, dependent: :destroy  # destroys the associated credit card
@@ -1866,7 +1866,7 @@ module ActiveRecord
         # [+:query_constraints+]
         #   Serves as a composite foreign key. Defines the list of columns to be used to query the associated object.
         #   This is an optional option. By default Rails will attempt to derive the value automatically.
-        #   When the value is set the Array size must match associated model's primary key or `query_constraints` size.
+        #   When the value is set the Array size must match associated model's primary key or +query_constraints+ size.
         #
         # Option examples:
         #   belongs_to :firm, foreign_key: "client_of"

data/lib/active_record/connection_adapters/abstract/transaction.rb

@@ -82,8 +82,11 @@ module ActiveRecord
         @base_payload = payload
       end
 
+      class InstrumentationNotStartedError < ActiveRecordError; end
+      class InstrumentationAlreadyStartedError < ActiveRecordError; end
+
       def start
-        return if @started
+        raise InstrumentationAlreadyStartedError.new("Called start on an already started transaction") if @started
         @started = true
 
         @payload = @base_payload.dup
@@ -92,7 +95,7 @@ module ActiveRecord
       end
 
       def finish(outcome)
-        return unless @started
+        raise InstrumentationNotStartedError.new("Called finish on a transaction that hasn't started") unless @started
         @started = false
 
         @payload[:outcome] = outcome
@@ -166,7 +169,7 @@ module ActiveRecord
       end
 
       def incomplete!
-        @instrumenter.finish(:incomplete)
+        @instrumenter.finish(:incomplete) if materialized?
       end
 
       def materialize!
@@ -180,6 +183,7 @@ module ActiveRecord
 
       def restore!
         if materialized?
+          incomplete!
           @materialized = false
           materialize!
         end
@@ -348,13 +352,13 @@ module ActiveRecord
           connection.rollback_to_savepoint(savepoint_name) if materialized?
         end
         @state.rollback!
-        @instrumenter.finish(:rollback)
+        @instrumenter.finish(:rollback) if materialized?
       end
 
       def commit
         connection.release_savepoint(savepoint_name) if materialized?
         @state.commit!
-        @instrumenter.finish(:commit)
+        @instrumenter.finish(:commit) if materialized?
       end
 
       def full_rollback?; false; end
@@ -389,13 +393,13 @@ module ActiveRecord
       def rollback
         connection.rollback_db_transaction if materialized?
         @state.full_rollback!
-        @instrumenter.finish(:rollback)
+        @instrumenter.finish(:rollback) if materialized?
       end
 
       def commit
         connection.commit_db_transaction if materialized?
         @state.full_commit!
-        @instrumenter.finish(:commit)
+        @instrumenter.finish(:commit) if materialized?
       end
     end
 

data/lib/active_record/connection_adapters/postgresql/quoting.rb

@@ -149,6 +149,7 @@ module ActiveRecord
         end
 
         def lookup_cast_type_from_column(column) # :nodoc:
+          verify! if type_map.nil?
           type_map.lookup(column.oid, column.fmod, column.sql_type)
         end
 

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -716,9 +716,7 @@ module ActiveRecord
       end
 
       private
-        def type_map
-          @type_map ||= Type::HashLookupTypeMap.new
-        end
+        attr_reader :type_map
 
         def initialize_type_map(m = type_map)
           self.class.initialize_type_map(m)

data/lib/active_record/connection_adapters/schema_cache.rb

@@ -66,7 +66,7 @@ module ActiveRecord
         cache(connection).indexes(connection, table_name)
       end
 
-      def database_version(connection)
+      def database_version(connection) # :nodoc:
         cache(connection).database_version(connection)
       end
 
@@ -196,7 +196,7 @@ module ActiveRecord
         @schema_reflection.indexes(@connection, table_name)
       end
 
-      def database_version
+      def database_version # :nodoc:
         @schema_reflection.database_version(@connection)
       end
 

data/lib/active_record/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveRecord
     MAJOR = 7
     MINOR = 1
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_record/model_schema.rb

@@ -553,6 +553,20 @@ module ActiveRecord
         initialize_find_by_cache
       end
 
+      def load_schema # :nodoc:
+        return if schema_loaded?
+        @load_schema_monitor.synchronize do
+          return if @columns_hash
+
+          load_schema!
+
+          @schema_loaded = true
+        rescue
+          reload_schema_from_cache # If the schema loading failed half way through, we must reset the state.
+          raise
+        end
+      end
+
       protected
         def initialize_load_schema_monitor
           @load_schema_monitor = Monitor.new
@@ -594,20 +608,6 @@ module ActiveRecord
           defined?(@schema_loaded) && @schema_loaded
         end
 
-        def load_schema
-          return if schema_loaded?
-          @load_schema_monitor.synchronize do
-            return if @columns_hash
-
-            load_schema!
-
-            @schema_loaded = true
-          rescue
-            reload_schema_from_cache # If the schema loading failed half way through, we must reset the state.
-            raise
-          end
-        end
-
         def load_schema!
           unless table_name
             raise ActiveRecord::TableNotSpecified, "#{self} has no table configured. Set one with #{self}.table_name="

data/lib/active_record/nested_attributes.rb

@@ -355,17 +355,12 @@ module ActiveRecord
         options.update(attr_names.extract_options!)
         options.assert_valid_keys(:allow_destroy, :reject_if, :limit, :update_only)
         options[:reject_if] = REJECT_ALL_BLANK_PROC if options[:reject_if] == :all_blank
-        options[:class] = self
 
         attr_names.each do |association_name|
           if reflection = _reflect_on_association(association_name)
             reflection.autosave = true
             define_autosave_validation_callbacks(reflection)
 
-            if nested_attributes_options.dig(association_name.to_sym, :class) == self
-              raise ArgumentError, "Already declared #{association_name} as an accepts_nested_attributes association for this class."
-            end
-
             nested_attributes_options = self.nested_attributes_options.dup
             nested_attributes_options[association_name.to_sym] = options
             self.nested_attributes_options = nested_attributes_options

data/lib/active_record/persistence.rb

@@ -1272,7 +1272,7 @@ module ActiveRecord
     def _raise_record_not_destroyed
       @_association_destroy_exception ||= nil
       key = self.class.primary_key
-      raise @_association_destroy_exception || RecordNotDestroyed.new("Failed to destroy #{self.class} with #{key}=#{send(key)}", self)
+      raise @_association_destroy_exception || RecordNotDestroyed.new("Failed to destroy #{self.class} with #{key}=#{id}", self)
     ensure
       @_association_destroy_exception = nil
     end

data/lib/active_record/querying.rb

@@ -51,7 +51,7 @@ module ActiveRecord
       _load_from_sql(_query_by_sql(sql, binds, preparable: preparable), &block)
     end
 
-    # Same as <tt>#find_by_sql</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#find_by_sql</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_find_by_sql(sql, binds = [], preparable: nil, &block)
       _query_by_sql(sql, binds, preparable: preparable, async: true).then do |result|
         _load_from_sql(result, &block)
@@ -102,7 +102,7 @@ module ActiveRecord
       connection.select_value(sanitize_sql(sql), "#{name} Count").to_i
     end
 
-    # Same as <tt>#count_by_sql</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#count_by_sql</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_count_by_sql(sql)
       connection.select_value(sanitize_sql(sql), "#{name} Count", async: true).then(&:to_i)
     end

data/lib/active_record/railtie.rb

@@ -67,7 +67,7 @@ module ActiveRecord
       unless ActiveSupport::Logger.logger_outputs_to?(Rails.logger, STDERR, STDOUT)
         console = ActiveSupport::Logger.new(STDERR)
         console.level = Rails.logger.level
-        Rails.logger = ActiveSupport::BroadcastLogger.new(Rails.logger, console)
+        Rails.logger.broadcast_to(console)
       end
       ActiveRecord.verbose_query_logs = false
     end

data/lib/active_record/relation/calculations.rb

@@ -93,7 +93,7 @@ module ActiveRecord
       end
     end
 
-    # Same as <tt>#count</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#count</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_count(column_name = nil)
       async.count(column_name)
     end
@@ -106,7 +106,7 @@ module ActiveRecord
       calculate(:average, column_name)
     end
 
-    # Same as <tt>#average</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#average</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_average(column_name)
       async.average(column_name)
     end
@@ -120,7 +120,7 @@ module ActiveRecord
       calculate(:minimum, column_name)
     end
 
-    # Same as <tt>#minimum</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#minimum</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_minimum(column_name)
       async.minimum(column_name)
     end
@@ -134,7 +134,7 @@ module ActiveRecord
       calculate(:maximum, column_name)
     end
 
-    # Same as <tt>#maximum</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#maximum</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_maximum(column_name)
       async.maximum(column_name)
     end
@@ -152,7 +152,7 @@ module ActiveRecord
       end
     end
 
-    # Same as <tt>#sum</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#sum</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_sum(identity_or_column = nil)
       async.sum(identity_or_column)
     end
@@ -287,7 +287,7 @@ module ActiveRecord
       end
     end
 
-    # Same as <tt>#pluck</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#pluck</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_pluck(*column_names)
       async.pluck(*column_names)
     end
@@ -315,7 +315,7 @@ module ActiveRecord
       limit(1).pluck(*column_names).then(&:first)
     end
 
-    # Same as <tt>#pick</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#pick</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_pick(*column_names)
       async.pick(*column_names)
     end
@@ -358,7 +358,7 @@ module ActiveRecord
       result.then { |result| type_cast_pluck_values(result, columns) }
     end
 
-    # Same as <tt>#ids</tt> but perform the query asynchronously and returns an ActiveRecord::Promise
+    # Same as <tt>#ids</tt> but perform the query asynchronously and returns an ActiveRecord::Promise.
     def async_ids
       async.ids
     end

data/lib/active_record/tasks/sqlite_database_tasks.rb

@@ -23,6 +23,7 @@ module ActiveRecord
         db_path = db_config.database
         file = File.absolute_path?(db_path) ? db_path : File.join(root, db_path)
         FileUtils.rm(file)
+        FileUtils.rm_f(["#{file}-shm", "#{file}-wal"])
       rescue Errno::ENOENT => error
         raise NoDatabaseError.new(error.message)
       end

data/lib/active_record/validations/uniqueness.rb

@@ -87,7 +87,7 @@ module ActiveRecord
           klass.connection.schema_cache.indexes(klass.table_name).any? do |index|
             index.unique &&
               index.where.nil? &&
-              (index.columns - attributes).empty?
+              (Array(index.columns) - attributes).empty?
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 7.1.0.rc1
+  version: 7.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0.rc1
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0.rc1
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0.rc1
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.0.rc1
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: timeout
   requirement: !ruby/object:Gem::Requirement
@@ -469,10 +469,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.0.rc1/activerecord/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.0.rc1/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.0/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.0/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.0.rc1/activerecord
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.0/activerecord
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
@@ -487,9 +487,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.18
 signing_key: