Bug 557536: checksetup.pl fails on ALTER DATABASE if database name contains hyphen...

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index ae158e0f68148df02c1d43365846c47cdad99e8c..ef983ce556eb5b9c2839eb971cbc1628af2dacc5 100644 (file)
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -839,7 +839,7 @@ sub _fix_defaults {
 sub _alter_db_charset_to_utf8 {
     my $self = shift;
     my $db_name = Bugzilla->localconfig->{db_name};
-    $self->do("ALTER DATABASE $db_name CHARACTER SET utf8"); 
+    $self->do("ALTER DATABASE `$db_name` CHARACTER SET utf8"); 
 }
 
 sub bz_db_is_utf8 {

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 0698585bb361b63ad077bf1d05c5d7660c699cbd..d340cf03d9ed09dee834a7c9985bee48a1600d38 100644 (file)
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -2205,7 +2205,7 @@ sub get_table_indexes_abstract {
 
 sub get_create_database_sql {
     my ($self, $name) = @_;
-    return ("CREATE DATABASE $name");
+    return ("CREATE DATABASE \"$name\"");
 }
 
 sub get_table_ddl {

diff --git a/Bugzilla/DB/Schema/Mysql.pm b/Bugzilla/DB/Schema/Mysql.pm
index 0195fcb06c06b273c6bf2719e65b62824454580a..1dc408654e99dc8621adda9d7787ec6daa7a30b9 100644 (file)
--- a/Bugzilla/DB/Schema/Mysql.pm
+++ b/Bugzilla/DB/Schema/Mysql.pm
@@ -153,7 +153,7 @@ sub get_create_database_sql {
     my $create_utf8 = Bugzilla->params->{'utf8'} 
                       || !defined Bugzilla->params->{'utf8'};
     my $charset = $create_utf8 ? "CHARACTER SET utf8" : '';
-    return ("CREATE DATABASE $name $charset");
+    return ("CREATE DATABASE `$name` $charset");
 }
 
 # MySQL has a simpler ALTER TABLE syntax than ANSI.

diff --git a/Bugzilla/DB/Schema/Pg.pm b/Bugzilla/DB/Schema/Pg.pm
index 55a93227282eaf3e0ed5f2e0e79151cd1f7291ac..03a3b0a486851e8b88b4b7f31a102ae3ce7c8ab6 100644 (file)
--- a/Bugzilla/DB/Schema/Pg.pm
+++ b/Bugzilla/DB/Schema/Pg.pm
@@ -84,7 +84,7 @@ sub get_create_database_sql {
     my $create_utf8 = Bugzilla->params->{'utf8'}
                       || !defined Bugzilla->params->{'utf8'};
     my $charset = $create_utf8 ? "ENCODING 'UTF8' TEMPLATE template0" : '';
-    return ("CREATE DATABASE $name $charset");
+    return ("CREATE DATABASE \"$name\" $charset");
 }
 
 sub get_rename_column_ddl {