From 21ae7dea8b3aeb6ab8dbf6fe9426de56735f5d92 Mon Sep 17 00:00:00 2001 From: Eric Price Date: Fri, 6 Jun 2008 12:25:15 -0400 Subject: [PATCH] Specify ON DELETE CASCADE, use cascade= instead of deprecated private=. svn path=/trunk/packages/sipb-xen-database/; revision=592 --- sipb_xen_database/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sipb_xen_database/models.py b/sipb_xen_database/models.py index d3f1f6d..1d8b83f 100644 --- a/sipb_xen_database/models.py +++ b/sipb_xen_database/models.py @@ -69,7 +69,7 @@ autoinstalls_table = Table('autoinstalls', meta, machine_access_table = Table('machine_access', meta, Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False, index=True), Column('user', String, nullable=False, index=True), - PrimaryKeyConstraint('machine_id', 'user')) + PrimaryKeyConstraint('machine_id', 'user', ondelete='CASCADE')) class Machine(object): def __repr__(self): @@ -103,7 +103,7 @@ assign_mapper(ctx, 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, private=True)}); + '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) -- 1.7.9.5