From f9297edde8595d891448732158f4c70ef08161a7 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 7 May 2008 20:41:28 +0000
Subject: [PATCH] clean up the old Commerce tables, and close a statement
 handle

---
 docs/upgrades/upgrade_7.5.10-7.5.11.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/upgrades/upgrade_7.5.10-7.5.11.pl b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
index bfdf12492..8eccde38e 100644
--- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl
+++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
@@ -821,6 +821,7 @@ sub mergeProductsWithCommerce {
                 $options->{$row{optionId}} = $option;
             }
         }
+        $parameterSth->finish;
 
         ##Get the variants
         $variantSth->execute([$productData->{productId}]);
@@ -847,13 +848,14 @@ sub mergeProductsWithCommerce {
     $productSth->finish;
     $variantSth->finish;
     ##Clean up tables
-    #$session->db->write('drop table products');
-    #$session->db->write('drop table productParameters');
-    #$session->db->write('drop table productParameterOptionss');
-    #$session->db->write('drop table productVariants');
+    $session->db->write('drop table products');
+    $session->db->write('drop table productParameters');
+    $session->db->write('drop table productParameterOptionss');
+    $session->db->write('drop table productVariants');
     ##Remove old code
     #unlink '../../lib/WebGUI/Product.pm';
     #unlink '../../lib/WebGUI/Operation/ProductManager.pm';
+    #unlink '../../lib/WebGUI/Macro/Product.pm';
     return 1;
 }