added support for fields from extract

Richard Kooijman · Richard Kooijman · commit 3f83b7cbc61f · 2020-03-01T17:42:09.000+01:00
added support for columns from extract
diff --git a/samples/connection-query/show_sql.py b/samples/connection-query/show_sql.py
@@ -1,7 +1,8 @@
 from tableaudocumentapi import Datasource
 
 sourceTDS = Datasource.from_file('Sales.tds')
-print(sourceTDS.has_extract())
+print(sourceTDS.fields)
+print(sourceTDS.extract_fields)
 
 print(sourceTDS.get_query())
 
diff --git a/tableaudocumentapi/connection.py b/tableaudocumentapi/connection.py
@@ -26,6 +26,10 @@ def __init__(self, connxml):
     def __repr__(self):
         return "'<Connection server='{}' dbname='{}' @ {}>'".format(self._server, self._dbname, hex(id(self)))
 
+    @property
+    def connection_xml(self):
+        return self._connectionXML
+
     @classmethod
     def from_attributes(cls, server, dbname, username, dbclass, port=None, query_band=None,
                         initial_sql=None, authentication=''):
diff --git a/tableaudocumentapi/datasource.py b/tableaudocumentapi/datasource.py
@@ -120,11 +120,11 @@ def _extract_federated_connections(self):
         connections = list(map(Connection, self._dsxml.findall('.//named-connections/named-connection/*')))
         # 'sqlproxy' connections (Tableau Server Connections) are not embedded into named-connection elements
         # extract them manually for now
-        connections.extend(map(Connection, self._dsxml.findall("./connection[@class='sqlproxy']")))
+        connections.extend(map(Connection, self._dsxml.findall(".//connection[@class='sqlproxy']")))
         return connections
 
     def _extract_legacy_connection(self):
-        return list(map(Connection, self._dsxml.findall('connection')))
+        return list(map(Connection, self._dsxml.children('connection')))
 
     def get_connections(self):
         """Find and return all connections based on file format version."""
@@ -156,11 +156,13 @@ def __init__(self, dsxml, filename=None):
         self._caption = self._datasourceXML.get('caption', '')
         self._connection_parser = ConnectionParser(self._datasourceXML, version=self._version)
         self._connections = self._connection_parser.get_connections()
+        self._db_columns = self._get_db_column_objects()
+        self._extract_columns = self._get_extract_column_objects()
         self._fields = None
+        self._extract_fields = None
         self._parameter_parser = ParameterParser(self._datasourceXML, version=self._version)
         self._parameters = self._parameter_parser.get_parameters()
         self._columns = None
-        self._db_columns = self._get_db_column_objects()
 
         self._relations = list(map(Relation, self._datasourceXML.findall("./connection[@class='federated']/relation")))
         self._extracts = list(map(Extract, self._datasourceXML.findall("./extract")))
@@ -255,6 +257,12 @@ def fields(self):
             self._fields = self._get_all_fields()
         return self._fields
 
+    @property
+    def extract_fields(self):
+        if not self._extract_fields:
+            self._extract_fields = self._get_extract_fields()
+        return self._extract_fields
+
     @property
     def columns(self):
         if not self._columns:
@@ -281,17 +289,29 @@ def _get_all_fields(self):
 
         return FieldDictionary({k: v for k, v in field_objects})
 
+    def _get_extract_fields(self):
+        self._extract_metadata_objects = (x for x in self._get_extract_metadata_objects())
+        return FieldDictionary({k: v for k, v in self._extract_metadata_objects})
+
     def _get_metadata_objects(self):
         return (_column_object_from_metadata_xml(xml)
                 for xml in self._datasourceTree.findall(".//metadata-record[@class='column']"))
 
+    def _get_extract_metadata_objects(self):
+        return (_column_object_from_metadata_xml(xml)
+                for xml in self._datasourceTree.findall(".//extract/connection/metadata-records/metadata-record[@class='column']"))
+
     def _get_column_objects(self):
         return [_column_object_from_column_xml(self._datasourceTree, xml)
-                for xml in self._datasourceTree.findall('.//column')]
+                for xml in self._datasourceTree.findall('./column')]
 
     def _get_db_column_objects(self):
         return dict([_db_column_object_from_db_column_xml(self._datasourceTree, xml)
-                for xml in self._datasourceTree.findall('./connection/cols/map')])
+                for xml in self._datasourceTree.findall('.//connection/cols/map')])
+
+    def _get_extract_column_objects(self):
+        return dict([_db_column_object_from_db_column_xml(self._datasourceTree, xml)
+                for xml in self._datasourceTree.findall('.//extract/connection/cols/map')])
 
     def has_extract(self):
         return len(self._extracts) > 0 and self._extracts[0].enabled == 'true'
diff --git a/tableaudocumentapi/field.py b/tableaudocumentapi/field.py
@@ -147,6 +147,14 @@ def caption(self):
         """ Name of the field as displayed in Tableau unless an aliases is defined """
         return self._caption
 
+    @property
+    def parent(self):
+        return self._parent
+
+    @property
+    def family(self):
+        return self._family
+
     @caption.setter
     def caption(self, caption):
         self._caption = caption
