X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/95861a2faf8ff0edd2e834c70180cabf4b4a9359..2aa11d1e104d9251d0217367d9b869c40b630106:/python/database/models.py

diff --git a/python/database/models.py b/python/database/models.py
index 67d5de8..793bc80 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -74,9 +74,9 @@ autoinstalls_table = Table('autoinstalls', meta,
        Column('mirror', String, nullable=False))
 
 machine_access_table = Table('machine_access', meta,
-       Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False, index=True),
+       Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), nullable=False, index=True),
        Column('user', String, nullable=False, index=True),
-       PrimaryKeyConstraint('machine_id', 'user', ondelete='CASCADE'))
+       PrimaryKeyConstraint('machine_id', 'user'))
 
 class Machine(object):
     def __repr__(self):
@@ -119,10 +119,7 @@ session.mapper(CDROM, cdroms_table)
 session.mapper(Autoinstall, autoinstalls_table)
 
 def clear_cache():
-    """Clear sqlalchemy's cache.
+    """Clear sqlalchemy's cache
+    """
 
-    This _seems_ to be the way; it works, but the docs don't mention
-    it.  Why is this so obscure?"""
-
-    # XXX maybe we still need to do this, but it's not doc'd how.
-    #ctx.registry.clear()
+    session.clear()