diff --git a/lib/mongoid/clients/sessions.rb b/lib/mongoid/clients/sessions.rb index 9112815b71..48ed5a0fbd 100644 --- a/lib/mongoid/clients/sessions.rb +++ b/lib/mongoid/clients/sessions.rb @@ -53,7 +53,7 @@ def with_session(options = {}) private - def session + def _session Threaded.get_session end @@ -104,7 +104,7 @@ def with_session(options = {}) private - def session + def _session Threaded.get_session end end diff --git a/lib/mongoid/contextual/aggregable/mongo.rb b/lib/mongoid/contextual/aggregable/mongo.rb index 2e0bfdb901..9c8d4bc3b1 100644 --- a/lib/mongoid/contextual/aggregable/mongo.rb +++ b/lib/mongoid/contextual/aggregable/mongo.rb @@ -23,7 +23,7 @@ module Mongo # # @since 3.0.0 def aggregates(field) - result = collection.find.aggregate(pipeline(field), session: session).to_a + result = collection.find.aggregate(pipeline(field), session: _session).to_a if result.empty? { "count" => 0, "sum" => nil, "avg" => nil, "min" => nil, "max" => nil } else diff --git a/lib/mongoid/contextual/map_reduce.rb b/lib/mongoid/contextual/map_reduce.rb index 9c99e0e31e..a0a38ee9f1 100644 --- a/lib/mongoid/contextual/map_reduce.rb +++ b/lib/mongoid/contextual/map_reduce.rb @@ -166,7 +166,7 @@ def raw validate_out! cmd = command opts = { read: cmd.delete(:read).options } if cmd[:read] - @map_reduce.database.command(cmd, (opts || {}).merge(session: session)).first + @map_reduce.database.command(cmd, (opts || {}).merge(session: _session)).first end alias :results :raw @@ -250,8 +250,8 @@ def validate_out! raise Errors::NoMapReduceOutput.new({}) unless @map_reduce.out end - def session - criteria.send(:session) + def _session + criteria.send(:_session) end end end diff --git a/lib/mongoid/contextual/memory.rb b/lib/mongoid/contextual/memory.rb index a552745763..faa3ffad65 100644 --- a/lib/mongoid/contextual/memory.rb +++ b/lib/mongoid/contextual/memory.rb @@ -49,7 +49,7 @@ def delete unless removed.empty? collection.find(selector).update_one( positionally(selector, "$pullAll" => { path => removed }), - session: session + session: _session ) end deleted @@ -304,7 +304,7 @@ def update_documents(attributes, docs) updates["$set"].merge!(doc.atomic_updates["$set"] || {}) doc.move_changes end - collection.find(selector).update_one(updates, session: session) unless updates["$set"].empty? + collection.find(selector).update_one(updates, session: _session) unless updates["$set"].empty? end # Get the limiting value. @@ -446,8 +446,8 @@ def prepare_remove(doc) doc.destroyed = true end - def session - @criteria.send(:session) + def _session + @criteria.send(:_session) end end end diff --git a/lib/mongoid/contextual/mongo.rb b/lib/mongoid/contextual/mongo.rb index 75807a14e3..4380af4a4d 100644 --- a/lib/mongoid/contextual/mongo.rb +++ b/lib/mongoid/contextual/mongo.rb @@ -341,7 +341,7 @@ def initialize(criteria) @criteria, @klass, @cache = criteria, criteria.klass, criteria.options[:cache] @collection = @klass.collection criteria.send(:merge_type_selection) - @view = collection.find(criteria.selector, session: session) + @view = collection.find(criteria.selector, session: _session) apply_options end @@ -706,8 +706,8 @@ def yield_document(document, &block) documents.push(doc) if cacheable? end - def session - @criteria.send(:session) + def _session + @criteria.send(:_session) end def acknowledged_write? diff --git a/lib/mongoid/indexable.rb b/lib/mongoid/indexable.rb index 3bff79d5a3..10a84c2ce5 100644 --- a/lib/mongoid/indexable.rb +++ b/lib/mongoid/indexable.rb @@ -32,10 +32,10 @@ def create_indexes key, options = spec.key, spec.options if database = options[:database] with(database: database) do |klass| - klass.collection.indexes(session: session).create_one(key, options.except(:database)) + klass.collection.indexes(session: _session).create_one(key, options.except(:database)) end else - collection.indexes(session: session).create_one(key, options) + collection.indexes(session: _session).create_one(key, options) end end and true end @@ -53,9 +53,9 @@ def remove_indexes indexed_database_names.each do |database| with(database: database) do |klass| begin - klass.collection.indexes(session: session).each do |spec| + klass.collection.indexes(session: _session).each do |spec| unless spec["name"] == "_id_" - klass.collection.indexes(session: session).drop_one(spec["key"]) + klass.collection.indexes(session: _session).drop_one(spec["key"]) logger.info( "MONGOID: Removed index '#{spec["name"]}' on collection " + "'#{klass.collection.name}' in database '#{database}'." diff --git a/lib/mongoid/persistable.rb b/lib/mongoid/persistable.rb index 0264188fbb..22abf15990 100644 --- a/lib/mongoid/persistable.rb +++ b/lib/mongoid/persistable.rb @@ -204,7 +204,7 @@ def persist_or_delay_atomic_operation(operation) def persist_atomic_operations(operations) if persisted? && operations selector = atomic_selector - _root.collection.find(selector).update_one(positionally(selector, operations), session: session) + _root.collection.find(selector).update_one(positionally(selector, operations), session: _session) end end end diff --git a/lib/mongoid/persistable/creatable.rb b/lib/mongoid/persistable/creatable.rb index e8d642030e..ac698349dc 100644 --- a/lib/mongoid/persistable/creatable.rb +++ b/lib/mongoid/persistable/creatable.rb @@ -63,7 +63,7 @@ def insert_as_embedded selector = _parent.atomic_selector _root.collection.find(selector).update_one( positionally(selector, atomic_inserts), - session: session) + session: _session) end end @@ -78,7 +78,7 @@ def insert_as_embedded # # @since 4.0.0 def insert_as_root - collection.insert_one(as_attributes, session: session) + collection.insert_one(as_attributes, session: _session) end # Post process an insert, which sets the new record attribute to false diff --git a/lib/mongoid/persistable/deletable.rb b/lib/mongoid/persistable/deletable.rb index ff8bd2ef4f..55ad5096f9 100644 --- a/lib/mongoid/persistable/deletable.rb +++ b/lib/mongoid/persistable/deletable.rb @@ -64,7 +64,7 @@ def delete_as_embedded(options = {}) selector = _parent.atomic_selector _root.collection.find(selector).update_one( positionally(selector, atomic_deletes), - session: session) + session: _session) end true end @@ -80,7 +80,7 @@ def delete_as_embedded(options = {}) # # @since 4.0.0 def delete_as_root - collection.find(atomic_selector).delete_one(session: session) + collection.find(atomic_selector).delete_one(session: _session) true end diff --git a/lib/mongoid/persistable/updatable.rb b/lib/mongoid/persistable/updatable.rb index 315e19dd86..4a24143932 100644 --- a/lib/mongoid/persistable/updatable.rb +++ b/lib/mongoid/persistable/updatable.rb @@ -134,9 +134,9 @@ def update_document(options = {}) 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), session: _session) 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 }), session: _session) end end end diff --git a/lib/mongoid/persistable/upsertable.rb b/lib/mongoid/persistable/upsertable.rb index c7cba3bd2c..96d3855536 100644 --- a/lib/mongoid/persistable/upsertable.rb +++ b/lib/mongoid/persistable/upsertable.rb @@ -22,7 +22,7 @@ module Upsertable def upsert(options = {}) prepare_upsert(options) do collection.find(atomic_selector).update_one( - as_attributes, upsert: true, session: session) + as_attributes, upsert: true, session: _session) end end diff --git a/lib/mongoid/relations/embedded/batchable.rb b/lib/mongoid/relations/embedded/batchable.rb index ee9d412a67..e177e2de1e 100644 --- a/lib/mongoid/relations/embedded/batchable.rb +++ b/lib/mongoid/relations/embedded/batchable.rb @@ -39,7 +39,7 @@ def batch_clear(docs) unless docs.empty? collection.find(selector).update_one( positionally(selector, "$unset" => { path => true }), - session: session + session: _session ) post_process_batch_remove(docs, :delete) end @@ -60,7 +60,7 @@ def batch_remove(docs, method = :delete) if !docs.empty? collection.find(selector).update_one( positionally(selector, "$pullAll" => { path => removals }), - session: session + session: _session ) post_process_batch_remove(docs, method) end @@ -136,7 +136,7 @@ def execute_batch_set(docs) if insertable? collection.find(selector).update_one( positionally(selector, '$set' => { path => inserts }), - session: session + session: _session ) post_process_batch_insert(docs) end @@ -161,7 +161,7 @@ def execute_batch_push(docs) if insertable? collection.find(selector).update_one( positionally(selector, '$push' => { path => { '$each' => pushes } }), - session: session + session: _session ) post_process_batch_insert(docs) end diff --git a/lib/mongoid/relations/many.rb b/lib/mongoid/relations/many.rb index 9664a5b630..88d43fdf0c 100644 --- a/lib/mongoid/relations/many.rb +++ b/lib/mongoid/relations/many.rb @@ -213,8 +213,8 @@ def unscoped private - def session - base.send(:session) + def _session + base.send(:_session) end # Find the first object given the supplied attributes or create/initialize it. diff --git a/lib/mongoid/relations/referenced/many.rb b/lib/mongoid/relations/referenced/many.rb index b18b0e29f7..6c7c0a8c1a 100644 --- a/lib/mongoid/relations/referenced/many.rb +++ b/lib/mongoid/relations/referenced/many.rb @@ -477,7 +477,7 @@ def method_missing(name, *args, &block) # @since 3.0.0 def persist_delayed(docs, inserts) unless docs.empty? - collection.insert_many(inserts, session: session) + collection.insert_many(inserts, session: _session) docs.each do |doc| doc.new_record = false doc.run_after_callbacks(:create, :save) diff --git a/lib/mongoid/relations/touchable.rb b/lib/mongoid/relations/touchable.rb index 55dd74e20a..8dd0dc9558 100644 --- a/lib/mongoid/relations/touchable.rb +++ b/lib/mongoid/relations/touchable.rb @@ -31,7 +31,7 @@ def touch(field = nil) touches = touch_atomic_updates(field) unless touches["$set"].blank? selector = atomic_selector - _root.collection.find(selector).update_one(positionally(selector, touches), session: session) + _root.collection.find(selector).update_one(positionally(selector, touches), session: _session) end run_callbacks(:touch) true diff --git a/lib/mongoid/reloadable.rb b/lib/mongoid/reloadable.rb index a649930db5..d827ce2db8 100644 --- a/lib/mongoid/reloadable.rb +++ b/lib/mongoid/reloadable.rb @@ -58,7 +58,7 @@ def _reload # # @since 2.3.2 def reload_root_document - {}.merge(collection.find({ _id: _id }, session: session).read(mode: :primary).first || {}) + {}.merge(collection.find({ _id: _id }, session: _session).read(mode: :primary).first || {}) end # Reload the embedded document. diff --git a/lib/mongoid/tasks/database.rb b/lib/mongoid/tasks/database.rb index ccbf1b4e42..3365d5e4b2 100644 --- a/lib/mongoid/tasks/database.rb +++ b/lib/mongoid/tasks/database.rb @@ -44,7 +44,7 @@ def undefined_indexes(models = ::Mongoid.models) models.each do |model| unless model.embedded? begin - model.collection.indexes(session: model.send(:session)).each do |index| + model.collection.indexes(session: model.send(:_session)).each do |index| # ignore default index unless index['name'] == '_id_' key = index['key'].symbolize_keys @@ -77,7 +77,7 @@ def remove_undefined_indexes(models = ::Mongoid.models) indexes.each do |index| key = index['key'].symbolize_keys collection = model.collection - collection.indexes(session: model.send(:session)).drop_one(key) + collection.indexes(session: model.send(:_session)).drop_one(key) logger.info( "MONGOID: Removed index '#{index['name']}' on collection " + "'#{collection.name}' in database '#{collection.database.name}'."