@@ -890,8 +890,8 @@ static moe_result must_omit_encryptionInformation(const char *command_name,
890890 bool has_fields_requiring_ei = false;
891891 for (const mc_EncryptedField_t * ef = efc -> fields ; ef != NULL ; ef = ef -> next ) {
892892 if (ef -> supported_queries
893- & (SUPPORTS_RANGE_QUERIES | SUPPORTS_SUBSTRING_PREVIEW_QUERIES | SUPPORTS_SUFFIX_PREVIEW_QUERIES
894- | SUPPORTS_PREFIX_PREVIEW_QUERIES )) {
893+ & (SUPPORTS_RANGE_QUERIES | SUPPORTS_SUBSTRING_PREVIEW_QUERIES | SUPPORTS_SUFFIX_QUERIES
894+ | SUPPORTS_PREFIX_QUERIES )) {
895895 has_fields_requiring_ei = true;
896896 break ;
897897 }
@@ -1011,8 +1011,8 @@ static bool _fle2_append_compactionTokens(mongocrypt_t *crypt,
10111011 const _mongocrypt_buffer_t * ecoct_buf = mc_ECOCToken_get (ecoct );
10121012
10131013 if (ptr -> supported_queries
1014- & (SUPPORTS_RANGE_QUERIES | SUPPORTS_SUBSTRING_PREVIEW_QUERIES | SUPPORTS_SUFFIX_PREVIEW_QUERIES
1015- | SUPPORTS_PREFIX_PREVIEW_QUERIES )) {
1014+ & (SUPPORTS_RANGE_QUERIES | SUPPORTS_SUBSTRING_PREVIEW_QUERIES | SUPPORTS_SUFFIX_QUERIES
1015+ | SUPPORTS_PREFIX_QUERIES )) {
10161016 // Append the document {ecoc: <ECOCToken>, anchorPaddingToken: <AnchorPaddingTokenRoot>}
10171017 esct = mc_ESCToken_new (crypto , cl1t , status );
10181018 if (!esct ) {
@@ -1520,8 +1520,8 @@ static bool _fle2_finalize_explicit(mongocrypt_ctx_t *ctx, mongocrypt_binary_t *
15201520 _mongocrypt_ctx_fail_w_msg (ctx , "Cannot use rangePreview query type with Range V2" );
15211521 goto fail ;
15221522 // fallthrough
1523- case MONGOCRYPT_QUERY_TYPE_PREFIXPREVIEW :
1524- case MONGOCRYPT_QUERY_TYPE_SUFFIXPREVIEW :
1523+ case MONGOCRYPT_QUERY_TYPE_SUFFIX :
1524+ case MONGOCRYPT_QUERY_TYPE_PREFIX :
15251525 case MONGOCRYPT_QUERY_TYPE_SUBSTRINGPREVIEW :
15261526 case MONGOCRYPT_QUERY_TYPE_RANGE :
15271527 case MONGOCRYPT_QUERY_TYPE_EQUALITY : marking .u .fle2 .type = MONGOCRYPT_FLE2_PLACEHOLDER_TYPE_FIND ; break ;
@@ -2087,14 +2087,14 @@ static bool explicit_encrypt_init(mongocrypt_ctx_t *ctx, mongocrypt_binary_t *ms
20872087
20882088 if (ctx -> opts .query_type .set ) {
20892089 const mongocrypt_query_type_t qt = ctx -> opts .query_type .value ;
2090- if (qt == MONGOCRYPT_QUERY_TYPE_PREFIXPREVIEW ) {
2090+ if (qt == MONGOCRYPT_QUERY_TYPE_PREFIX ) {
20912091 if (!(ctx -> opts .index_type .set && ctx -> opts .index_type .value == MONGOCRYPT_INDEX_TYPE_TEXTPREVIEW )) {
2092- return _mongocrypt_ctx_fail_w_msg (ctx , "prefixPreview query type requires textPreview index type" );
2092+ return _mongocrypt_ctx_fail_w_msg (ctx , "prefix query type requires textPreview index type" );
20932093 }
20942094 }
2095- if (qt == MONGOCRYPT_QUERY_TYPE_SUFFIXPREVIEW ) {
2095+ if (qt == MONGOCRYPT_QUERY_TYPE_SUFFIX ) {
20962096 if (!(ctx -> opts .index_type .set && ctx -> opts .index_type .value == MONGOCRYPT_INDEX_TYPE_TEXTPREVIEW )) {
2097- return _mongocrypt_ctx_fail_w_msg (ctx , "suffixPreview query type requires textPreview index type" );
2097+ return _mongocrypt_ctx_fail_w_msg (ctx , "suffix query type requires textPreview index type" );
20982098 }
20992099 }
21002100 if (qt == MONGOCRYPT_QUERY_TYPE_SUBSTRINGPREVIEW ) {
@@ -2180,8 +2180,8 @@ static bool explicit_encrypt_init(mongocrypt_ctx_t *ctx, mongocrypt_binary_t *ms
21802180 matches = (ctx -> opts .index_type .value == MONGOCRYPT_INDEX_TYPE_EQUALITY );
21812181 break ;
21822182 // fallthrough
2183- case MONGOCRYPT_QUERY_TYPE_PREFIXPREVIEW :
2184- case MONGOCRYPT_QUERY_TYPE_SUFFIXPREVIEW :
2183+ case MONGOCRYPT_QUERY_TYPE_PREFIX :
2184+ case MONGOCRYPT_QUERY_TYPE_SUFFIX :
21852185 case MONGOCRYPT_QUERY_TYPE_SUBSTRINGPREVIEW :
21862186 matches = (ctx -> opts .index_type .value == MONGOCRYPT_INDEX_TYPE_TEXTPREVIEW );
21872187 break ;
0 commit comments