from invirt.database import record
+# Compatibility hack from
+# http://www.sqlalchemy.org/trac/wiki/UsageRecipes/SessionAwareMapper
+from sqlalchemy.orm import mapper as sqla_mapper
+
+def session_mapper(scoped_session):
+ def mapper(cls, *arg, **kw):
+ if cls.__init__ is object.__init__:
+ def __init__(self, **kwargs):
+ for key, value in kwargs.items():
+ setattr(self, key, value)
+ scoped_session.add(self)
+ cls.__init__ = __init__
+ cls.query = scoped_session.query_property()
+ return sqla_mapper(cls, *arg, **kw)
+ return mapper
+
+
__all__ = ['meta',
'session',
'clear_cache',
]
meta = ThreadLocalMetaData()
-session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=False))
+session = orm.scoped_session(orm.sessionmaker(autocommit=True, autoflush=False))
machine_table = Table('machines', meta,
Column('machine_id', Integer, primary_key=True, nullable=False),
nic_table = Table('nics', meta,
Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),
Column('mac_addr', String, nullable=False, primary_key=True),
+ Column('nic_type', String, nullable=False, default="pcnet"),
Column('ip', String, nullable=False, unique=True),
Column('hostname', String, nullable=True),
Column('reusable', Boolean, nullable=False, default=True))
_identity_field = 'build_id'
from invirt.database.owner import Owner
-
-session.mapper(Machine, machine_table,
- 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(Mirror, mirrors_table)
-session.mapper(CDROM, cdroms_table,
- properties={'mirror': relation(Mirror, backref="cdroms")})
-session.mapper(Autoinstall, autoinstalls_table)
-session.mapper(Owner, owners_table)
-session.mapper(Admin, admins_table)
-session.mapper(Build, builds_table)
+mapper = session_mapper(session)
+
+mapper(Machine, machine_table,
+ 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")});
+mapper(MachineAccess, machine_access_table)
+mapper(NIC, nic_table)
+mapper(Disk, disk_table)
+mapper(Type, types_table)
+mapper(Mirror, mirrors_table)
+mapper(CDROM, cdroms_table,
+ properties={'mirror': relation(Mirror, backref="cdroms")})
+mapper(Autoinstall, autoinstalls_table)
+mapper(Owner, owners_table)
+mapper(Admin, admins_table)
+mapper(Build, builds_table)
def clear_cache():
"""Clear sqlalchemy's cache
"""
- session.clear()
+ session.expunge_all()