From 75b14b4f6fcf9a9bb5f810655d8e753b48a04689 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 25 Feb 2023 15:27:23 -0500 Subject: [PATCH] Update to change the client tag to singular as it references one record the table name should remain plural --- database_updates.php | 12 ++++++++++-- database_version.php | 2 +- db.sql | 12 ++++++------ post.php | 10 +++++----- ticket.php | 2 +- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/database_updates.php b/database_updates.php index 6c071eca..04b5b8ad 100644 --- a/database_updates.php +++ b/database_updates.php @@ -869,11 +869,19 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.4.4'"); } - //if (CURRENT_DATABASE_VERSION == '0.4.4') { + if (CURRENT_DATABASE_VERSION == '0.4.4') { // Insert queries here required to update to DB version 0.4.5 + mysqli_query($mysqli, "ALTER TABLE `client_tags` CHANGE `client_tags_client_id` `client_tag_client_id` INT NOT NULL"); + mysqli_query($mysqli, "ALTER TABLE `client_tags` CHANGE `client_tags_tag_id` `client_tag_tag_id` INT NOT NULL"); + // Then, update the database to the next sequential version + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.4.5'"); + } + + //if (CURRENT_DATABASE_VERSION == '0.4.5') { + // Insert queries here required to update to DB version 0.4.6 // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.4.5'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.4.6'"); //} } else { diff --git a/database_version.php b/database_version.php index 4878f60e..5bb6c5c4 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", "0.4.4"); +DEFINE("LATEST_DATABASE_VERSION", "0.4.5"); diff --git a/db.sql b/db.sql index 5b885ae9..e3b3dd42 100644 --- a/db.sql +++ b/db.sql @@ -1,8 +1,8 @@ --- MariaDB dump 10.19 Distrib 10.5.18-MariaDB, for debian-linux-gnu (x86_64) +-- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: itflow_dev -- ------------------------------------------------------ --- Server version 10.5.18-MariaDB-1:10.5.18+maria~ubu2004 +-- Server version 10.5.19-MariaDB-1:10.5.19+maria~ubu2004 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -207,9 +207,9 @@ DROP TABLE IF EXISTS `client_tags`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `client_tags` ( - `client_tags_client_id` int(11) NOT NULL, - `client_tags_tag_id` int(11) NOT NULL, - PRIMARY KEY (`client_tags_client_id`,`client_tags_tag_id`) + `client_tag_client_id` int(11) NOT NULL, + `client_tag_tag_id` int(11) NOT NULL, + PRIMARY KEY (`client_tag_client_id`,`client_tag_tag_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1538,4 +1538,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-02-09 14:35:51 +-- Dump completed on 2023-02-25 15:25:59 diff --git a/post.php b/post.php index e583a8b8..545b4441 100644 --- a/post.php +++ b/post.php @@ -674,7 +674,7 @@ if(isset($_GET['delete_company'])){ $sql = mysqli_query($mysqli,"SELECT client_id FROM clients WHERE company_id = $company_id"); while($row = mysqli_fetch_array($sql)){ $client_id = $row['client_id']; - mysqli_query($mysqli,"DELETE FROM client_tags WHERE client_tags_client_id = $client_id"); + mysqli_query($mysqli,"DELETE FROM client_tags WHERE client_tag_client_id = $client_id"); mysqli_query($mysqli,"DELETE FROM shared_items WHERE item_client_id = $client_id"); } mysqli_query($mysqli,"DELETE FROM clients WHERE company_id = $company_id"); @@ -1835,7 +1835,7 @@ if(isset($_POST['add_client'])){ if(isset($_POST['tags'])){ foreach($_POST['tags'] as $tag){ $tag = intval($tag); - mysqli_query($mysqli,"INSERT INTO client_tags SET client_tags_client_id = $client_id, client_tags_tag_id = $tag"); + mysqli_query($mysqli,"INSERT INTO client_tags SET client_tag_client_id = $client_id, client_tag_tag_id = $tag"); } } @@ -1897,12 +1897,12 @@ if(isset($_POST['edit_client'])){ //Tags //Delete existing tags - mysqli_query($mysqli,"DELETE FROM client_tags WHERE client_tags_client_id = $client_id"); + mysqli_query($mysqli,"DELETE FROM client_tags WHERE client_tag_client_id = $client_id"); //Add new tags foreach($_POST['tags'] as $tag){ $tag = intval($tag); - mysqli_query($mysqli,"INSERT INTO client_tags SET client_tags_client_id = $client_id, client_tags_tag_id = $tag"); + mysqli_query($mysqli,"INSERT INTO client_tags SET client_tag_client_id = $client_id, client_tag_tag_id = $tag"); } //Logging @@ -1972,7 +1972,7 @@ if(isset($_GET['delete_client'])){ mysqli_query($mysqli,"DELETE FROM api_keys WHERE api_key_client_id = $client_id"); mysqli_query($mysqli,"DELETE FROM assets WHERE asset_client_id = $client_id"); mysqli_query($mysqli,"DELETE FROM certificates WHERE certificate_client_id = $client_id"); - mysqli_query($mysqli,"DELETE FROM client_tags WHERE client_tags_client_id = $client_id"); + mysqli_query($mysqli,"DELETE FROM client_tags WHERE client_tag_client_id = $client_id"); mysqli_query($mysqli,"DELETE FROM contacts WHERE contact_client_id = $client_id"); mysqli_query($mysqli,"DELETE FROM documents WHERE document_client_id = $client_id"); diff --git a/ticket.php b/ticket.php index 004c45d6..4ce9d702 100644 --- a/ticket.php +++ b/ticket.php @@ -141,7 +141,7 @@ if (isset($_GET['ticket_id'])) { //Client Tags $client_tag_name_display_array = array(); $client_tag_id_array = array(); - $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.client_tags_tag_id = tags.tag_id WHERE client_tags.client_tags_client_id = $client_id"); + $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.client_tag_tag_id = tags.tag_id WHERE client_tags.client_tag_client_id = $client_id"); while ($row = mysqli_fetch_array($sql_client_tags)) { $client_tag_id = intval($row['tag_id']);