mongoid 6.4.8 → 7.0.0.beta

data/lib/mongoid/persistable/destroyable.rb

@@ -48,7 +48,11 @@ module Mongoid
         #
         # @since 1.0.0
         def destroy_all(conditions = nil)
-          where(conditions || {}).destroy
+          selector = conditions || {}
+          documents = where(selector)
+          destroyed = documents.count
+          documents.each { |doc| doc.destroy }
+          destroyed
         end
       end
     end

data/lib/mongoid/persistable/incrementable.rb

@@ -28,7 +28,7 @@ module Mongoid
             attributes[field] = (current || 0) + increment
             ops[atomic_attribute_name(field)] = increment
           end
-          { "$inc" => ops }
+          { "$inc" => ops } unless ops.empty?
         end
       end
     end

data/lib/mongoid/persistable/logical.rb

@@ -30,7 +30,7 @@ module Mongoid
             attributes[field] = value
             ops[atomic_attribute_name(field)] = values
           end
-          { "$bit" => ops }
+          { "$bit" => ops } unless ops.empty?
         end
       end
     end

data/lib/mongoid/persistable/settable.rb

@@ -25,15 +25,15 @@ module Mongoid
 
             field_and_value_hash = hasherizer(field.split('.'), value)
             field = field_and_value_hash.keys.first.to_s
-            value = field_and_value_hash[field]
 
-            if fields[field] && fields[field].type == Hash && attributes.key?(field) && Hash === value && !value.empty?
+            if fields[field] && fields[field].type == Hash && attributes.key?(field)
               merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-              value = (attributes[field] || {}).merge(value, &merger)
+              value = (attributes[field] || {}).merge(field_and_value_hash[field], &merger)
+              process_attribute(field.to_s, value)
+            else
+              process_attribute(field.to_s, field_and_value_hash[field])
             end
 
-            process_attribute(field.to_s, value)
-
             unless relations.include?(field.to_s)
               ops[atomic_attribute_name(field)] = attributes[field]
             end

data/lib/mongoid/persistable/updatable.rb

@@ -134,9 +134,9 @@ module Mongoid
           unless updates.empty?
             coll = collection(_root)
             selector = atomic_selector
-            coll.find(selector).update_one(positionally(selector, updates), session: _session)
+            coll.find(selector).update_one(positionally(selector, updates))
             conflicts.each_pair do |key, value|
-              coll.find(selector).update_one(positionally(selector, { key => value }), session: _session)
+              coll.find(selector).update_one(positionally(selector, { key => value }))
             end
           end
         end

data/lib/mongoid/persistable/upsertable.rb

@@ -21,8 +21,7 @@ module Mongoid
       # @since 3.0.0
       def upsert(options = {})
         prepare_upsert(options) do
-          collection.find(atomic_selector).update_one(
-              as_attributes, upsert: true, session: _session)
+          collection.find(atomic_selector).update_one(as_attributes, upsert: true)
         end
       end
 

data/lib/mongoid/persistence_context.rb

@@ -107,10 +107,6 @@ module Mongoid
     #
     # @since 6.0.0
     def client
-      client_options = send(:client_options)
-      if client_options[:read].is_a?(Symbol)
-        client_options = client_options.merge(read: {mode: client_options[:read]})
-      end
       @client ||= (client = Clients.with_name(client_name)
                     client = client.use(database_name) if database_name_option
                     client.with(client_options))
@@ -199,10 +195,10 @@ module Mongoid
         Thread.current["[mongoid][#{object.object_id}]:context"]
       end
 
-      # Clear the persistence context for a particular class or model instance.
+      # Get the persistence context for a particular class or model instance.
       #
-      # @example Clear the persistence context for a class or model instance.
-      #  PersistenceContext.clear(model)
+      # @example Get the persistence context for a class or model instance.
+      #  PersistenceContext.get(model)
       #
       # @param [ Class, Object ] object The class or model instance.
       # @param [ Mongo::Cluster ] cluster The original cluster before this context was used.
@@ -212,9 +208,8 @@ module Mongoid
         if context = get(object)
           context.client.close unless (context.cluster.equal?(cluster) || cluster.nil?)
         end
-      ensure
         Thread.current["[mongoid][#{object.object_id}]:context"] = nil
       end
     end
   end
-end
+end

data/lib/mongoid/query_cache.rb

@@ -159,14 +159,11 @@ module Mongoid
       private
 
       def process(result)
-        documents = super
-
-        if @cursor_id.zero? && !@after_first_batch
-          @cached_documents ||= []
-          @cached_documents.concat(documents)
-        end
-
-        @after_first_batch = true
+        @remaining -= result.returned_count if limited?
+        @cursor_id = result.cursor_id
+        @coll_name ||= result.namespace.sub("#{database.name}.", '') if result.namespace
+        documents = result.documents
+        (@cached_documents ||= []).concat(documents)
         documents
       end
     end
@@ -221,40 +218,18 @@ module Mongoid
       #
       # @since 5.0.0
       def each
-        if system_collection? || !QueryCache.enabled? || (respond_to?(:write?, true) && write?)
+        if system_collection? || !QueryCache.enabled?
           super
         else
