From 2032b48ad3320af3d9654e213256dc4e14c3d221 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 31 Mar 2025 12:06:36 -0400 Subject: [PATCH] DB Update Set Country codes to default to NULL and not 1 Nullify all current country codes --- database_updates.php | 39 ++++++++++++++++++++++++++++++++--- db.sql | 14 ++++++------- includes/database_version.php | 2 +- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/database_updates.php b/database_updates.php index 1cc29ceb..3a7a593e 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3424,10 +3424,43 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.2'"); } - // if (CURRENT_DATABASE_VERSION == '2.1.2') { - // // Insert queries here required to update to DB version 2.1.3 + if (CURRENT_DATABASE_VERSION == '2.1.2') { + + // Update country_code to NULL for `contacts` table + mysqli_query($mysqli, "ALTER TABLE `contacts` MODIFY `contact_phone_country_code` VARCHAR(10) DEFAULT NULL"); + mysqli_query($mysqli, "ALTER TABLE `contacts` MODIFY `contact_mobile_country_code` VARCHAR(10) DEFAULT NULL"); + + // Update country_code to NULL for `locations` table + mysqli_query($mysqli, "ALTER TABLE `locations` MODIFY `location_phone_country_code` VARCHAR(10) DEFAULT NULL"); + mysqli_query($mysqli, "ALTER TABLE `locations` MODIFY `location_fax_country_code` VARCHAR(10) DEFAULT NULL"); + + // Update country_code to NULL for `vendors` table + mysqli_query($mysqli, "ALTER TABLE `vendors` MODIFY `vendor_phone_country_code` VARCHAR(10) DEFAULT NULL"); + + // Update country_code to NULL for `companies` table + mysqli_query($mysqli, "ALTER TABLE `companies` MODIFY `company_phone_country_code` VARCHAR(10) DEFAULT NULL"); + + // Set country_code to NULL for `contacts` table + mysqli_query($mysqli, "UPDATE `contacts` SET `contact_phone_country_code` = NULL"); + mysqli_query($mysqli, "UPDATE `contacts` SET `contact_mobile_country_code` = NULL"); + + // Set country_code to NULL for `locations` table + mysqli_query($mysqli, "UPDATE `locations` SET `location_phone_country_code` = NULL"); + mysqli_query($mysqli, "UPDATE `locations` SET `location_fax_country_code` = NULL"); + + // Set country_code to NULL for `vendors` table + mysqli_query($mysqli, "UPDATE `vendors` SET `vendor_phone_country_code` = NULL"); + + // Set country_code to NULL for `companies` table + mysqli_query($mysqli, "UPDATE `companies` SET `company_phone_country_code` = NULL"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.3'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.1.3') { + // // Insert queries here required to update to DB version 2.1.4 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.3'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.4'"); // } } else { diff --git a/db.sql b/db.sql index 4a4f9959..bfb82256 100644 --- a/db.sql +++ b/db.sql @@ -546,7 +546,7 @@ CREATE TABLE `companies` ( `company_state` varchar(200) DEFAULT NULL, `company_zip` varchar(200) DEFAULT NULL, `company_country` varchar(200) DEFAULT NULL, - `company_phone_country_code` varchar(10) DEFAULT '1', + `company_phone_country_code` varchar(10) DEFAULT NULL, `company_phone` varchar(200) DEFAULT NULL, `company_email` varchar(200) DEFAULT NULL, `company_website` varchar(200) DEFAULT NULL, @@ -680,10 +680,10 @@ CREATE TABLE `contacts` ( `contact_name` varchar(200) NOT NULL, `contact_title` varchar(200) DEFAULT NULL, `contact_email` varchar(200) DEFAULT NULL, - `contact_phone_country_code` varchar(10) DEFAULT '1', + `contact_phone_country_code` varchar(10) DEFAULT NULL, `contact_phone` varchar(200) DEFAULT NULL, `contact_extension` varchar(200) DEFAULT NULL, - `contact_mobile_country_code` varchar(10) DEFAULT '1', + `contact_mobile_country_code` varchar(10) DEFAULT NULL, `contact_mobile` varchar(200) DEFAULT NULL, `contact_photo` varchar(200) DEFAULT NULL, `contact_pin` varchar(255) DEFAULT NULL, @@ -1115,10 +1115,10 @@ CREATE TABLE `locations` ( `location_city` varchar(200) DEFAULT NULL, `location_state` varchar(200) DEFAULT NULL, `location_zip` varchar(200) DEFAULT NULL, - `location_phone_country_code` varchar(10) DEFAULT '1', + `location_phone_country_code` varchar(10) DEFAULT NULL, `location_phone` varchar(200) DEFAULT NULL, `location_phone_extension` varchar(10) DEFAULT NULL, - `location_fax_country_code` varchar(10) DEFAULT '1', + `location_fax_country_code` varchar(10) DEFAULT NULL, `location_fax` varchar(200) DEFAULT NULL, `location_hours` varchar(200) DEFAULT NULL, `location_photo` varchar(200) DEFAULT NULL, @@ -2468,7 +2468,7 @@ CREATE TABLE `vendors` ( `vendor_name` varchar(200) NOT NULL, `vendor_description` varchar(200) DEFAULT NULL, `vendor_contact_name` varchar(200) DEFAULT NULL, - `vendor_phone_country_code` varchar(10) DEFAULT '1', + `vendor_phone_country_code` varchar(10) DEFAULT NULL, `vendor_phone` varchar(200) DEFAULT NULL, `vendor_extension` varchar(200) DEFAULT NULL, `vendor_email` varchar(200) DEFAULT NULL, @@ -2498,4 +2498,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-03-29 18:16:21 +-- Dump completed on 2025-03-31 12:05:41 diff --git a/includes/database_version.php b/includes/database_version.php index 021f1386..66ba4bf3 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.1.2"); +DEFINE("LATEST_DATABASE_VERSION", "2.1.3");