Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions sdk/cosmos/azure-cosmos/azure/cosmos/aio/_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -821,10 +821,12 @@ def query_items(
feed_options["correlatedActivityId"] = GenerateGuidId()

# Set query with 'query' and 'parameters' from kwargs
if utils.valid_key_value_exist(kwargs, "parameters"):
query = {"query": kwargs.pop("query", None), "parameters": kwargs.pop("parameters", None)}
query_str = kwargs.pop("query", None)
parameters = kwargs.pop("parameters", None)
if "parameters" in kwargs or parameters is not None:
query = {"query": query_str, "parameters": parameters}
else:
query = kwargs.pop("query", None)
query = query_str

# Set method to get/cache container properties
kwargs["containerProperties"] = self._get_properties_with_options
Expand Down
9 changes: 6 additions & 3 deletions sdk/cosmos/azure-cosmos/azure/cosmos/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -933,10 +933,13 @@ def query_items( # pylint:disable=docstring-missing-param
feed_options["containerRID"] = self.__get_client_container_caches()[self.container_link]["_rid"]

# Set query with 'query' and 'parameters' from kwargs
if utils.valid_key_value_exist(kwargs, "parameters"):
query = {"query": kwargs.pop("query", None), "parameters": kwargs.pop("parameters", None)}
query_str = kwargs.pop("query", None)
_sentinel = object()
parameters = kwargs.pop("parameters", _sentinel)
if parameters is not _sentinel:
query = {"query": query_str, "parameters": parameters}
else:
query = kwargs.pop("query", None)
query = query_str

# Set range filters for a query. Options are either 'feed_range' or 'partition_key'
utils.verify_exclusive_arguments(["feed_range", "partition_key"], **kwargs)
Expand Down
Loading