From c9cb6e8b05e007305888f244807abda14632205e Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 6 Sep 2022 17:13:24 +0200 Subject: [PATCH] Sales group query error in mysql 8. groups is a reserved word. Fixed --- includes/ui/ui_lists.inc | 2 +- sales/includes/db/sales_groups_db.inc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index a15d4573..45253e32 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -1345,7 +1345,7 @@ function sales_areas_list_row($label, $name, $selected_id=null, $special_option= function sales_groups_list($name, $selected_id=null, $special_option=false) { - $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups"; + $sql = "SELECT id, description, inactive FROM `".TB_PREF."groups`"; return combo_input($name, $selected_id, $sql, 'id', 'description', array( 'spec_option' => $special_option===true ? ' ' : $special_option, 'order' => 'description', 'spec_id' => 0, diff --git a/sales/includes/db/sales_groups_db.inc b/sales/includes/db/sales_groups_db.inc index 6f926d7e..61fbcdc5 100644 --- a/sales/includes/db/sales_groups_db.inc +++ b/sales/includes/db/sales_groups_db.inc @@ -12,25 +12,25 @@ function add_sales_group($description) { - $sql = "INSERT INTO ".TB_PREF."groups (description) VALUES (".db_escape($description) . ")"; + $sql = "INSERT INTO `".TB_PREF."groups` (description) VALUES (".db_escape($description) . ")"; db_query($sql,"The sales group could not be added"); } function update_sales_group($selected_id, $description) { - $sql = "UPDATE ".TB_PREF."groups SET description=".db_escape($description)." WHERE id = ".db_escape($selected_id); + $sql = "UPDATE `".TB_PREF."groups` SET description=".db_escape($description)." WHERE id = ".db_escape($selected_id); db_query($sql,"The sales group could not be updated"); } function delete_sales_group($selected_id) { - $sql="DELETE FROM ".TB_PREF."groups WHERE id=".db_escape($selected_id); + $sql="DELETE FROM `".TB_PREF."groups` WHERE id=".db_escape($selected_id); db_query($sql,"could not delete sales group"); } function get_sales_groups($show_inactive) { - $sql = "SELECT * FROM ".TB_PREF."groups"; + $sql = "SELECT * FROM `".TB_PREF."groups`"; if (!$show_inactive) $sql .= " WHERE !inactive"; $sql .= " ORDER BY description"; return db_query($sql,"could not get groups"); @@ -38,7 +38,7 @@ function get_sales_groups($show_inactive) function get_sales_group($selected_id) { - $sql = "SELECT * FROM ".TB_PREF."groups WHERE id=".db_escape($selected_id); + $sql = "SELECT * FROM `".TB_PREF."groups` WHERE id=".db_escape($selected_id); $result = db_query($sql,"could not get group"); return db_fetch($result); @@ -46,7 +46,7 @@ function get_sales_group($selected_id) function get_sales_group_name($group_no) { - $sql = "SELECT description FROM ".TB_PREF."groups WHERE id = ".db_escape($group_no); + $sql = "SELECT description FROM `".TB_PREF."groups` WHERE id = ".db_escape($group_no); $result = db_query($sql, "could not get group"); $row = db_fetch($result); return is_array($row) ? $row[0] : false; -- 2.30.2