From a21cb089146583304d290d67c2403a8e0328ae07 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 13 Dec 2024 15:12:48 -0500 Subject: [PATCH] DB Structure Update: Add Fax to location, Delete Vendor Contacts tables decided to merge vendor contacts and conacts as one table as contacts table already had a reference to vendor_id --- database_updates.php | 14 +++++++++++--- database_version.php | 2 +- db.sql | 28 ++-------------------------- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/database_updates.php b/database_updates.php index 7881074a..0b5925cc 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2368,10 +2368,18 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.2'"); } - // if (CURRENT_DATABASE_VERSION == '1.7.2') { - // // Insert queries here required to update to DB version 1.7.3 + if (CURRENT_DATABASE_VERSION == '1.7.2') { + mysqli_query($mysqli, "ALTER TABLE `locations` ADD `location_fax` VARCHAR(200) DEFAULT NULL AFTER `location_phone`"); + + mysqli_query($mysqli, "DROP TABLE `vendor_contacts`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.3'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.7.3') { + // // Insert queries here required to update to DB version 1.7.4 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.3'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.4'"); // } } else { diff --git a/database_version.php b/database_version.php index 78e1fdd2..d959034c 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.7.2"); +DEFINE("LATEST_DATABASE_VERSION", "1.7.3"); diff --git a/db.sql b/db.sql index 03f740e2..3675dc53 100644 --- a/db.sql +++ b/db.sql @@ -920,6 +920,7 @@ CREATE TABLE `locations` ( `location_state` varchar(200) DEFAULT NULL, `location_zip` varchar(200) DEFAULT NULL, `location_phone` varchar(200) DEFAULT NULL, + `location_fax` varchar(200) DEFAULT NULL, `location_hours` varchar(200) DEFAULT NULL, `location_photo` varchar(200) DEFAULT NULL, `location_primary` tinyint(1) NOT NULL DEFAULT 0, @@ -2182,31 +2183,6 @@ CREATE TABLE `users` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `vendor_contacts` --- - -DROP TABLE IF EXISTS `vendor_contacts`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `vendor_contacts` ( - `vendor_contact_id` int(11) NOT NULL AUTO_INCREMENT, - `vendor_contact_name` varchar(200) NOT NULL, - `vendor_contact_title` varchar(200) DEFAULT NULL, - `vendor_contact_department` varchar(200) DEFAULT NULL, - `vendor_contact_email` varchar(200) DEFAULT NULL, - `vendor_contact_phone` varchar(200) DEFAULT NULL, - `vendor_contact_extension` varchar(200) DEFAULT NULL, - `vendor_contact_mobile` varchar(200) DEFAULT NULL, - `vendor_contact_notes` text DEFAULT NULL, - `vendor_contact_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `vendor_contact_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `vendor_contact_archived_at` datetime DEFAULT NULL, - `vendor_contact_vendor_id` int(11) NOT NULL DEFAULT 0, - PRIMARY KEY (`vendor_contact_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `vendor_documents` -- @@ -2290,4 +2266,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-12-10 22:05:33 +-- Dump completed on 2024-12-13 15:11:31