Index: /trunk/packages/sipb-xen-database/debian/changelog
===================================================================
--- /trunk/packages/sipb-xen-database/debian/changelog	(revision 945)
+++ /trunk/packages/sipb-xen-database/debian/changelog	(revision 946)
@@ -1,2 +1,9 @@
+sipb-xen-database (10.20) hardy; urgency=low
+
+  * port to sqlalchemy-0.4, which cuts out some newly deprecated
+    interfaces and allowed some still-present interfaces to bitrot
+
+ -- Greg Price <price@mit.edu>  Mon, 29 Sep 2008 06:06:21 +0000
+
 sipb-xen-database (10.19) unstable; urgency=low
 
Index: /trunk/packages/sipb-xen-database/python/database/__init__.py
===================================================================
--- /trunk/packages/sipb-xen-database/python/database/__init__.py	(revision 945)
+++ /trunk/packages/sipb-xen-database/python/database/__init__.py	(revision 946)
@@ -1,6 +1,7 @@
 from invirt.config import structs as config
 from models import *
+import sqlalchemy
 
 def connect(uri = config.db.uri):
     """ Connect to a given database URI"""
-    meta.connect(uri)
+    meta.bind = sqlalchemy.create_engine(uri)
Index: /trunk/packages/sipb-xen-database/python/database/models.py
===================================================================
--- /trunk/packages/sipb-xen-database/python/database/models.py	(revision 945)
+++ /trunk/packages/sipb-xen-database/python/database/models.py	(revision 946)
@@ -1,3 +1,4 @@
 from sqlalchemy import *
+from sqlalchemy.orm import create_session, relation
 
 from sqlalchemy.ext.sessioncontext import SessionContext
@@ -24,5 +25,5 @@
            ]
 
-meta = DynamicMetaData()
+meta = ThreadLocalMetaData()
 ctx = SessionContext(create_session)