From: Greg Price Date: Wed, 1 Oct 2008 23:48:39 +0000 (-0400) Subject: more sqlalchemy-0.4 changes X-Git-Tag: sipb-xen-database/10.25^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/d120007286dc6ad3b08afbfdadc5faa23108098a more sqlalchemy-0.4 changes svn path=/trunk/packages/sipb-xen-database/; revision=991 --- diff --git a/debian/changelog b/debian/changelog index abde326..2d99c31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ sipb-xen-database (10.25) unstable; urgency=low * add remote and console to pg_hba.conf template * fix init script so it works + * port more code to sqlalchemy 0.4 -- Greg Price Wed, 01 Oct 2008 19:30:26 -0400 diff --git a/python/database/__init__.py b/python/database/__init__.py index 5eeb3c5..258c4d4 100644 --- a/python/database/__init__.py +++ b/python/database/__init__.py @@ -4,4 +4,6 @@ import sqlalchemy def connect(uri = config.db.uri): """ Connect to a given database URI""" - meta.bind = sqlalchemy.create_engine(uri) + engine = sqlalchemy.create_engine(uri) + meta.bind = engine + session.configure(bind=engine) diff --git a/python/database/models.py b/python/database/models.py index 6574ff1..b91107f 100644 --- 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()) machine_table = Table('machines', meta, Column('machine_id', Integer, primary_key=True, nullable=False), @@ -105,17 +106,17 @@ class Autoinstall(object): def __repr__(self): return "" % (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. @@ -123,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?""" - ctx.registry.clear() + # XXX maybe we still need to do this, but it's not doc'd how. + #ctx.registry.clear()