diff --git a/tableauserverclient/server/query.py b/tableauserverclient/server/query.py index a57e36a85..d000430e9 100644 --- a/tableauserverclient/server/query.py +++ b/tableauserverclient/server/query.py @@ -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: diff --git a/test/test_request_option.py b/test/test_request_option.py index 3709e18d3..a32f8a825 100644 --- a/test/test_request_option.py +++ b/test/test_request_option.py @@ -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())