[Encryption] Fix BSON types and query option name #2785
Conversation
GromNaN
changed the title
| @@ -2005,43 +1999,43 @@ parameters: | |||
| path: tests/Doctrine/ODM/MongoDB/Tests/Tools/EncryptedFieldsMapGeneratorTest.php | |||
|
|
|||
| - | |||
| message: '#^Method Doctrine\\Persistence\\Mapping\\AbstractClassMetadataFactory@anonymous/tests/Doctrine/ODM/MongoDB/Tests/Tools/EncryptedFieldsMapGeneratorTest\.php\:165\:\:__construct\(\) has parameter \$classNames with no value type specified in iterable type array\.$#' | |||
| message: '#^Method Doctrine\\Persistence\\Mapping\\AbstractClassMetadataFactory@anonymous/tests/Doctrine/ODM/MongoDB/Tests/Tools/EncryptedFieldsMapGeneratorTest\.php\:168\:\:__construct\(\) has parameter \$classNames with no value type specified in iterable type array\.$#' | |||
There was a problem hiding this comment.
The anonymous class name contains the line number it's defined. Each time the previous test is updated, this baseline entries need to be updated.
lib/Doctrine/ODM/MongoDB/Utility/EncryptedFieldsMapGenerator.php
Outdated
Show resolved
Hide resolved
| }, | ||
| // @todo allow setting a keyId in #[Encrypt] attribute |
There was a problem hiding this comment.
@todo removed, we don't need to support custom keyId with queryable encryption auto-encryption. They are generated automatically.
| Type::TIMESTAMP => 'timestamp', | ||
| Type::OBJECTID => 'objectId', | ||
| Type::STRING => 'string', | ||
| Type::BINDATA, Type::BINDATABYTEARRAY, Type::BINDATAFUNC, Type::BINDATACUSTOM, Type::BINDATAUUID, Type::BINDATAMD5, Type::BINDATAUUIDRFC4122 => 'binData', |
There was a problem hiding this comment.
Would it make sense to add a getBSONType method to the Type class and override it in the individual types? Happy to defer this work until later, but I think it may be more efficient especially if people use custom types that map to a given BSON type.
There was a problem hiding this comment.
I was thinking to add a bsonType parameter to the #[Encrypt] attribute, for custom needs. Adding Type::getBSONType() is a better option. PHPORM-358
| Type::OBJECTID => 'objectId', | ||
| Type::STRING => 'string', | ||
| Type::BINDATA, Type::BINDATABYTEARRAY, Type::BINDATAFUNC, Type::BINDATACUSTOM, Type::BINDATAUUID, Type::BINDATAMD5, Type::BINDATAUUIDRFC4122 => 'binData', | ||
| // Type BOOL is not supported in encrypted fields map |
There was a problem hiding this comment.
Is that limitation called out in the server docs somewhere? We should definitely call it out in our documentation so people can adapt their schema accordingly.
There was a problem hiding this comment.
I tested again, bool seems to be supported. I don't know why it was failing previously.
GromNaN
merged commit b7cb9de
into
doctrine:feature/queryable-encryption
Part of #2779
The Doctrine ODM type names doesn't match the BSON type names. We have to map them to create the
encryptedFieldsMap.Also fix the name of the property
precisionin QE field definition.