fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! add support f…

…or mongodb Client Side Field Level Encryption (CSFLE)

ming/encryption.py

@@ -8,6 +8,7 @@
 if TYPE_CHECKING:
     import ming.datastore
     from ming.metadata import Field
+    from ming.odm.property import FieldProperty
 
 
 class MingEncryptionError(Exception):
@@ -150,7 +151,13 @@ def _field_names(cls) -> list[str]:
                 field_names.append(k)
             return field_names
         if issubclass(cls, MappedClass):
-            return list(cls.query.mapper.property_index.keys())
+            fields: list[tuple[str, FieldProperty]] = list(cls.query.mapper.property_index.items())
+            field_names = []
+            for (k, v) in fields:
+                if v.field.type in (ming.schema.Deprecated,):
+                    continue
+                field_names.append(k)
+            return field_names
         raise NotImplementedError("Unexpected class type. You must implement `field_names` as a @classproperty in your mixin implementation.")
 
     @classmethod

ming/tests/test_encryption.py

@@ -243,6 +243,7 @@ class __mongometa__:
             name = DecryptedField(str, 'name_encrypted')
             name_encrypted = Field(S.Binary)
             other = Field(str)
+            deprecated = FieldProperty(S.Deprecated)
 
         doc = TestDoc.make_encr(dict(_id=1, name='Jerome', other='foo'))
         doc.m.save()
@@ -303,6 +304,7 @@ class __mongometa__:
             name = DecryptedProperty(str, 'name_encrypted')
             name_encrypted = FieldProperty(S.Binary)
             other = FieldProperty(str)
+            deprecated = FieldProperty(S.Deprecated)
 
         u = TestMapped(_id=None, name="Jerome", other='foo')
         self.session.flush()