stratomancer · July 31, 2014 12:20 · Nov 14, 2013 · Nov 14, 2013 · Nov 14, 2013
diff --git a/gistfile1.py b/gistfile1.py
@@ -36,10 +36,10 @@ def __exit__(self, *excinfo):
         self.connection.close()
         del connections.databases[self.alias]
 
-def adhoc_db_decorator(*args, **kwargs):
+def adhoc_db_decorator(settings, alias=None):
     def decorator(func):
-        with adhoc_db(*args, **kwargs):        
-            def inner(*args, **kwargs):
+        def inner(*args, **kwargs):
+            with adhoc_db(settings, alias):
                 return func(*args, **kwargs)
-            return inner
+        return inner
     return decorator
diff --git a/gistfile1.py b/gistfile1.py
@@ -10,6 +10,12 @@ class adhoc_db(object):
 
     Exceptions are passed through, but ensures the connection and
     settings have been cleaned up from `connections.databases`.
+    
+    Usage:
+    
+        with adhoc_db(settings) as conn:
+            # do something with...
+
     """
     def __init__(self, settings, alias=None):
         if alias is None:

diff --git a/gistfile1.py b/gistfile1.py
@@ -0,0 +1,39 @@
+import string
+from random import SystemRandom
+from django.db import connections
+
+key_chars = string.ascii_letters
+random = SystemRandom()
+
+class adhoc_db(object):
+    """Context manager that temporarily adds a database connection.
+
+    Exceptions are passed through, but ensures the connection and
+    settings have been cleaned up from `connections.databases`.
+    """
+    def __init__(self, settings, alias=None):
+        if alias is None:
+            key = ''.join(random.choice(key_chars) for i in xrange(10))
+
+        # TODO should this lock?
+        assert alias not in connections.databases or \
+            connections.databases[alias] == settings
+
+        self.alias = alias
+        connections.databases[alias] = settings
+        self.connection = connections[alias]
+
+    def __enter__(self):
+        return self.connection
+
+    def __exit__(self, *excinfo):
+        self.connection.close()
+        del connections.databases[self.alias]
+
+def adhoc_db_decorator(*args, **kwargs):
+    def decorator(func):
+        with adhoc_db(*args, **kwargs):        
+            def inner(*args, **kwargs):
+                return func(*args, **kwargs)
+            return inner
+    return decorator
No results found