removed duplicate extract code

Richard Kooijman · Richard Kooijman · commit bf537117910e · 2020-03-01T10:15:54.000+01:00
diff --git a/samples/connection-query/show_sql.py b/samples/connection-query/show_sql.py
@@ -1,6 +1,7 @@
 from tableaudocumentapi import Datasource
 
 sourceTDS = Datasource.from_file('Sales.tds')
+print(sourceTDS.has_extract())
 
 print(sourceTDS.get_query())
 
diff --git a/tableaudocumentapi/datasource.py b/tableaudocumentapi/datasource.py
@@ -157,7 +157,6 @@ def __init__(self, dsxml, filename=None):
         self._connection_parser = ConnectionParser(self._datasourceXML, version=self._version)
         self._connections = self._connection_parser.get_connections()
         self._fields = None
-        self._extract = self._datasourceXML.findall("./extract")
         self._parameter_parser = ParameterParser(self._datasourceXML, version=self._version)
         self._parameters = self._parameter_parser.get_parameters()
         self._columns = None
@@ -295,7 +294,7 @@ def _get_db_column_objects(self):
                 for xml in self._datasourceTree.findall('./connection/cols/map')])
 
     def has_extract(self):
-        return len(self._extract) > 0 and self._extract[0].attrib['enabled'] == 'true'
+        return len(self._extracts) > 0 and self._extracts[0].enabled == 'true'
 
     def process_columns(self):
         sub_elems = self._datasourceTree.findall('*')
diff --git a/tableaudocumentapi/field.py b/tableaudocumentapi/field.py
@@ -11,6 +11,8 @@
     'alias',        # Name of the field as displayed in Tableau if the default name isn't wanted
     'calculation',  # If this field is a calculated field, this will be the formula
     'description',  # If this field has a description, this will be the description (including formatting tags)
+    'family',
+    'parent'
 ]
 
 _METADATA_ATTRIBUTES = [
@@ -20,7 +22,8 @@
 _METADATA_TO_FIELD_MAP = [
     ('local-name', 'id'),
     ('local-type', 'datatype'),
-    ('remote-alias', 'alias')
+    ('remote-alias', 'alias'),
+    ('parent-name', 'parent')
 ]
 
 
