Skip to content
Snippets Groups Projects
Commit 30fb2ad0 authored by Dennis Ahrens's avatar Dennis Ahrens
Browse files

[FEATURE] #1073 Fixed unit tests.

parent 9a18f497
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 9 additions and 9 deletions
hshetl/extractors.py
+ 9
− 9
View file @ 30fb2ad0
...@@ -59,11 +59,11 @@ class SqlAlchemyExtractor(AbstractExtractor): ...@@ -59,11 +59,11 @@ class SqlAlchemyExtractor(AbstractExtractor):
''' '''
result = [] result = []
query = self._resolve_sql_query(query) query = self._resolve_sql_query(query)
logging.info('Executing sql query: ' + query) logging.info('Executing sql query: ' + str(query))
raw_result = self._connection._connection.execute(query) raw_result = self._connection._connection.execute(query)
for row in raw_result: for row in raw_result:
result.append(dict(zip(raw_result.keys(), row))) result.append(dict(zip(raw_result.keys(), row)))
logging.info('Resolved ' + len(result) + ' records') logging.info('Resolved ' + str(len(result)) + ' records')
return self._map(result, mapping) return self._map(result, mapping)
def _resolve_sql_query(self, query): def _resolve_sql_query(self, query):
...@@ -98,10 +98,10 @@ class LdapExtractor(AbstractExtractor): ...@@ -98,10 +98,10 @@ class LdapExtractor(AbstractExtractor):
def execute(self, query={}, mapping={}): def execute(self, query={}, mapping={}):
if isinstance(query, str): if isinstance(query, str):
filter = query ldap_filter = query
query = {} query = {}
elif isinstance(query, dict) and 'filter' in query: filter = query['filter'] elif isinstance(query, dict) and 'filter' in query: ldap_filter = query['filter']
else: filter = self._filter else: ldap_filter = self._filter
if 'base' in query: base = query['base'] if 'base' in query: base = query['base']
elif self._base is not None: base = self._base elif self._base is not None: base = self._base
...@@ -114,15 +114,15 @@ class LdapExtractor(AbstractExtractor): ...@@ -114,15 +114,15 @@ class LdapExtractor(AbstractExtractor):
else: attributes = self._attributes else: attributes = self._attributes
result = [] result = []
logging.info('Executing ldap search base: ' + base + ' scope: ' + scope + ' filter: ' + filter + ' attributes: ' + attributes) logging.info('Executing ldap search base: ' + str(base) + ' scope: ' + str(scope) + ' filter: ' + str(ldap_filter) + ' attributes: ' + str(attributes))
raw_result = self._connection._connection.search_s(base, scope, filter, attributes) raw_result = self._connection._connection.search_s(base, scope, ldap_filter, attributes)
for dn, entry in raw_result: for dn, entry in raw_result:
row = {} row = {}
for key, value in entry.items(): for key, value in entry.items():
if len(value) is 1: value = value[0] if len(value) is 1: value = value[0]
row[key] = value row[key] = value
result.append(row) result.append(row)
logging.info('Resolved ' + len(result) + ' records') logging.info('Resolved ' + str(len(result)) + ' records')
return self._map(result, mapping) return self._map(result, mapping)
...@@ -154,5 +154,5 @@ class CsvExtractor(AbstractExtractor): ...@@ -154,5 +154,5 @@ class CsvExtractor(AbstractExtractor):
reader = csv.DictReader(self._connection._file, delimiter=self.delimiter) reader = csv.DictReader(self._connection._file, delimiter=self.delimiter)
for row in reader: for row in reader:
result.append(row) result.append(row)
logging.info('Resolved ' + len(result) + ' records') logging.info('Resolved ' + str(len(result)) + ' records')
return self._map(result, mapping) return self._map(result, mapping)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment