Diff of /Allura/allura/model/session.py [1f90c6] .. [14304a]

  Switch to side-by-side view 

--- a/Allura/allura/model/session.py
+++ b/Allura/allura/model/session.py
@@ -19,11 +19,10 @@
     @property
     def db(self):
         try:
-            if c.project.database_uri:
-                scheme, rest = c.project.database_uri.split('://')
-                host, database = rest.split('/', 1)
-                return ShardedDataStore.get(scheme + '://' + host, database).db
-            return getattr(self.main_session.bind.conn, c.project.database)
+            assert c.project.database_uri
+            scheme, rest = c.project.database_uri.split('://')
+            host, database = rest.split('/', 1)
+            return ShardedDataStore.get(scheme + '://' + host, database).db
         except (KeyError, AttributeError, TypeError), ex:
             return None