mongodb
diff --git a/‎docs/reference/configuration.txt‎
Lines changed: 87 additions & 203 deletions b/‎docs/reference/configuration.txt‎
Lines changed: 87 additions & 203 deletions
diff --git a/‎docs/reference/crud.txt‎
Lines changed: 2 additions & 11 deletions b/‎docs/reference/crud.txt‎
Lines changed: 2 additions & 11 deletions
diff --git a/‎docs/reference/fields.txt‎
Lines changed: 0 additions & 1 deletion b/‎docs/reference/fields.txt‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎docs/release-notes/mongoid-8.1.txt‎
Lines changed: 30 additions & 1 deletion b/‎docs/release-notes/mongoid-8.1.txt‎
Lines changed: 30 additions & 1 deletion
diff --git a/‎docs/release-notes/mongoid-9.0.txt‎
Lines changed: 31 additions & 10 deletions b/‎docs/release-notes/mongoid-9.0.txt‎
Lines changed: 31 additions & 10 deletions
diff --git a/‎docs/tutorials/getting-started-rails7.txt‎
Lines changed: 2 additions & 2 deletions b/‎docs/tutorials/getting-started-rails7.txt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/mongoid/association/embedded/batchable.rb‎
Lines changed: 5 additions & 7 deletions b/‎lib/mongoid/association/embedded/batchable.rb‎
Lines changed: 5 additions & 7 deletions
diff --git a/‎lib/mongoid/association/embedded/embeds_one/proxy.rb‎
Lines changed: 22 additions & 24 deletions b/‎lib/mongoid/association/embedded/embeds_one/proxy.rb‎
Lines changed: 22 additions & 24 deletions
diff --git a/‎lib/mongoid/association/referenced/has_many/enumerable.rb‎
Lines changed: 1 addition & 5 deletions b/‎lib/mongoid/association/referenced/has_many/enumerable.rb‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎lib/mongoid/config.rb‎
Lines changed: 28 additions & 51 deletions b/‎lib/mongoid/config.rb‎
Lines changed: 28 additions & 51 deletions
@@ -39,17 +39,8 @@ operations with examples.
 
    * - ``Model#attributes``
 
-       *Returns a hash of the document's attributes with its values in
-       mongoized form (i.e. the way they are stored in the db).*
-
-       *In Mongoid 8.0 by default, and Mongoid 7.5 with the*
-       ``legacy_attributes`` *flag set to false, the object returned from this
-       method will have class* ``Hash``, *and have string keys. In Mongoid 7.5
-       by default, and in Mongoid 8.0 with the* ``legacy_attributes`` *flag set
-       to true, the object returned from this method will be a*
-       ``BSON::Document`` *(and thus, indifferently accessible) if the document
-       has been retrieved from the database, and a* ``Hash`` *with string keys
-       if it is a new document.*
+       *Returns the document's attributes as a ``Hash`` with string keys, and
+       its values in Mongoized form (i.e. the way they are stored in the db).*
 
        *The attributes hash also contains the attributes of all embedded
        documents, as well as their embedded documents, etc. If an embedded
 
@@ -355,7 +355,6 @@ returned is defined by the :ref:`configured time zone settings <time-zones>`.
      field :opened_at, type: DateTime
    end
 
-   Mongoid.use_activesupport_time_zone = true
    Time.zone = 'Berlin'
 
    ticket = Ticket.create!(opened_at: '2018-02-18 07:00:08 -0500')
 
@@ -92,6 +92,15 @@ For all of the new methods there are also shorter forms created dynamically, e.g
 and ``will_save_change_to_attribute?(:name)`` is equivalent to ``will_save_change_to_name?``.
 
 
+Deprecated ``use_activesupport_time_zone`` config option
+--------------------------------------------------------
+
+The config option ``use_activesupport_time_zone`` has been deprecated.
+Beginning in Mongoid 9.0, it will be ignored and always behave as true.
+Since ``use_activesupport_time_zone`` currently defaults to true, it is
+safe to remove from your config file at this time.
+
+
 Configuration DSL No Longer Requires an Argument to its Block
 -------------------------------------------------------------
 
