From c24b0ab8c374db8716d2672bd94fb0247b67ea75 Mon Sep 17 00:00:00 2001 From: Arnold Bechtoldt Date: Thu, 8 Mar 2012 16:12:19 +0100 Subject: [PATCH] Use 'IF EXISTS' when dropping tables in some old upgrade files, fixes #1034 --- .../updates/froxlor/0.9/update_0.9.inc.php | 22 +++++++++---------- .../syscp/1.0/update_1.0.10_1.2-beta1.inc.php | 4 ++-- 2 files changed, 13 insertions(+), 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 index 939b3d33c..ca0236fc4 100644 --- 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 index d6c378629..75d38a046 100644 --- 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'; } -?> \ No newline at end of file +?>