X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2FTicketSystem.pm;h=fa54e0bbd8ecb6af6d2e87b27bf07f92938d346b;hb=a180208786cccb72ab017e39fff0cb128aa6ba01;hp=3aeadb37f3285318155816f8b3e0764f2d078e7f;hpb=7a51c5cf922048cf1478920b3fec496e0bb26aef;p=freeside.git

diff --git a/FS/FS/TicketSystem.pm b/FS/FS/TicketSystem.pm
index 3aeadb37f..fa54e0bbd 100644
--- a/FS/FS/TicketSystem.pm
+++ b/FS/FS/TicketSystem.pm
@@ -342,10 +342,20 @@ sub _upgrade_data {
     or die $dbh->errstr;
   $cve_2013_3373_sth->execute or die $cve_2013_3373_sth->errstr;
 
-  # fix null WillResolve fields to avoid spurious transactions the 
-  # first time they get updated
-  my $fix_null_sql = "UPDATE Tickets SET WillResolve = '1970-01-01 00:00:00' WHERE WillResolve IS NULL";
-  $dbh->do($fix_null_sql) or die $dbh->errstr;
+  # Remove dangling customer links, if any
+  my %target_pkey = ('cust_main' => 'custnum', 'cust_svc' => 'svcnum');
+  for my $table (keys %target_pkey) {
+    my $pkey = $target_pkey{$table};
+    my $rows = $dbh->do(
+      "DELETE FROM links WHERE id IN(".
+        "SELECT links.id FROM links LEFT JOIN $table ON (links.target = ".
+        "'freeside://freeside/$table/' || $table.$pkey) ".
+        "WHERE links.target like 'freeside://freeside/$table/%' ".
+        "AND $table.$pkey IS NULL".
+      ")"
+    ) or die $dbh->errstr;
+    warn "Removed $rows dangling ticket-$table links\n" if $rows > 0;
+  }
 
   return;
 }