Merge pull request #2 from bechtoldt/ticket1034

Use 'IF EXISTS' when dropping tables, fixes #1034
froxlor · Mar 8, 2012 · 45a3e85 · 45a3e85
2 parents 77615e7 + c24b0ab
commit 45a3e85
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -53,17 +53,17 @@
 	define('TABLE_BILLING_TAXCLASSES', 'billing_taxclasses');
 	define('TABLE_BILLING_TAXRATES', 'billing_taxrates');
 
-	$db->query("DROP TABLE  `" . TABLE_BILLING_SERVICE_CATEGORIES . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_SERVICE_DOMAINS_TEMPLATES . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_SERVICE_OTHER . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_SERVICE_OTHER_TEMPLATES . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_TAXCLASSES . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_TAXRATES . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_INVOICES . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_INVOICES_ADMINS . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_INVOICE_CHANGES . "`;");
-	$db->query("DROP TABLE  `" . TABLE_BILLING_INVOICE_CHANGES_ADMINS . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_SERVICE_CATEGORIES . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_SERVICE_DOMAINS_TEMPLATES . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_SERVICE_OTHER . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_SERVICE_OTHER_TEMPLATES . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_TAXCLASSES . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_TAXRATES . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_INVOICES . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_INVOICES_ADMINS . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_INVOICE_CHANGES . "`;");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_BILLING_INVOICE_CHANGES_ADMINS . "`;");
 
 	/*
 	 * update panel_domains, panel_customers, panel_admins

diff --git a/install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php b/install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php
@@ -31,7 +31,7 @@
 {
 	// Drop/Rename postfix_ tables
 
-	$db->query("DROP TABLE `" . TABLE_POSTFIX_TRANSPORT . "`");
+	$db->query("DROP TABLE IF EXISTS `" . TABLE_POSTFIX_TRANSPORT . "`");
 	$db->query("ALTER TABLE `" . TABLE_POSTFIX_USERS . "` RENAME `" . TABLE_MAIL_USERS . "` ");
 	$db->query("ALTER TABLE `" . TABLE_POSTFIX_VIRTUAL . "` RENAME `" . TABLE_MAIL_VIRTUAL . "` ");
 
@@ -79,4 +79,4 @@
 	$settings['panel']['version'] = '1.2.0';
 }
 
-?>
+?>