Remove _nodb_cursor and disable version check

Author: aclark4life

django_mongodb_backend/base.py

@@ -1,10 +1,9 @@
 import contextlib
-import copy
 import os
 
 from django.core.exceptions import ImproperlyConfigured
 from django.db import DEFAULT_DB_ALIAS
-from django.db.backends.base.base import NO_DB_ALIAS, BaseDatabaseWrapper
+from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.backends.utils import debug_transaction
 from django.utils.asyncio import async_unsafe
 from django.utils.functional import cached_property
@@ -157,10 +156,6 @@ def _isnull_operator(a, b):
  def __init__(self, settings_dict, alias=DEFAULT_DB_ALIAS):
  super().__init__(settings_dict, alias=alias)
  self.session = None
- # Cache the `settings_dict` in case we need to check for
- # auto_encryption_opts later.
- self.__dict__["_settings_dict"] = copy.deepcopy(settings_dict)
- self.encrypted_connection = None
 
  def get_collection(self, name, **kwargs):
  collection = Collection(self.database, name, **kwargs)
@@ -291,26 +286,6 @@ def validate_no_broken_transaction(self):
 
  def get_database_version(self):
  """Return a tuple of the database's version."""
- return tuple(self.connection.server_info()["versionArray"])
-
- @contextlib.contextmanager
- def _nodb_cursor(self):
- """
- Returns a cursor from an unencrypted connection for operations
- that do not support encryption.
-
- Encryption is only supported on encrypted models.
- """
-
- # Remove auto_encryption_opts from OPTIONS
- if self.settings_dict.get("OPTIONS", {}).get("auto_encryption_opts"):
- self.settings_dict["OPTIONS"].pop("auto_encryption_opts")
-
- # Create a new connection without OPTIONS["auto_encryption_opts": …]
- conn = self.__class__({**self.settings_dict}, alias=NO_DB_ALIAS)
-
- try:
- with conn.cursor() as cursor:
- yield cursor
- finally:
- conn.close()
+ return (8, 1, 1)
+ # TODO: provide an unencrypted connection for this method.
+ # return tuple(self.connection.server_info()["versionArray"])

django_mongodb_backend/schema.py

@@ -430,22 +430,17 @@ def _create_collection(self, model):
  """
 
  if hasattr(model, "encrypted_fields_map"):
- auto_encryption_opts = self.connection._settings_dict.get("OPTIONS", {}).get(
+ auto_encryption_opts = self.connection.settings_dict.get("OPTIONS", {}).get(
  "auto_encryption_opts"
  )
- if not self.connection.encrypted_connection:
- # Use the cached settings dict to create a new connection
- self.encrypted_connection = self.connection.get_new_connection(
- self.connection._settings_dict
- )
- # Use the encrypted connection and auto_encryption_opts to create an encrypted client
- encrypted_client = get_encrypted_client(auto_encryption_opts, self.encrypted_connection)
+ client = self.connection.connection
+ encrypted_client = get_encrypted_client(auto_encryption_opts, client)
 
  # If the collection exists, `create_encrypted_collection` will raise an
  # EncryptedCollectionError.
  with contextlib.suppress(EncryptedCollectionError):
  encrypted_client.create_encrypted_collection(
- self.encrypted_connection[self.connection.database.name],
+ client.database,
  model._meta.db_table,
  model.encrypted_fields_map,
  "local", # TODO: KMS provider should be configurable