From 4f667a4f3a6264e3f472fbdb382d53f2c96d6489 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 9 Sep 2013 00:32:44 +0100
Subject: [PATCH] also delete manual topo on device delete

---
 Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
index f6a43046..5c1d0f91 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -551,7 +551,7 @@ sub delete {
     DeviceModule
   /) {
       $schema->resultset($set)->search(
-        { ip => { '-in' => $devices->as_query }},
+        { ip => { '-in' => $devices->as_query } },
       )->delete;
   }
 
@@ -560,8 +560,15 @@ sub delete {
     action => { '-like' => 'queued%' },
   })->delete;
 
+  $schema->resultset('Topology')->search({
+    -or => [
+      { dev1 => { '-in' => $devices->as_query } },
+      { dev2 => { '-in' => $devices->as_query } },
+    ],
+  })->delete;
+
   $schema->resultset('DevicePort')->search(
-    { ip => { '-in' => $devices->as_query }},
+    { ip => { '-in' => $devices->as_query } },
   )->delete(@_);
 
   # now let DBIC do its thing