X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/2920145fe2531a7f64b9a718524c8bf2785f87be..69ff84f7de3d72cda2e49f6125268475db6f41ad:/python/database/models.py

diff --git a/python/database/models.py b/python/database/models.py
index 6ba0446..793bc80 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -26,7 +26,7 @@ __all__ = ['meta',
            ]
 
 meta = ThreadLocalMetaData()
-session = orm.scoped_session(orm.sessionmaker(transactional=False))
+session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=False))
 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),
@@ -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()