From: Senhua Huang <senhuang@cisco.com>
Date: Fri, 15 Mar 2013 02:05:38 +0000 (-0700)
Subject: Adds delete-orphan to database deletion.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=377f78fa55988a92674bd940130ff8d15f3ec521;p=openstack-build%2Fneutron-build.git

Adds delete-orphan to database deletion.

Change-Id: I3570c812c042365e68eef3b5463899afa85eb9fd
Fixes: bug #1096549
---

diff --git a/quantum/db/models_v2.py b/quantum/db/models_v2.py
index 6fa0f84d8..4d5a838b8 100644
--- a/quantum/db/models_v2.py
+++ b/quantum/db/models_v2.py
@@ -145,10 +145,10 @@ class Subnet(model_base.BASEV2, HasId, HasTenant):
     enable_dhcp = sa.Column(sa.Boolean())
     dns_nameservers = orm.relationship(DNSNameServer,
                                        backref='subnet',
-                                       cascade='delete')
+                                       cascade='all, delete, delete-orphan')
     routes = orm.relationship(SubnetRoute,
                               backref='subnet',
-                              cascade='delete')
+                              cascade='all, delete, delete-orphan')
     shared = sa.Column(sa.Boolean)