@@ -378,7 +387,7 @@ Added ``none_of`` Query Method
 ------------------------------
 
 With the addition of ``none_of``, Mongoid 8.1 allows queries to exclude
-conditions in bulk. The emitted query will encapsulate the specified 
+conditions in bulk. The emitted query will encapsulate the specified
 criteria in a ``$nor`` operation. For example:
 
 .. code:: ruby
@@ -398,3 +407,23 @@ criteria in a ``$nor`` operation. For example:
 
 This would query all buildings in Portland, excluding apartments, buildings less than
 100 units tall, and buildings with an occupancy greater than 2500 people.
+
+
+Added ``Mongoid::Config.immutable_ids``
+---------------------------------------
+
+Coming in Mongoid 9.0, the ``_id`` field will be immutable in both top-level
+and embedded documents. This addresses some inconsistency in how mutations
+to the ``_id`` field are treated currently. To prepare for this potentially
+breaking change, the ``Mongoid::Config.immutable_ids`` flag has been added. It
+defaults to ``false``, preserving the existing behavior, but you may set it to
+``true`` to prepare your apps for Mongoid 9.0. When this is set to ``true``,
+attempts to mutate the ``_id`` of a document will raise an exception.
+
+.. code:: ruby
+
+  # The default in Mongoid 8.1
+  Mongoid::Config.immutable_ids = false
+
+  # The default in Mongoid 9.0
+  Mongoid::Config.immutable_ids = true
@@ -17,6 +17,32 @@ The complete list of releases is available `on GitHub
 please consult GitHub releases for detailed release notes and JIRA for
 the complete list of issues fixed in each release, including bug fixes.
 
+Deprecated options removed
+--------------------------
+
+**Breaking change:** The following config options are removed in Mongoid 9.0.
+Please ensure you have removed all references to these from your app.
+If you were using ``config.load_defaults 8.1`` prior to upgrading, you will not
+experience any behavior change. Refer to earlier release notes for the meaning
+of each option.
+
+- ``:use_activesupport_time_zone``
+- ``:broken_aggregables``
+- ``:broken_alias_handling``
+- ``:broken_and``
+- ``:broken_scoping``
+- ``:broken_updates``
+- ``:compare_time_by_ms``
+- ``:legacy_attributes``
+- ``:legacy_pluck_distinct``
+- ``:legacy_triple_equals``
+- ``:object_id_as_json_oid``
+- ``:overwrite_chained_operators``
+
+In addition, support for ``config.load_defaults`` versions 7.5 and
+prior has been dropped (you must use a minimum of version 8.0.)
+
+
 ``touch`` method now clears changed state
 -----------------------------------------
 
@@ -128,13 +154,10 @@ Use configured time zone to typecast Date to Time in queries
 -------------------------------------------------------------
 
 When querying for a Time field using a Date value, Mongoid now correctly
-considers the ``Mongoid.use_activesupport_time_zone`` configuration option
-to perform type conversion.
+considers ``Time.zone`` to perform type conversion.
 
 .. code-block:: ruby
 
-  Mongoid.use_activesupport_time_zone = true
-
   class Magazine
     include Mongoid::Document
 
@@ -147,14 +170,12 @@ to perform type conversion.
   #=> will return all results on or after Sept 26th, 2022
   #   at 0:00 in Asia/Tokyo time zone.
 
-In prior Mongoid versions, the above code would ignore the
-``Mongoid.use_activesupport_time_zone`` setting and behave as if
-it were false, i.e. always using the system time zone to perform
-the type conversion.
+In prior Mongoid versions, the above code would ignore the ``Time.zone``
+(irrespective of the now-removed ``:use_activesupport_time_zone``
+setting) and always using the system time zone to perform the type conversion.
 
 Note that in prior Mongoid versions, typecasting Date to Time during
-persistence operations was already correctly using the
-``Mongoid.use_activesupport_time_zone`` setting.
+persistence operations was already correctly using time zone.
 
 
 ```#touch`` method on embedded documents correctly handles ``touch: false`` option
 
