@@ -630,20 +630,30 @@ def resolve_value(
630630 values : filter = filter (None , value .split (separator_char ))
631631 for value in values :
632632 value = escaper .escape (value )
633- result += f"@{ field_name } { value }
633+ result += "@{field_name}:{{{value}}}" .format (
634+ field_name = field_name , value = value
635+ )
634636 else :
635637 value = escaper .escape (value )
636- result += f"@{ field_name } { value }
638+ result += "@{field_name}:{{{value}}}" .format (
639+ field_name = field_name , value = value
640+ )
637641 elif op is Operators .NE :
638642 value = escaper .escape (value )
639- result += f"-(@{ field_name } { value }
643+ result += "-(@{field_name}:{{{value}}})" .format (
644+ field_name = field_name , value = value
645+ )
640646 elif op is Operators .IN :
641647 expanded_value = cls .expand_tag_value (value )
642- result += f"(@{ field_name } { expanded_value }
648+ result += "(@{field_name}:{{{expanded_value}}})" .format (
649+ field_name = field_name , expanded_value = expanded_value
650+ )
643651 elif op is Operators .NOT_IN :
644652 # TODO: Implement NOT_IN, test this...
645653 expanded_value = cls .expand_tag_value (value )
646- result += f"-(@{ field_name } { expanded_value }
654+ result += "-(@{field_name}):{{{expanded_value}}}" .format (
655+ field_name = field_name , expanded_value = expanded_value
656+ )
647657
648658 return result
649659
@@ -1525,9 +1535,11 @@ async def all_pks(cls): # type: ignore
15251535 # TODO: We need to decide how we want to handle the lack of
15261536 # decode_responses=True...
15271537 return (
1528- remove_prefix (key , key_prefix )
1529- if isinstance (key , str )
1530- else remove_prefix (key .decode (cls .Meta .encoding ), key_prefix )
1538+ (
1539+ remove_prefix (key , key_prefix )
1540+ if isinstance (key , str )
1541+ else remove_prefix (key .decode (cls .Meta .encoding ), key_prefix )
1542+ )
15311543 async for key in cls .db ().scan_iter (f"{ key_prefix } , _type = "HASH" )
15321544 )
15331545
@@ -1698,9 +1710,11 @@ async def all_pks(cls): # type: ignore
16981710 # TODO: We need to decide how we want to handle the lack of
16991711 # decode_responses=True...
17001712 return (
1701- remove_prefix (key , key_prefix )
1702- if isinstance (key , str )
1703- else remove_prefix (key .decode (cls .Meta .encoding ), key_prefix )
1713+ (
1714+ remove_prefix (key , key_prefix )
1715+ if isinstance (key , str )
1716+ else remove_prefix (key .decode (cls .Meta .encoding ), key_prefix )
1717+ )
17041718 async for key in cls .db ().scan_iter (f"{ key_prefix } , _type = "ReJSON-RL" )
17051719 )
17061720
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4&size=40){kind=avatar}
0 commit comments