Skip to content

Commit b102a4c

Browse files
committed
Jac/createextracts bug (#1026)
fix xml generation for items
1 parent d0e5acc commit b102a4c

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-3
lines changed

tableauserverclient/server/request_factory.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,6 @@ def _generate_xml(
887887
views_element = ET.SubElement(workbook_element, "views")
888888
for view_name in workbook_item.hidden_views:
889889
_add_hiddenview_element(views_element, view_name)
890-
891890
return ET.tostring(xml_request)
892891

893892
def update_req(self, workbook_item):
@@ -960,9 +959,9 @@ def embedded_extract_req(self, xml_request, include_all=True, datasources=None):
960959
list_element = ET.SubElement(xml_request, "datasources")
961960
if include_all:
962961
list_element.attrib["includeAll"] = "true"
963-
else:
962+
elif datasources:
964963
for datasource_item in datasources:
965-
datasource_element = list_element.SubElement(xml_request, "datasource")
964+
datasource_element = ET.SubElement(list_element, "datasource")
966965
datasource_element.attrib["id"] = datasource_item.id
967966

968967

test/request_factory/__init__.py

Whitespace-only changes.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import unittest
2+
import tableauserverclient as TSC
3+
import tableauserverclient.server.request_factory as TSC_RF
4+
from tableauserverclient import DatasourceItem
5+
6+
7+
class DatasourceRequestTests(unittest.TestCase):
8+
def test_generate_xml(self):
9+
datasource_item: TSC.DatasourceItem = TSC.DatasourceItem("name")
10+
datasource_item.name = "a ds"
11+
datasource_item.description = "described"
12+
datasource_item.use_remote_query_agent = False
13+
datasource_item.ask_data_enablement = DatasourceItem.AskDataEnablement.Enabled
14+
datasource_item.project_id = "testval"
15+
TSC_RF.RequestFactory.Datasource._generate_xml(datasource_item)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import unittest
2+
import tableauserverclient as TSC
3+
import tableauserverclient.server.request_factory as TSC_RF
4+
5+
6+
class WorkbookRequestTests(unittest.TestCase):
7+
def test_embedded_extract_req(self):
8+
include_all = True
9+
embedded_datasources = None
10+
xml_result = TSC_RF.RequestFactory.Workbook.embedded_extract_req(include_all, embedded_datasources)
11+
12+
def test_generate_xml(self):
13+
workbook_item: TSC.WorkbookItem = TSC.WorkbookItem("name", "project_id")
14+
TSC_RF.RequestFactory.Workbook._generate_xml(workbook_item)

0 commit comments

Comments
 (0)