Skip to content

Commit 6fb3d41

Browse files
jamisjohnnyshields
andauthored
MONGOID-5869 - Fix incorrectly named global_executor_concurrency config in code comment (#5978) (#6039)
* MONGOID-5869 - Fix incorrectly named global_executor_concurrency config in code comment * Support edge rails Edge rails has added a requirement to implement `#klass` on all ObjectSerializer subclasses, as an optimization. * drivers-evergreen-tools@master has a bug in it let's lock to the previous commit just so we can get this PR across the finish line... --------- Co-authored-by: Johnny Shields <27655+johnnyshields@users.noreply.github.com>
1 parent e70aeaf commit 6fb3d41

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- id: start-mongodb
4040
name: start mongodb
41-
uses: mongodb-labs/drivers-evergreen-tools@master
41+
uses: mongodb-labs/drivers-evergreen-tools@8c66939e0f2ad8ec03522cd7e8631f5a55e2c9f2
4242
with:
4343
version: "${{matrix.mongodb}}"
4444
topology: "${{matrix.topology}}"

lib/mongoid/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ module Config
102102
#
103103
# - :immediate - Initializes a single +Concurrent::ImmediateExecutor+
104104
# - :global_thread_pool - Initializes a single +Concurrent::ThreadPoolExecutor+
105-
# that uses the +async_query_concurrency+ for the +max_threads+ value.
105+
# that uses the +global_executor_concurrency+ for the +max_threads+ value.
106106
option :async_query_executor, default: :immediate
107107

108108
# Defines how many asynchronous queries can be executed concurrently.

lib/mongoid/railties/bson_object_id_serializer.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ def serialize(object)
3333
def deserialize(string)
3434
BSON::ObjectId.from_string(string)
3535
end
36+
37+
# Returns the klass this serializer handles.
38+
#
39+
# @return [ BSON::ObjectId ] The class this serializer handles.
40+
def klass
41+
BSON::ObjectId
42+
end
3643
end
3744
end
3845
end

0 commit comments

Comments
 (0)