Commit 6fbfafbb authored by Max Kanat-Alexander's avatar Max Kanat-Alexander

The changes to bz_create_database done by the SQLite patch broke the

creation of databases on other systems. This restores the original behavior while still retaining the correct error-throwing behavior for systems that can't create a SQLite database. https://bugzilla.mozilla.org/show_bug.cgi?id=337776
parent 3f3cc3c9
......@@ -232,7 +232,7 @@ EOT
sub bz_create_database {
my $dbh;
# See if we can connect to the actual Bugzilla database.
my $conn_success = $dbh = connect_main();
my $conn_success = eval { $dbh = connect_main() };
my $db_name = Bugzilla->localconfig->{db_name};
if (!$conn_success) {
......
......@@ -64,6 +64,15 @@ sub _initialize {
}
sub get_create_database_sql {
# If we get here, it means there was some error creating the
# database file during bz_create_database in Bugzilla::DB,
# and we just want to display that error instead of doing
# anything else.
Bugzilla->dbh;
die "Reached an unreachable point";
}
sub get_type_ddl {
my $self = shift;
my $def = dclone($_[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment