Code review fixes

- Fix rebase merge conflict edits
- Remove integer field FIXME comments
- Remove pos_int

Author: aclark4life

django_mongodb_backend/features.py

@@ -578,12 +578,12 @@ def django_test_expected_failures(self):
     }
 
     @cached_property
-
     def django_test_skips(self):
         skips = super().django_test_skips
         skips.update(self._django_test_skips)
         return skips
 
+    @cached_property
     def mongodb_version(self):
         return self.connection.get_database_version()  # e.g., (6, 3, 0)
 

tests/encryption_/models.py

@@ -80,10 +80,5 @@ class Meta:
 
 class EncryptedNumbers(models.Model):
     pos_bigint = EncryptedPositiveBigIntegerField(queries=EQUALITY_QUERY)
-
-    # FIXME: pymongo.errors.EncryptionError: Cannot encrypt element of type int
-    # because schema requires that type is one of: [ long ]
-    # pos_int = EncryptedPositiveIntegerField(queries=EQUALITY_QUERY)
-
     pos_smallint = EncryptedPositiveSmallIntegerField(queries=EQUALITY_QUERY)
     smallint = EncryptedSmallIntegerField(queries=EQUALITY_QUERY)

tests/encryption_/test_base.py

@@ -197,19 +197,14 @@ def test_numeric_fields(self):
         """
         EncryptedNumbers.objects.create(
             pos_bigint=1000000,
-            # FIXME: pymongo.errors.EncryptionError: Cannot encrypt element of type int
-            # because schema requires that type is one of: [ long ]
-            # pos_int=1,
             pos_smallint=12345,
             smallint=-12345,
         )
 
         obj = EncryptedNumbers.objects.get(pos_bigint=1000000)
-        # obj = EncryptedNumbers.objects.get(pos_int=1)
         obj = EncryptedNumbers.objects.get(pos_smallint=12345)
         obj = EncryptedNumbers.objects.get(smallint=-12345)
 
         self.assertEqual(obj.pos_bigint, 1000000)
-        # self.assertEqual(obj.pos_int, 1)
         self.assertEqual(obj.pos_smallint, 12345)
         self.assertEqual(obj.smallint, -12345)