instacart · Dec 7, 2018
diff --git a/‎.circleci/config.yml
+1 b/‎.circleci/config.yml
+1
diff --git a/‎config/database.cfg
+10 b/‎config/database.cfg
+10
diff --git a/‎config/test/database.cfg
+4 b/‎config/test/database.cfg
+4
diff --git a/‎lore/__init__.py
+2-2 b/‎lore/__init__.py
+2-2
diff --git a/‎lore/encoders.py
+2-1 b/‎lore/encoders.py
+2-1
diff --git a/‎lore/env.py
+6-2 b/‎lore/env.py
+6-2
diff --git a/‎lore/io/__init__.py
+3 b/‎lore/io/__init__.py
+3
diff --git a/‎lore/io/connection.py
+16-14 b/‎lore/io/connection.py
+16-14
@@ -69,6 +69,7 @@ jobs:
         - /opt/circleci/.pyenv
         - /opt/circleci/python
 
+    - run: dropdb lore_test --if-exists
     - run: createdb lore_test
     - run: LORE_PYTHON_VERSION=2.7.15 lore test
     - run: LORE_PYTHON_VERSION=3.6.5 lore test
 
@@ -0,0 +1,10 @@
+[MAIN]
+url: postgres://localhost/lore_test
+use_batch_mode: True
+
+[MAIN_TWO]
+url: postgres://localhost/lore_test
+use_batch_mode: True
+
+[METADATA]
+url: sqlite:///data/metadata.sqlite
@@ -5,3 +5,7 @@ use_batch_mode: True
 [MAIN_TWO]
 url: postgres://localhost/lore_test
 use_batch_mode: True
+
+[METADATA]
+url: postgres://localhost/lore_test
+use_batch_mode: True
@@ -15,9 +15,9 @@
 
 __author__ = 'Montana Low and Jeremy Stanley'
 __copyright__ = 'Copyright © 2018, Instacart'
-__credits__ = ['Montana Low', 'Jeremy Stanley', 'Emmanuel Turlay', 'Shrikar Archak']
+__credits__ = ['Montana Low', 'Jeremy Stanley', 'Emmanuel Turlay', 'Shrikar Archak', 'Ganesh Krishnan']
 __license__ = 'MIT'
-__version__ = '0.6.27'
+__version__ = '0.7.0rc1'
 __maintainer__ = 'Montana Low'
 __email__ = 'montana@instacart.com'
 __status__ = 'Development Status :: 4 - Beta'
 
@@ -65,7 +65,8 @@ def __str__(self):
         return self.name
 
     def __repr__(self):
-        return self.name
+        properties = ['%s=%s' % (key, value) for key, value in self.__dict__]
+        return '<%s(%s)>' % (self.name, ', '.join(properties))
 
     def __setstate__(self, dict):
         self.__dict__ = dict
 
@@ -432,8 +432,12 @@ def set_python_version(python_version):
         if os.environ.get('LANG', None):
             UNICODE_LOCALE = False
         else:
-            locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
-            UNICODE_UPGRADED = True
+            try:
+                locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+                UNICODE_UPGRADED = True
+            except StandardError:
+                UNICODE_LOCALE = False
+
 
 # -- Load Environment --------------------------------------------------------
 ENV_FILE = os.environ.get('ENV_FILE', '.env')  #: environment variables will be loaded from this file first
 
@@ -34,6 +34,9 @@
         else:
             vars()[section.lower()] = Connection(name=section.lower(), **options)
 
+if 'metadata' not in vars():
+    vars()['metadata'] = Connection('sqlite:///%s/metadata.sqlite' % lore.env.DATA_DIR)
+
 redis_config = lore.env.REDIS_CONFIG
 if redis_config:
     require(lore.dependencies.REDIS)
 
@@ -78,7 +78,7 @@ class Connection(object):
     UNLOAD_PREFIX = os.path.join(lore.env.NAME, 'unloads')
     IAM_ROLE = os.environ.get('IAM_ROLE', None)
 
-    def __init__(self, url, name='connection', **kwargs):
+    def __init__(self, url, name='connection', watermark=True, **kwargs):
         if not sqlalchemy:
             raise lore.env.ModuleNotFoundError('No module named sqlalchemy. Please add it to requirements.txt.')
 
@@ -101,6 +101,7 @@ def __init__(self, url, name='connection', **kwargs):
             del kwargs['__name__']
         if 'echo' not in kwargs:
             kwargs['echo'] = False
+        logger.info("Creating engine: %s %s" % (url, kwargs))
         self._engine = sqlalchemy.create_engine(url, **kwargs).execution_options(autocommit=True)
         self._metadata = None
         self.name = name
@@ -110,21 +111,22 @@ def __init__(self, url, name='connection', **kwargs):
         @event.listens_for(self._engine, "before_cursor_execute", retval=True)
         def comment_sql_calls(conn, cursor, statement, parameters, context, executemany):
             conn.info.setdefault('query_start_time', []).append(datetime.now())
-            stack = inspect.stack()[1:-1]
-            if sys.version_info.major == 3:
-                stack = [(x.filename, x.lineno, x.function) for x in stack]
-            else:
-                stack = [(x[1], x[2], x[3]) for x in stack]
+            if watermark:
+                stack = inspect.stack()[1:-1]
+                if sys.version_info.major == 3:
+                    stack = [(x.filename, x.lineno, x.function) for x in stack]
+                else:
+                    stack = [(x[1], x[2], x[3]) for x in stack]
 
-            paths = [x[0] for x in stack]
-            origin = next((x for x in paths if x.startswith(lore.env.ROOT)), None)
-            if origin is None:
-                origin = next((x for x in paths if 'sqlalchemy' not in x), None)
-            if origin is None:
-                origin = paths[0]
-            caller = next(x for x in stack if x[0] == origin)
+                paths = [x[0] for x in stack]
+                origin = next((x for x in paths if x.startswith(lore.env.ROOT)), None)
+                if origin is None:
+                    origin = next((x for x in paths if 'sqlalchemy' not in x), None)
+                if origin is None:
+                    origin = paths[0]
+                caller = next(x for x in stack if x[0] == origin)
 
-            statement = "/* %s | %s:%d in %s */\n" % (lore.env.APP, caller[0], caller[1], caller[2]) + statement
+                statement = "/* %s | %s:%d in %s */\n" % (lore.env.APP, caller[0], caller[1], caller[2]) + statement
             return statement, parameters
 
         @event.listens_for(self._engine, "after_cursor_execute")