Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion tableauserverclient/server/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def fields(self: Self, *fields: str) -> Self:
-------
QuerySet
"""
self.request_options.fields |= set(fields) | set(("_default_"))
self.request_options.fields |= set(fields) | {"_default_"}
return self

def only_fields(self: Self, *fields: str) -> Self:
Expand Down
16 changes: 16 additions & 0 deletions test/test_request_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,22 @@ def test_queryset_only_fields(server: TSC.Server) -> None:
assert "_default_" not in loop.request_options.fields


def test_queryset_chained_fields(server: TSC.Server) -> None:
# QuerySet.fields is the method reached when fields() follows filter(), order_by() or paginate()
loop = server.users.filter(name="alice").fields("id")
assert loop.request_options.fields == {"id", "_default_"}


def test_queryset_chained_fields_query_string(server: TSC.Server) -> None:
with requests_mock.mock() as m:
m.get(server.views.baseurl, text=SLICING_QUERYSET_PAGE_1.read_text())
loop = server.views.order_by("name").fields("id", "name")
list(loop)
history = m.request_history[0]

assert history.qs.get("fields") == ["_default_,id,name"]


def test_queryset_field_order(server: TSC.Server) -> None:
with requests_mock.mock() as m:
m.get(server.views.baseurl, text=SLICING_QUERYSET_PAGE_1.read_text())
Expand Down