From: Dave Miller <justdave@bugzilla.org>
Date: Sun, 30 Jun 2024 02:16:28 +0000 (-0400)
Subject: Bug 1898161: fix utf8-conversion on MySQL 8 (#193)
X-Git-Tag: bugzilla-5.2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb710d6c6da3335d3d7871c05bbce9325a207cc5;p=thirdparty%2Fbugzilla.git

Bug 1898161: fix utf8-conversion on MySQL 8 (#193)
---

diff --git a/Bugzilla/DB/MariaDB.pm b/Bugzilla/DB/MariaDB.pm
index 29cfe4033..b600e84d2 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 e6422389c..96a64ee80 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) {