From c169a901ab18df5825ff700b651eeb9ed0601c81 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 29 Sep 2009 13:58:33 -0700
Subject: [PATCH] Get rid of old subscription tables.  Fixes bug #11062

---
 docs/changelog/7.x.x.txt             |  1 +
 docs/upgrades/upgrade_7.8.0-7.8.1.pl | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a428a401b..9df705d0e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -20,6 +20,7 @@
  - fixed #11001: Shipping plugin returning nothing, causing price formatter to puke
  - fixed #11059: WebGUI upgrade packages do not overwrite versions in the db
  - fixed #11064: spelling error
+ - fixed #11062: subscriptionCode
 
 7.8.0
  - upgraded YUI to 2.8.0r4
diff --git a/docs/upgrades/upgrade_7.8.0-7.8.1.pl b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
index c23afb95f..4694c4dec 100644
--- a/docs/upgrades/upgrade_7.8.0-7.8.1.pl
+++ b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
@@ -32,6 +32,7 @@ my $session = start(); # this line required
 
 fixWikis( $session );
 fixEMSTemplates( $session );
+removeOldSubscriptionTables( $session );
 
 finish($session); # this line required
 
@@ -45,6 +46,16 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+# Describe what our function does
+sub removeOldSubscriptionTables {
+    my $session = shift;
+    print "\tRemoving tables leftover from the old 7.5 Commerce System... " unless $quiet;
+    $session->db->write('DROP TABLE IF EXISTS subscriptionCode');
+    $session->db->write('DROP TABLE IF EXISTS subscriptionCodeBatch');
+    $session->db->write('DROP TABLE IF EXISTS subscriptionCodeSubscriptions');
+    print "Done.\n" unless $quiet;
+}
+
 # Describe what our function does
 sub fixWikis {
     my $session = shift;