yet another new-sqlalchemy fix, this one post-0.4.2; grr

[invirt/packages/invirt-database.git] / python / database / models.py

diff --git a/python/database/models.py b/python/database/models.py
index 6574ff1..793bc80 100644 (file)
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -1,11 +1,12 @@
 from sqlalchemy import *
+from sqlalchemy import orm
 from sqlalchemy.orm import create_session, relation
 
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 
 __all__ = ['meta',
-           'ctx',
+           'session',
            'clear_cache',
            'machine_table',
            'machine_access_table',
@@ -25,7 +26,7 @@ __all__ = ['meta',
            ]
 
 meta = ThreadLocalMetaData()
-ctx = SessionContext(create_session)
+session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=False))
 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),
@@ -73,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):
@@ -105,22 +106,20 @@ class Autoinstall(object):
     def __repr__(self):
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
-assign_mapper(ctx, Machine, machine_table,
+session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine", lazy=False),
                           'disks': relation(Disk, backref="machine", lazy=False),
                           'type': relation(Type, lazy=False),
                           'acl': relation(MachineAccess, backref="machine", lazy=False, passive_deletes=True, cascade="all, delete-orphan")});
-assign_mapper(ctx, MachineAccess, machine_access_table)
-assign_mapper(ctx, NIC, nic_table)
-assign_mapper(ctx, Disk, disk_table)
-assign_mapper(ctx, Type, types_table)
-assign_mapper(ctx, CDROM, cdroms_table)
-assign_mapper(ctx, Autoinstall, autoinstalls_table)
+session.mapper(MachineAccess, machine_access_table)
+session.mapper(NIC, nic_table)
+session.mapper(Disk, disk_table)
+session.mapper(Type, types_table)
+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?"""
-
-    ctx.registry.clear()
+    session.clear()