-          @cursor = nil
-          unless @cursor = cached_cursor
-
-            if driver_supports_cursor_sessions?
-              session = client.send(:get_session, @options)
-              read_with_retry(session, server_selector) do |server|
-                result = send_initial_query(server, session)
-                @cursor = get_cursor(result, server, session)
-              end
-            else
-              read_with_retry do
-                server = server_selector.select_server(cluster)
-                result = send_initial_query(server)
-                @cursor = get_cursor(result, server)
-              end
-            end
-          end
-
-          if block_given?
-            if limit && limit != -1
-              @cursor.to_a[0...limit].each do |doc|
-                yield doc
-              end
-            else
-              @cursor.each do |doc|
-                yield doc
-              end
-            end
-          else
-            @cursor.to_enum
+          unless cursor = cached_cursor
+            server = read.select_server(cluster)
+            cursor = CachedCursor.new(view, send_initial_query(server), server)
+            QueryCache.cache_table[cache_key] = cursor
           end
+          cursor.each do |doc|
+            yield doc
+          end if block_given?
+          cursor
         end
       end
 
@@ -264,28 +239,12 @@ module Mongoid
         if limit
           key = [ collection.namespace, selector, nil, skip, sort, projection, collation  ]
           cursor = QueryCache.cache_table[key]
-        end
-        cursor || QueryCache.cache_table[cache_key]
-      end
-
-      def get_cursor(result, server, session = nil)
-        if result.cursor_id == 0 || result.cursor_id.nil?
-          cursor = if session
-            CachedCursor.new(view, result, server, session: session)
-          else
-            CachedCursor.new(view, result, server)
-          end
-
-          QueryCache.cache_table[cache_key] = cursor
-        else
-          cursor = if session
-            Mongo::Cursor.new(view, result, server, session: session)
-          else
-            Mongo::Cursor.new(view, result, server)
+          if cursor
+            limited_docs = cursor.to_a[0...limit.abs]
+            cursor.instance_variable_set(:@cached_documents, limited_docs)
           end
         end
-
-        cursor
+        cursor || QueryCache.cache_table[cache_key]
       end
 
       def cache_key
@@ -295,12 +254,6 @@ module Mongoid
       def system_collection?
         collection.namespace =~ /^system./
       end
-
-      def driver_supports_cursor_sessions?
-        # Driver versions 2.9 and newer support passing in a session to the
-        # cursor object.
-        (Mongo::VERSION.split('.').map(&:to_i) <=> [2, 9, 0]) > 0
-      end
     end
 
     # Adds behaviour to the query cache for collections.

data/lib/mongoid/railtie.rb

@@ -102,23 +102,6 @@ module Rails
         puts "There is a configuration error with the current mongoid.yml."
         puts e.message
       end
-
-      # Include Controller extension that measures Mongoid runtime
-      # during request processing. The value then appears in Rails'
-      # instrumentation event `process_action.action_controller`.
-      #
-      # The measurement is made via internal Mongo monitoring subscription
-      initializer "mongoid.runtime-metric" do
-        require "mongoid/railties/controller_runtime"
-
-        ActiveSupport.on_load :action_controller do
-          include ::Mongoid::Railties::ControllerRuntime::ControllerExtension
-        end
-
-        Mongo::Monitoring::Global.subscribe Mongo::Monitoring::COMMAND,
-            ::Mongoid::Railties::ControllerRuntime::Collector.new
-      end
-
     end
   end
 end

data/lib/mongoid/reloadable.rb

@@ -58,7 +58,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(collection.find({ _id: _id }, session: _session).read(mode: :primary).first || {})
+      {}.merge(collection.find(_id: _id).read(mode: :primary).first || {})
     end
 
     # Reload the embedded document.

data/lib/mongoid/scopable.rb

@@ -102,7 +102,7 @@ module Mongoid
       #
       # @since 3.0.0
       def default_scopable?
-        default_scoping? && !Threaded.without_default_scope?(self)
+        default_scoping? && !Threaded.executing?(:without_default_scope)
       end
 
       # Get a queryable, either the last one on the scope stack or a fresh one.
@@ -244,10 +244,10 @@ module Mongoid
       #
       # @since 3.0.0
       def without_default_scope
-        Threaded.begin_without_default_scope(self)
+        Threaded.begin_execution("without_default_scope")
         yield
       ensure
-        Threaded.exit_without_default_scope(self)
+        Threaded.exit_execution("without_default_scope")
       end
 
       private

data/lib/mongoid/serializable.rb

@@ -124,9 +124,9 @@ module Mongoid
     def serialize_relations(attributes = {}, options = {})
       inclusions = options[:include]
       relation_names(inclusions).each do |name|
-        metadata = relations[name.to_s]
-        if metadata && relation = send(metadata.name)
-          attributes[metadata.name.to_s] =
+        association = relations[name.to_s]
+        if association && relation = send(association.name)
+          attributes[association.name.to_s] =
             relation.serializable_hash(relation_options(inclusions, options, name))
         end
       end

data/lib/mongoid/tasks/database.rb

