Turn on lazy loading for all tables

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

diff --git a/python/database/models.py b/python/database/models.py
index b91107f..e3f2996 100644 (file)
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -14,6 +14,7 @@ __all__ = ['meta',
            'disk_table',
            'types_table',
            'cdroms_table',
            'disk_table',
            'types_table',
            'cdroms_table',

+           'mirrors_table',

            'autoinstalls_table',
            'Machine',
            'MachineAccess',
            'autoinstalls_table',
            'Machine',
            'MachineAccess',

@@ -21,12 +22,13 @@ __all__ = ['meta',
            'Disk',
            'Type',
            'CDROM',
            'Disk',
            'Type',
            'CDROM',

+           'Mirror',

            'Autoinstall',
            'or_',
            ]
 
 meta = ThreadLocalMetaData()
            'Autoinstall',
            'or_',
            ]
 
 meta = ThreadLocalMetaData()

-session = orm.scoped_session(orm.sessionmaker())
+session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=False))

 
 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 +38,7 @@ machine_table = Table('machines', meta,
        Column('owner', String, nullable=False),
        Column('contact', String, nullable=False),
        Column('uuid', String, nullable=False),
        Column('owner', String, nullable=False),
        Column('contact', String, nullable=False),
        Column('uuid', String, nullable=False),

-       Column('administrator', String, nullable=False, default=False),
+       Column('administrator', String, nullable=True, default=None),

        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('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
        Column('cpus', Integer, nullable=False, default=1),

@@ -62,21 +64,28 @@ types_table = Table('types', meta,
        Column('acpi', Boolean, nullable=False),
        Column('pae', Boolean, nullable=False))
 
        Column('acpi', Boolean, nullable=False),
        Column('pae', Boolean, nullable=False))
 

+mirrors_table = Table('mirrors', meta,
+       Column('mirror_id', String, primary_key=True, nullable=False),
+       Column('uri_prefix', String, nullable=False))
+

 cdroms_table = Table('cdroms', meta,
        Column('cdrom_id', String, primary_key=True, nullable=False),
 cdroms_table = Table('cdroms', meta,
        Column('cdrom_id', String, primary_key=True, nullable=False),

-       Column('description', String, nullable=False))
+       Column('description', String, nullable=False),
+       Column('mirror_id', String, ForeignKey('mirrors.mirror_id')),
+       Column('uri_suffix', String))

 
 autoinstalls_table = Table('autoinstalls', meta,
        Column('autoinstall_id', String, primary_key=True, nullable=False),
        Column('description', String, nullable=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('distribution', String, nullable=False),
 
 autoinstalls_table = Table('autoinstalls', meta,
        Column('autoinstall_id', String, primary_key=True, nullable=False),
        Column('description', String, nullable=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('distribution', String, nullable=False),

-       Column('mirror', String, nullable=False))
+       Column('mirror', String, nullable=False),
+       Column('arch', String, nullable=False))

 
 machine_access_table = Table('machine_access', meta,
 
 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),
        Column('user', String, nullable=False, index=True),

-       PrimaryKeyConstraint('machine_id', 'user', ondelete='CASCADE'))
+       PrimaryKeyConstraint('machine_id', 'user'))

 
 class Machine(object):
     def __repr__(self):
 
 class Machine(object):
     def __repr__(self):

@@ -98,6 +107,10 @@ class Type(object):
     def __repr__(self):
         return "<Type %s: %s>" % (self.type_id, self.description)
 
     def __repr__(self):
         return "<Type %s: %s>" % (self.type_id, self.description)
 

+class Mirror(object):
+    def __repr__(self):
+        return "<Mirror %s>" % (self.mirror_id)
+

 class CDROM(object):
     def __repr__(self):
         return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
 class CDROM(object):
     def __repr__(self):
         return "<CDROM %s: %s>" % (self.cdrom_id, self.description)

@@ -107,22 +120,21 @@ class Autoinstall(object):
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
 session.mapper(Machine, machine_table,
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
 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"),
+                          'disks': relation(Disk, backref="machine"),
+                          'type': relation(Type),
+                          'acl': relation(MachineAccess, backref="machine", passive_deletes=True, cascade="all, delete-orphan")});

 session.mapper(MachineAccess, machine_access_table)
 session.mapper(NIC, nic_table)
 session.mapper(Disk, disk_table)
 session.mapper(Type, types_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(Mirror, mirrors_table)
+session.mapper(CDROM, cdroms_table,
+               properties={'mirror': relation(Mirror, backref="cdroms")})

 session.mapper(Autoinstall, autoinstalls_table)
 
 def clear_cache():
 session.mapper(Autoinstall, autoinstalls_table)
 
 def clear_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?"""
+    """Clear sqlalchemy's cache
+    """

 
 

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