more sqlalchemy-0.4 changes

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

diff --git a/python/database/models.py b/python/database/models.py
index ee207f6..b91107f 100644 (file)
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -1,10 +1,12 @@
 from sqlalchemy import *
 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',
 
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 
 __all__ = ['meta',

-           'ctx',
+           'session',

            'clear_cache',
            'machine_table',
            'machine_access_table',
            'clear_cache',
            'machine_table',
            'machine_access_table',

@@ -20,10 +22,11 @@ __all__ = ['meta',
            'Type',
            'CDROM',
            'Autoinstall',
            'Type',
            'CDROM',
            'Autoinstall',

+           'or_',

            ]
 
            ]
 

-meta = DynamicMetaData()
-ctx = SessionContext(create_session)
+meta = ThreadLocalMetaData()
+session = orm.scoped_session(orm.sessionmaker())

 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),
 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),

@@ -36,7 +39,8 @@ machine_table = Table('machines', meta,
        Column('administrator', String, nullable=False, default=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
        Column('administrator', String, nullable=False, default=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),

-       Column('cpus', Integer, nullable=False, default=1))
+       Column('cpus', Integer, nullable=False, default=1),
+       Column('adminable', Boolean, nullable=False, default=False))

 
 nic_table = Table('nics', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),
 
 nic_table = Table('nics', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),

@@ -102,17 +106,17 @@ class Autoinstall(object):
     def __repr__(self):
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
     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")});
               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.
 
 def clear_cache():
     """Clear sqlalchemy's cache.

@@ -120,4 +124,5 @@ def clear_cache():
     This _seems_ to be the way; it works, but the docs don't mention
     it.  Why is this so obscure?"""
 
     This _seems_ to be the way; it works, but the docs don't mention
     it.  Why is this so obscure?"""
 

-    ctx.registry.clear()
+    # XXX maybe we still need to do this, but it's not doc'd how.
+    #ctx.registry.clear()