@@ -44,7 +44,7 @@ module Mongoid
         models.each do |model|
           unless model.embedded?
             begin
-              model.collection.indexes(session: model.send(:_session)).each do |index|
+              model.collection.indexes.each do |index|
                 # ignore default index
                 unless index['name'] == '_id_'
                   key = index['key'].symbolize_keys
@@ -77,7 +77,7 @@ module Mongoid
           indexes.each do |index|
             key = index['key'].symbolize_keys
             collection = model.collection
-            collection.indexes(session: model.send(:_session)).drop_one(key)
+            collection.indexes.drop_one(key)
             logger.info(
               "MONGOID: Removed index '#{index['name']}' on collection " +
               "'#{collection.name}' in database '#{collection.database.name}'."
@@ -107,7 +107,6 @@ module Mongoid
       end
 
       private
-
       def logger
         Mongoid.logger
       end

data/lib/mongoid/threaded.rb

@@ -163,30 +163,6 @@ module Mongoid
       validations_for(document.class).delete_one(document._id)
     end
 
-    # Begin suppressing default scopes for given model on the current thread.
-    #
-    # @example Begin without default scope stack.
-    #   Threaded.begin_without_default_scope(klass)
-    #
-    # @param [ Class ] klass The model to suppress default scoping on.
-    #
-    # @api private
-    def begin_without_default_scope(klass)
-      stack(:without_default_scope).push(klass)
-    end
-
-    # Exit suppressing default scopes for given model on the current thread.
-    #
-    # @example Exit without default scope stack.
-    #   Threaded.exit_without_default_scope(klass)
-    #
-    # @param [ Class ] klass The model to unsuppress default scoping on.
-    #
-    # @api private
-    def exit_without_default_scope(klass)
-      stack(:without_default_scope).delete(klass)
-    end
-
     # Get the global client override.
     #
     # @example Get the global client override.
@@ -271,18 +247,6 @@ module Mongoid
       end
     end
 
-    # Is the given klass' default scope suppressed on the current thread?
-    #
-    # @example Is the given klass' default scope suppressed?
-    #   Threaded.without_default_scope?(klass)
-    #
-    # @param [ Class ] klass The model to check for default scope suppression.
-    #
-    # @api private
-    def without_default_scope?(klass)
-      stack(:without_default_scope).include?(klass)
-    end
-
     # Is the document autosaved on the current thread?
     #
     # @example Is the document autosaved?
@@ -361,43 +325,5 @@ module Mongoid
     def validations_for(klass)
       validations[klass] ||= []
     end
-
-    # Cache a session for this thread.
-    #
-    # @example Save a session for this thread.
-    #   Threaded.set_session(session)
-    #
-    # @param [ Mongo::Session ] session The session to save.
-    #
-    # @since 6.4.0
-    def set_session(session)
-      Thread.current[:session] = session
-    end
-
-    # Get the cached session for this thread.
-    #
-    # @example Get the session for this thread.
-    #   Threaded.get_session
-    #
-    # @return [ Mongo::Session, nil ] The session cached on this thread or nil.
-    #
-    # @since 6.4.0
-    def get_session
-      Thread.current[:session]
-    end
-
-    # Clear the cached session for this thread.
-    #
-    # @example Clear this thread's session.
-    #   Threaded.clear_session
-    #
-    # @return [ nil ]
-    #
-    # @since 6.4.0
-    def clear_session
-      session = get_session
-      session.end_session if session
-      Thread.current[:session] = nil
-    end
   end
 end

data/lib/mongoid/traversable.rb

@@ -40,7 +40,7 @@ module Mongoid
     # @since 2.4.0
     def collect_children
       children = []
-      embedded_relations.each_pair do |name, metadata|
+      embedded_relations.each_pair do |name, association|
         without_autobuild do
           child = send(name)
           Array.wrap(child).each do |doc|
@@ -101,7 +101,7 @@ module Mongoid
     #
     # @since 2.0.0.beta.1
     def remove_child(child)
-      name = child.metadata_name
+      name = child.association_name
       if child.embedded_one?
         remove_ivar(name)
       else

data/lib/mongoid/validatable.rb

@@ -127,14 +127,14 @@ module Mongoid
       # was not provided or set to true.
       #
       # @example Set up validation.
-      #   Person.validates_relation(metadata)
+      #   Person.validates_relation(association)
       #
-      # @param [ Metadata ] metadata The relation metadata.
+      # @param [ Association ] association The association metadata.
       #
       # @since 2.0.0.rc.1
-      def validates_relation(metadata)
-        if metadata.validate?
-          validates_associated(metadata.name)
+      def validates_relation(association)
+        if association.validate?
+          validates_associated(association.name)
         end
       end
 
@@ -154,9 +154,9 @@ module Mongoid
       def validates_with(*args, &block)
         if args.first == PresenceValidator
           args.last[:attributes].each do |name|
-            metadata = relations[name.to_s]
-            if metadata && metadata[:autosave] != false
-              autosave(metadata.merge!(autosave: true))
+            association = relations[name.to_s]
+            if association && association.autosave?
+              Association::Referenced::AutoSave.define_autosave!(association)
             end
           end
         end