1 files changed, 49 insertions, 31 deletions

diff --git a/dodai/config/databases/sa.py b/dodai/config/databases/sa.py
index a5965a9..21999c2 100644
--- a/dodai/config/databases/sa.py
+++ b/dodai/config/databases/sa.py
@@ -17,31 +17,49 @@
 
 
 class Sa(object):
+    """Callable object that will wire up sqlalchemy engine and
+    session objects
 
+    Attributes:
+        create_engine:  The sqlalchemy create_engine object
+        session_maker:  The sqlalchemy session_maker object
+        result_object:  The object that will be populated with
+                        all the connection information along with
+                        the sqlalchemy objects
+
+    """
     def __init__(self, create_engine, session_maker, result_object):
         self._create_engine = create_engine
         self._session_maker = session_maker
         self._result_object = result_object
 
-    def __call__(self, name, obj):
+    def __call__(self, section, name):
         db = self._result_object()
         db.name = name
-        db.protocol = obj.protocol
-        if hasattr(obj, 'protocol_extra') and obj.protocol_extra:
-            db.protocol_extra = obj.protocol_extra
-        if hasattr(obj, 'filename') and obj.filename:
-            db.filename = obj.filename
-        if hasattr(obj, 'port') and obj.port:
-            db.port = int(obj.port)
-        if hasattr(obj, 'database') and obj.database:
-            db.database = obj.database
-        if hasattr(obj, 'schema') and obj.schema:
-            db.schema = obj.schema
-        if hasattr(obj, 'username') and obj.username:
-            db.username = obj.username
-        if hasattr(obj, 'hostname') and obj.hostname:
-            db.hostname = obj.hostname
-        db.engine = self._build_engine(obj)
+        db.protocol = section['protocol']
+
+        if section.has_key('protocol_extra') and section['protocol_extra']:
+            db.protocol_extra = section['protocol_extra']
+
+        if section.has_key('filename') and section['filename']:
+            db.filename = section['filename']
+
+        if section.has_key('port') and section['port']:
+            db.port = int(section['port'])
+
+        if section.has_key('database') and section['database']:
+            db.database = section['database']
+
+        if section.has_key('schema') and section['schema']:
+            db.schema = section['schema']
+
+        if section.has_key('username') and section['username']:
+            db.username = section['username']
+
+        if section.has_key('hostname') and section['hostname']:
+            db.hostname = section['hostname']
+
+        db.engine = self._build_engine(section)
         db.session = self._build_session(db.engine)
         return db
 
@@ -49,25 +67,25 @@ class Sa(object):
         session = self._session_maker(bind=engine)
         return session()
 
-    def _build_connection_string(self, obj):
+    def _build_connection_string(self, section):
         out = []
-        out.append('{db.protocol}')
-        if hasattr(obj, 'protocol_extra') and obj.protocol_extra:
-            out.append('+{db.protocol_extra}')
+        out.append('{section[protocol]}')
+        if section.has_key('protocol_extra') and section['protocol_extra']:
+            out.append('+{section[protocol_extra]}')
         out.append('://')
-        if hasattr(obj, 'filename') and obj.filename:
-            out.append('{db.filename}')
+        if section.has_key('filename') and section['filename']:
+            out.append('{section[filename]}')
         else:
-            out.append('{db.username}:{db.password}@')
-            out.append('{db.hostname}')
-            if hasattr(obj, 'port') and obj.port:
-                out.append(':{db.port}')
-            out.append('/{db.database}')
+            out.append('{section[username]}:{section[password]}@')
+            out.append('{section[hostname]}')
+            if section.has_key('port') and section['port']:
+                out.append(':{section[port]}')
+            out.append('/{section[database]}')
         out = ''.join(out)
-        out = out.format(db=obj)
+        out = out.format(section=section)
         return out
 
-    def _build_engine(self, obj):
-        connection_string = self._build_connection_string(obj)
+    def _build_engine(self, section):
+        connection_string = self._build_connection_string(section)
         db_obj = self._create_engine(connection_string)
         return db_obj