@@ -95,7 +95,7 @@ Setup Mongoid
 
     bin/rails g mongoid:config
 
-This generator will create the ``config/mongoid.yml`` configuration file 
+This generator will create the ``config/mongoid.yml`` configuration file
 (used to configure the connection to the MongoDB deployment) and the
 ``config/initializers/mongoid.rb`` initializer file (which may be used for
 other Mongoid-related configuration). Note that as we are not using
@@ -334,7 +334,7 @@ Generate the default Mongoid configuration:
 
     bin/rails g mongoid:config
 
-This generator will create the ``config/mongoid.yml`` configuration file 
+This generator will create the ``config/mongoid.yml`` configuration file
 (used to configure the connection to the MongoDB deployment) and the
 ``config/initializers/mongoid.rb`` initializer file (which may be used for
 other Mongoid-related configuration). In general, it is recommended to use
 
@@ -38,13 +38,11 @@ def batch_clear(docs)
               positionally(selector, "$unset" => { path => true }),
               session: _session
             )
-            unless Mongoid.broken_updates
-              # This solves the case in which a user sets, clears and resets an
-              # embedded document. Previously, since the embedded document was
-              # already marked not a "new_record", it wouldn't be persisted to
-              # the second time. This change fixes that and allows it to be persisted.
-              docs.each { |doc| doc.new_record = true }
-            end
+            # This solves the case in which a user sets, clears and resets an
+            # embedded document. Previously, since the embedded document was
+            # already marked not a "new_record", it wouldn't be persisted to
+            # the second time. This change fixes that and allows it to be persisted.
+            docs.each { |doc| doc.new_record = true }
             post_process_batch_remove(docs, :delete)
           end
           _unscoped.clear
 
@@ -55,30 +55,28 @@ def substitute(replacement)
                 # run the callbacks and state-changing code by passing persist: false in that case.
                 _target.destroy(persist: !replacement) if persistable?
 
-                unless Mongoid.broken_updates
-                  # A little explanation on why this is needed... Say we have three assignments:
-                  #
-                  # canvas.palette = palette
-                  # canvas.palette = nil
-                  # canvas.palette = palette
-                  # Where canvas embeds_one palette.
-                  #
-                  # Previously, what was happening was, on the first assignment,
-                  # palette was considered a "new record" (new_record?=true) and
-                  # thus palette was being inserted into the database. However,
-                  # on the third assignment, we're trying to reassign the palette,
-                  # palette is no longer considered a new record, because it had
-                  # been inserted previously. This is not exactly accurate,
-                  # because the second assignment ultimately removed the palette
-                  # from the database, so it needs to be reinserted. Since the
-                  # palette's new_record is false, Mongoid ends up "updating" the
-                  # document, which doesn't reinsert it into the database.
-                  #
-                  # The change I introduce here, respecifies palette as a "new
-                  # record" when it gets removed from the database, so if it is
-                  # reassigned, it will be reinserted into the database.
-                  _target.new_record = true
-                end
+                # A little explanation on why this is needed... Say we have three assignments:
+                #
+                # canvas.palette = palette
+                # canvas.palette = nil
+                # canvas.palette = palette
+                # Where canvas embeds_one palette.
+                #
+                # Previously, what was happening was, on the first assignment,
+                # palette was considered a "new record" (new_record?=true) and
+                # thus palette was being inserted into the database. However,
+                # on the third assignment, we're trying to reassign the palette,
+                # palette is no longer considered a new record, because it had
+                # been inserted previously. This is not exactly accurate,
+                # because the second assignment ultimately removed the palette
+                # from the database, so it needs to be reinserted. Since the
+                # palette's new_record is false, Mongoid ends up "updating" the
+                # document, which doesn't reinsert it into the database.
+                #
+                # The change I introduce here, respecifies palette as a "new
+                # record" when it gets removed from the database, so if it is
+                # reassigned, it will be reinserted into the database.
+                _target.new_record = true
               end
               unbind_one
               unless replacement
 
