From fb710d6c6da3335d3d7871c05bbce9325a207cc5 Mon Sep 17 00:00:00 2001
From: Dave Miller <justdave@bugzilla.org>
Date: Sat, 29 Jun 2024 22:16:28 -0400
Subject: [PATCH] Bug 1898161: fix utf8-conversion on MySQL 8 (#193)

---
 Bugzilla/DB/MariaDB.pm | 2 +-
 Bugzilla/DB/Mysql.pm   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/DB/MariaDB.pm b/Bugzilla/DB/MariaDB.pm
index 29cfe4033e..b600e84d21 100644
--- a/Bugzilla/DB/MariaDB.pm
+++ b/Bugzilla/DB/MariaDB.pm
@@ -725,7 +725,7 @@ sub bz_setup_database {
     print
       "Converting table storage format to $charset (collate $collate). This may take a while.\n";
     foreach my $table ($self->bz_table_list_real) {
-      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM $table");
+      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM " . $self->quote_identifier($table));
       $info_sth->execute();
       my (@binary_sql, @utf8_sql);
       while (my $column = $info_sth->fetchrow_hashref) {
diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index e6422389c2..96a64ee803 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -725,7 +725,7 @@ sub bz_setup_database {
     print
       "Converting table storage format to $charset (collate $collate). This may take a while.\n";
     foreach my $table ($self->bz_table_list_real) {
-      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM $table");
+      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM " . $self->quote_identifier($table));
       $info_sth->execute();
       my (@binary_sql, @utf8_sql);
       while (my $column = $info_sth->fetchrow_hashref) {
-- 
2.47.3