Changeset 592 for trunk

Timestamp:

Jun 6, 2008, 12:25:15 PM (16 years ago)

Author:

ecprice

Message:

Specify ON DELETE CASCADE, use cascade= instead of deprecated
private=.

File:

• trunk/packages/sipb-xen-database/sipb_xen_database/models.py (modified) (2 diffs)

trunk/packages/sipb-xen-database/sipb_xen_database/models.py

@@ -70 +70 @@
        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):
@@ -104 +104 @@
                           '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)