@@ -45,11 +45,7 @@ def ==(other)
           # @return [ true | false ] If the objects are equal in a case.
           def ===(other)
             return false unless other.respond_to?(:entries)
-            if Mongoid.legacy_triple_equals
-              other.class == Class ? (Array == other || Enumerable == other) : self == other
-            else
-              entries === other.entries
-            end
+            entries === other.entries
           end
 
           # Append a document to the enumerable.
 
@@ -71,63 +71,12 @@ module Config
     # existing method.
     option :scope_overwrite_exception, default: false
 
-    # Use ActiveSupport's time zone in time operations instead of the
-    # Ruby default time zone.
-    option :use_activesupport_time_zone, default: true
-
     # Return stored times as UTC.
     option :use_utc, default: false
 
     # Store BigDecimals as Decimal128s instead of strings in the db.
     option :map_big_decimal_to_decimal128, default: true
 
-    # Update embedded documents correctly when setting it, unsetting it
-    # and resetting it. See MONGOID-5206 and MONGOID-5240 for more details.
-    option :broken_updates, default: false
-
-    # Maintain legacy behavior of === on Mongoid documents, which returns
-    # true in a number of cases where Ruby's === implementation would
-    # return false.
-    option :legacy_triple_equals, default: false
-
-    # When exiting a nested `with_scope' block, set the current scope to
-    # nil instead of the parent scope for backwards compatibility.
-    option :broken_scoping, default: false
-
-    # Maintain broken behavior of sum over empty result sets for backwards
-    # compatibility.
-    option :broken_aggregables, default: false
-
-    # Ignore aliased fields in embedded documents when performing pluck and
-    # distinct operations, for backwards compatibility.
-    option :broken_alias_handling, default: false
-
-    # Maintain broken `and' behavior when using the same operator on the same
-    # field multiple times for backwards compatibility.
-    option :broken_and, default: false
-
-    # Use millisecond precision when comparing Time objects with the _matches?
-    # function.
-    option :compare_time_by_ms, default: true
-
-    # Use bson-ruby's implementation of as_json for BSON::ObjectId instead of
-    # the one monkey-patched into Mongoid.
-    option :object_id_as_json_oid, default: false
-
-    # Maintain legacy behavior of pluck and distinct, which does not
-    # demongoize the values on returning them.
-    option :legacy_pluck_distinct, default: false
-
-    # Combine chained operators, which use the same field and operator,
-    # using and's instead of overwriting them.
-    option :overwrite_chained_operators, default: false
-
-    # When this flag is true, the attributes method on a document will return
-    # a BSON::Document when that document is retrieved from the database, and
-    # a Hash otherwise. When this flag is false, the attributes method will
-    # always return a Hash.
-    option :legacy_attributes, default: false
-
     # Sets the async_query_executor for the application. By default the thread pool executor
     #   is set to `:immediate. Options are:
     #
@@ -397,5 +346,33 @@ def global_client
         client
       end
     end
+
+    module DeprecatedOptions
+      OPTIONS = %i[]
+
+      if RUBY_VERSION < '3.0'
+        def self.prepended(klass)
+          klass.class_eval do
+            OPTIONS.each do |option|
+              alias_method :"#{option}_without_deprecation=", :"#{option}="
+
+              define_method(:"#{option}=") do |value|
+                Mongoid::Warnings.send(:"warn_#{option}_deprecated")
+                send(:"#{option}_without_deprecation=", value)
+              end
+            end
+          end
+        end
+      else
+        OPTIONS.each do |option|
+          define_method(:"#{option}=") do |value|
+            Mongoid::Warnings.send(:"warn_#{option}_deprecated")
+            super(value)
+          end
+        end
+      end
+    end
+
+    prepend DeprecatedOptions
   end
 end