Skip to content

A
AmendsenProject
Commit fb3f940f authored by lelandtran's avatar lelandtran Committed by Tao Feng
Browse files
Options

Support Python3 for PostgresMetadataExtractor (#117)

parent 3c24cac3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
databuilder/extractor/postgres_metadata_extractor.py
View file @ fb3f940f
import logging import logging
import six
from collections import namedtuple from collections import namedtuple
from pyhocon import ConfigFactory, ConfigTree # noqa: F401 from pyhocon import ConfigFactory, ConfigTree # noqa: F401
...@@ -60,8 +61,11 @@ class PostgresMetadataExtractor(Extractor): ...@@ -60,8 +61,11 @@ class PostgresMetadataExtractor(Extractor):
else: else:
cluster_source = "'{}'".format(self._cluster) cluster_source = "'{}'".format(self._cluster)
self._database = conf.get_string(PostgresMetadataExtractor.DATABASE_KEY, database = conf.get_string(PostgresMetadataExtractor.DATABASE_KEY, default='postgres')
default='postgres').encode('utf-8', 'ignore') if six.PY2 and isinstance(database, six.text_type):
database = database.encode('utf-8', 'ignore')
self._database = database
self.sql_stmt = PostgresMetadataExtractor.SQL_STATEMENT.format( self.sql_stmt = PostgresMetadataExtractor.SQL_STATEMENT.format(
where_clause_suffix=conf.get_string(PostgresMetadataExtractor.WHERE_CLAUSE_SUFFIX_KEY), where_clause_suffix=conf.get_string(PostgresMetadataExtractor.WHERE_CLAUSE_SUFFIX_KEY),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment