mongoid 7.4.3 → 8.0.7

data/spec/shared/share/Dockerfile.erb

@@ -7,13 +7,13 @@
 <%
 
 python_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-python-driver-toolchain/#{distro}/ba92de2700c04ee2d4f82c3ffdfc33105140cb04/mongo_python_driver_toolchain_#{distro.gsub('-', '_')}_ba92de2700c04ee2d4f82c3ffdfc33105140cb04_19_11_14_15_33_33.tar.gz"
-server_version = '4.3.3'
+# server_version = '4.3.3'
 server_url = "http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-#{distro}-#{server_version}.tgz"
 server_archive_basename = File.basename(server_url)
 server_extracted_dir = server_archive_basename.sub(/\.(tar\.gz|tgz)$/, '')
 
 # When changing, also update the hash in shlib/set_env.sh.
-TOOLCHAIN_VERSION='219833abad4d9d3bf43c0fef101a8ca082ac4ae9'
+TOOLCHAIN_VERSION='e8c60866f54bed7e336a37df3a97d6ae1b971b7d'
 
 def ruby_toolchain_url(ruby)
   "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/#{TOOLCHAIN_VERSION}/#{distro}/#{ruby}.tar.xz"
@@ -77,25 +77,31 @@ ENV DOCKER=1
   # therefore install python-pip in all configurations here.
 
   <% packages = %w(
-    procps lsb-release bzip2 curl zsh
+    procps lsb-release bzip2 curl wget gpg zsh
     git make gcc libyaml-0-2 libgmp-dev zlib1g-dev libsnappy-dev
     krb5-user krb5-kdc krb5-admin-server libsasl2-dev libsasl2-modules-gssapi-mit
     haproxy
     python3-pip
-    tzdata shared-mime-info
+    tzdata shared-mime-info software-properties-common
   ) %>
 
   <% if distro =~ /ubuntu2004/ %>
     <% packages << 'libsnmp35' %>
+  <% elsif distro =~ /ubuntu2204|debian11/ %>
+    <% packages << 'libsnmp40' %>
   <% else %>
     <% packages << 'libsnmp30' %>
   <% end %>
 
-  <% if distro !~ /ubuntu2004/ %>
+  <% if distro !~ /ubuntu2004|ubuntu2204|debian11/ %>
     <% packages << 'python-pip' %>
   <% end %>
 
-  <% if distro =~ /debian10/ %>
+  <% if distro =~ /ubuntu2204|debian11/ %>
+    <% packages << 'python3-venv' %>
+  <% end %>
+
+  <% if distro =~ /debian10|ubuntu2204|debian11/ %>
     <% packages << 'openjdk-11-jdk-headless' %>
   <% elsif distro =~ /ubuntu1404/ %>
     # Ubuntu 14.04 only has openjdk 7, this is too old to be useful
@@ -105,31 +111,37 @@ ENV DOCKER=1
 
   # ubuntu1404, ubuntu1604: libcurl3
   # ubuntu1804, ubuntu2004, debian10: libcurl4
-  <% if distro =~ /ubuntu1804|ubuntu2004|debian10/ %>
+  <% if distro =~ /ubuntu1804|ubuntu2004|ubuntu2204|debian10|debian11/ %>
     <% packages << 'libcurl4' %>
   <% else %>
     <% packages << 'libcurl3' %>
   <% end %>
 
-  <% if distro =~ /ubuntu1804|ubuntu2004/ %>
+  <% if distro =~ /ubuntu1804|ubuntu2004|ubuntu2204/ %>
     <% packages << 'nodejs' %>
   <% end %>
 
-  <% if distro =~ /ubuntu2004/ %>
-    <% packages += %w(ruby ruby2.7 bundler) %>
+  <% if distro =~ /ubuntu2004|ubuntu2204/ %>
+    <% packages += %w(ruby bundler) %>
   <% end %>
 
   RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
-  
+
+  <% if ubuntu? %>
+    RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+    RUN echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+  <% end %>
+  RUN apt-get update && apt-get install -y cmake
+
 <% else %>
 
   <% if distro =~ /rhel6/ %>
-  
+
     # CentOS 6 is dead - to use it retrieve the packages from vault:
     # https://stackoverflow.com/questions/53562691/error-cannot-retrieve-repository-metadata-repomd-xml-for-repository-base-pl
-  
+
     <%
-      
+
       cfg = <<-CFG
 [base]
 name=CentOS-$releasever - Base
@@ -141,11 +153,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
 CFG
 
     %>
-  
+
     RUN printf "<%= cfg.gsub("\n", "\\n") %>" >/etc/yum.repos.d/CentOS-Base.repo
-  
+
   <% end %>
-  
+
   # Enterprise server: net-snmp
   # lsb_release: redhat-lsb-core
   # our runner scripts: which
@@ -162,23 +174,8 @@ CFG
 
   RUN yum install -y redhat-lsb-core which git gcc libyaml krb5-server \
     krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-1.8.0-openjdk \
-    net-snmp python3
+    net-snmp python38 python38-devel cmake nodejs
 
-  <% if distro =~ /rhel6/ %>
-
-    # RHEL 6 ships with Python 2.6.
-
-    RUN yum install -y centos-release-scl && \
-      yum install -y python27-python python27-python-devel
-    ENV PATH=/opt/rh/python27/root/usr/bin:$PATH \
-      LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64
-
-  <% else %>
-
-    RUN yum install -y python-devel
-
-  <% end %>
-  
 <% end %>
 
 <% if preload? %>
@@ -220,7 +217,7 @@ CFG
   <% when 'git' %>
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     RUN python3 -m pip install virtualenv 'pymongo>=4' python-dateutil psutil
-    
+
     # Install mtools from git because released versions do not work with pymongo 4.0
     RUN git clone https://github.com/p-mongodb/mtools && \
       cd mtools && \
@@ -234,7 +231,7 @@ CFG
   <% if @env.fetch('MONGODB_VERSION') >= '4.4' %>
     # ubuntu1604 installs MarkupSafe 0.0.0 here instead of 2.0.0+
     # as specified by dependencies, causing OCSP mock to not work.
-    RUN python3 -mpip install asn1crypto oscrypto flask --upgrade
+    RUN python3 -mpip install asn1crypto oscrypto flask --upgrade --ignore-installed
   <% end %>
 
   # FLE is tested against 4.0+ servers.
@@ -243,7 +240,7 @@ CFG
     # boto3~=1.19 cryptography~=3.4.8 pykmip~=0.10.0
     # cryptography does not install due to lacking setuptools_rust
     # (either that version or anything that isn't part of system packages)
-    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0
+    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0 'sqlalchemy<2.0.0'
   <% end %>
 
   <% unless ruby_head? || system_ruby? %>
@@ -255,10 +252,6 @@ CFG
 
   <% end %>
 
-  RUN curl --retry 3 -fL <%= server_download_url %> |tar xzf - && \
-    mv mongo*/ /opt/mongodb
-  ENV USE_OPT_MONGODB=1 USE_SYSTEM_PYTHON_PACKAGES=1
-
 <% end %>
 
 <% if distro =~ /debian|ubuntu/ %>
@@ -308,6 +301,9 @@ ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
 
 COPY . .
 
+RUN bash -c '. .evergreen/download-mongodb.sh && get_distro && get_mongodb_download_url_for "$DISTRO" "<%= server_version %>" && curl --retry 3 -fL $MONGODB_DOWNLOAD_URL |tar xzf - && mv mongo*/ /opt/mongodb'
+ENV USE_OPT_MONGODB=1 USE_SYSTEM_PYTHON_PACKAGES=1
+
 <% if expose? %>
 
   <% ports = [] %>

data/spec/shared/shlib/server.sh

@@ -71,12 +71,18 @@ prepare_server_from_url() {
   export PATH="$BINDIR":$PATH
 }
 
-install_mlaunch_virtualenv() {
+install_mlaunch_venv() {
   python3 -V || true
-  if ! python3 -m virtualenv -h >/dev/null; then
+  if ! python3 -m venv -h >/dev/null; then
     # Current virtualenv fails with
     # https://github.com/pypa/virtualenv/issues/1630
-    python3 -m pip install 'virtualenv<20' --user
+    python3 -m pip install venv --user
+  fi
+  if ! python3 -m ensurepip -h > /dev/null; then
+    # Debian11/Ubuntu2204 have venv installed, but it is nonfunctional unless
+    # the python3-venv package is also installed (it lacks the ensurepip
+    # module).
+    sudo apt-get install --yes python3-venv
   fi
   if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
     python3 -m pip list |grep mtools
@@ -84,14 +90,19 @@ install_mlaunch_virtualenv() {
     # Use the existing mtools-legacy
     :
   else
-    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    python3 -m virtualenv -p python3 $venvpath
-    . $venvpath/bin/activate
+    # Spawn a virtual environment, but only if one is not already
+    # active...
+    if test -z "$VIRTUAL_ENV"; then
+      venvpath="$MONGO_ORCHESTRATION_HOME"/venv
+      python3 -m venv $venvpath
+      . $venvpath/bin/activate
+    fi
+
     # [mlaunch] does not work:
     # https://github.com/rueckstiess/mtools/issues/856
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     #pip install 'mtools==1.7' 'pymongo==4.1' python-dateutil psutil
-    
+
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
@@ -158,6 +169,19 @@ install_mlaunch_git() {
   fi
 }
 
+install_cmake() {
+  if ! command -v cmake &> /dev/null; then
+    if ! command -v apt-get &> /dev/null; then
+      # no apt-get; assume RHEL
+      sudo yum -y install cmake libarchive
+    else
+      sudo apt-get install --yes cmake
+    fi
+  else
+    echo 'cmake is present'
+  fi
+}
+
 # This function sets followong global variables:
 #   server_cert_path
 #   server_ca_path
@@ -173,7 +197,7 @@ calculate_server_args() {
   fi
 
   if test $mongo_version = latest; then
-    mongo_version=60
+    mongo_version=70
   fi
 
   local args="--setParameter enableTestCommands=1"

data/spec/shared/shlib/set_env.sh

@@ -1,5 +1,5 @@
 # When changing, also update the hash in share/Dockerfile.
-TOOLCHAIN_VERSION=219833abad4d9d3bf43c0fef101a8ca082ac4ae9
+TOOLCHAIN_VERSION=e8c60866f54bed7e336a37df3a97d6ae1b971b7d
 
 set_env_java() {
   ls -l /opt || true
@@ -53,7 +53,7 @@ set_env_python() {
       curl -fL --retry 3 https://github.com/p-mongodb/deps/raw/main/"$arch"-python37.tar.xz | \
         tar xfJ - -C /opt
     fi
-    
+
     if test -d /opt/python/3.7/bin; then
       # Most Evergreen configurations.
       export PATH=/opt/python/3.7/bin:$PATH
@@ -61,7 +61,7 @@ set_env_python() {
       # Configurations that use Docker in Evergreen - these don't preload.
       export PATH=/opt/python37/bin:$PATH
     fi
-    
+
     python3 -V
   fi
 }
@@ -78,7 +78,7 @@ set_env_node() {
     # Node from toolchain in Evergreen
     export PATH=/opt/node/bin:$PATH
   fi
-  
+
   node -v
 }
 

data/spec/support/constraints.rb

@@ -27,6 +27,30 @@ module Constraints
     Mongo::VERSION.split('.')[0...precision].map(&:to_i)
   end
 
+  def min_bson_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = bson_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) < 0
+        skip "bson-ruby version #{version} or higher is required"
+      end
+    end
+  end
+
+  def max_bson_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = bson_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) > 0
+        skip "bson-ruby version #{version} or lower is required"
+      end
+    end
+  end
+
+  def bson_version(precision)
+    BSON::VERSION.split('.')[0...precision].map(&:to_i)
+  end
+
   def min_rails_version(version)
     unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"

data/spec/support/macros.rb

@@ -2,6 +2,10 @@
 
 module Mongoid
   module Macros
+    class I18nBackendWithFallbacks < I18n::Backend::Simple
+      include I18n::Backend::Fallbacks
+    end
+
     def use_spec_mongoid_config
       around do |example|
         config_path = File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
@@ -39,6 +43,40 @@ module Mongoid
       end
     end
 
+    def with_i18n_fallbacks
+      require_fallbacks
+
+      around do |example|
+        old_backend = I18n.backend
+        I18n.backend = I18nBackendWithFallbacks.new
+        example.run
+      ensure
+        I18n.backend = old_backend
+      end
+    end
+
+    def driver_config_override(key, value)
+      around do |example|
+        existing = Mongo.send(key)
+
+        Mongo.send("#{key}=", value)
+
+        example.run
+
+        Mongo.send("#{key}=", existing)
+      end
+    end
+
+    def with_driver_config_values(key, *values, &block)
+      values.each do |value|
+        context "when #{key} is #{value}" do
+          driver_config_override key, value
+
+          class_exec(value, &block)
+        end
+      end
+    end
+
     def restore_config_clients
       around do |example|
         # Duplicate the config because some tests mutate it.
@@ -47,5 +85,13 @@ module Mongoid
         Mongoid::Config.send(:clients=, old_config)
       end
     end
+
+    def query_cache_enabled
+      around do |example|
+        Mongoid::QueryCache.cache do
+          example.run
+        end
+      end
+    end
   end
 end

data/spec/support/models/augmentation.rb

@@ -10,4 +10,16 @@ class Augmentation
   after_build do
     self.name = "Infolink (#{player.frags})"
   end
+
+  field :after_find_player
+  field :after_initialize_player
+  field :after_default_player, default: ->{ self.player&._id }
+
+  after_find do |doc|
+    doc.after_find_player = player&._id
+  end
+
+  after_initialize do |doc|
+    doc.after_initialize_player = player&._id
+  end
 end

data/spec/support/models/band.rb

@@ -20,10 +20,13 @@ class Band
   field :y, as: :years, type: Integer
   field :founded, type: Date
   field :deleted, type: Boolean
+  field :mojo, type: Object
+  field :fans
 
   embeds_many :records, cascade_callbacks: true
   embeds_many :notes, as: :noteable, cascade_callbacks: true, validate: false
   embeds_many :labels
+  embeds_many :fanatics
   embeds_one :label, cascade_callbacks: true
 
   scope :highly_rated, -> { gte(rating: 7) }

data/spec/support/models/catalog.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Catalog
+  include Mongoid::Document
+
+  field :array_field, type: Array
+  field :big_decimal_field, type: BigDecimal
+  field :boolean_field, type: Boolean
+  field :date_field, type: Date
+  field :date_time_field, type: DateTime
+  field :float_field, type: Float
+  field :hash_field, type: Hash
+  field :integer_field, type: Integer
+  field :object_id_field, type: BSON::ObjectId
+  field :binary_field, type: BSON::Binary
+  field :range_field, type: Range
+  field :regexp_field, type: Regexp
+  field :set_field, type: Set
+  field :string_field, type: String
+  field :stringified_symbol_field, type: StringifiedSymbol
+  field :symbol_field, type: Symbol
+  field :time_field, type: Time
+  field :time_with_zone_field, type: ActiveSupport::TimeWithZone
+end

data/spec/support/models/circus.rb

@@ -4,6 +4,9 @@ class Circus
   include Mongoid::Document
 
   field :name
+  field :slogan
+
+  validates_uniqueness_of :slogan, allow_blank: true
 
   embeds_many :animals
 end

data/spec/support/models/code.rb

@@ -10,4 +10,6 @@ end
 class Deepest
   include Mongoid::Document
   embedded_in :code
+
+  field :array, type: Array
 end

data/spec/support/models/fanatic.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Fanatic
+  include Mongoid::Document
+  field :age, type: Integer
+
+  embedded_in :band
+end

data/spec/support/models/implant.rb

@@ -12,7 +12,16 @@ class Implant
     doc.name = "Cochlear Implant (#{player.frags})"
   end
 
+  field :after_find_player
+  field :after_initialize_player
+  field :after_default_player, default: ->{ self.player&._id }
+
   after_find do |doc|
     doc.impressions += 1
+    doc.after_find_player = player&._id
+  end
+
+  after_initialize do |doc|
+    doc.after_initialize_player = player&._id
   end
 end

data/spec/support/models/label.rb

@@ -6,6 +6,8 @@ class Label
 
   field :name, type: String
   field :sales, type: BigDecimal
+  field :age, type: Integer
+
   field :after_create_called, type: Mongoid::Boolean, default: false
   field :after_save_called, type: Mongoid::Boolean, default: false
   field :after_update_called, type: Mongoid::Boolean, default: false

data/spec/support/models/passport.rb

@@ -10,4 +10,13 @@ class Passport
   field :localized_translations, localize: true
 
   embedded_in :person, autobuild: true
+
+  embeds_many :passport_pages
+end
+
+class PassportPage
+  include Mongoid::Document
+
+  field :num_stamps, type: Integer
+  embedded_in :passport
 end

data/spec/support/models/person.rb

@@ -40,6 +40,7 @@ class Person
   field :arrays, type: Array
   field :range, type: Range
   field :species, type: Symbol
+  field :posts_count, type: Integer, default: 0
 
   index age: 1
   index addresses: 1
@@ -69,6 +70,7 @@ class Person
   embeds_many :messages, validate: false
 
   embeds_one :passport, autobuild: true, store_as: :pass, validate: false
+  embeds_one :purse, store_as: "Purse"
   embeds_one :pet, class_name: "Animal", validate: false
   embeds_one :name, as: :namable, validate: false do
     def extension

data/spec/support/models/player.rb

@@ -25,6 +25,8 @@ class Player
   embeds_many :implants
   embeds_one :augmentation
 
+  has_and_belongs_to_many :shields
+
   after_find do |doc|
     doc.impressions += 1
   end

data/spec/support/models/powerup.rb

@@ -10,4 +10,16 @@ class Powerup
   after_build do
     self.name = "Quad Damage (#{player.frags})"
   end
+
+  field :after_find_player
+  field :after_initialize_player
+  field :after_default_player, default: ->{ self.player&._id }
+
+  after_find do |doc|
+    doc.after_find_player = player&._id
+  end
+
+  after_initialize do |doc|
+    doc.after_initialize_player = player&._id
+  end
 end

data/spec/support/models/purse.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Purse
+  include Mongoid::Document
+
+  field :brand, type: String
+
+  embedded_in :person
+end

data/spec/support/models/registry.rb

@@ -3,4 +3,5 @@
 class Registry
   include Mongoid::Document
   field :data, type: BSON::Binary
+  field :obj_id, type: BSON::ObjectId
 end

data/spec/support/models/school.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class School
+  include Mongoid::Document
+
+  has_many :students
+
+  field :district, type: String
+  field :team, type: String
+
+  field :after_destroy_triggered, default: false
+
+  accepts_nested_attributes_for :students, allow_destroy: true
+end

data/spec/support/models/shield.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+class Shield
+  include Mongoid::Document
+
+  has_and_belongs_to_many :players
+
+  field :after_find_player
+  field :after_initialize_player
+  field :after_default_player, default: ->{ players.first&._id }
+
+  after_find do |doc|
+    doc.after_find_player = players.first&._id
+  end
+
+  after_initialize do |doc|
+    doc.after_initialize_player = players.first&._id
+  end
+end

data/spec/support/models/student.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Student
+  include Mongoid::Document
+
+  belongs_to :school
+
+  field :name, type: String
+  field :grade, type: Integer, default: 3
+
+  after_destroy do |doc|
+    school.after_destroy_triggered = true if school
+  end
+end

data/spec/support/models/weapon.rb

@@ -10,4 +10,16 @@ class Weapon
   after_build do
     self.name = "Holy Hand Grenade (#{player.frags})"
   end
+
+  field :after_find_player
+  field :after_initialize_player
+  field :after_default_player, default: ->{ self.player&._id }
+
+  after_find do |doc|
+    doc.after_find_player = player&._id
+  end
+
+  after_initialize do |doc|
+    doc.after_initialize_player = player&._id
+  end
 end

data.tar.gz.sig

@@ -1 +1,4 @@
-�Z�0��G���bM��S��6�\�PO.��@̹���)v>"�:��W�t��:�p/��}T�(5���D��a��Dp�E���y����#��X*.�*�Nа�<�R�¾|���}8ia0`Y�+��m���?�������!?E��_, ��@����͌𼠎�	ɑ>o��,���T�ӓ�8�W\������?�x�7�5��h�l�8s@{גf��}�="�%è:��)��
+0��0�`�j_Y���ܐ�:K	�"'o���ϥ<��*ӫ��`���)�l���F�-��)�ޑ��
G,�9;+̿}�T�h���_CG��`�S����$��3��Z��H"
+��؍]O��.�[�	J�7��3��?�GF˟V	4wfp��5�f'`��_�2�_�bW&���
+�@*!�*	�x���XsK'oeċ�o����&���=���7%|u������uq��@Ɩ�
+l�<@D3�Ż��7ZT?;�O�8��p��@~�`� ��-��;ߨ�������=�!H]L>z.o��bM��ss�E��m�:��) �텢/��)�ǸXPٱ�26���-S4����J��H��24� ���s�oZ�ıF9�l