Skip to content

bugzilla
bugzilla
Commit 24ba85e2 authored by dave%intrec.com's avatar dave%intrec.com
Browse files
Options

Fix for bug 16454: can now run checksetup.pl on databases with passwords.

parent ff85006b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
checksetup.pl
View file @ 24ba85e2
...@@ -502,10 +502,12 @@ my $drh = DBI->install_driver($db_base) ...@@ -502,10 +502,12 @@ my $drh = DBI->install_driver($db_base)
if ($db_check) { if ($db_check) {
# Do we have the database itself? # Do we have the database itself?
my @databases = $drh->func($db_host, $db_port, '_ListDBs'); my $dsn = "DBI:$db_base:$db_name;$db_host;$db_port";
my $dbh = DBI->connect($dsn, $db_user, $db_pass);
my @databases = $dbh->func('_ListDBs');
unless (grep /^$db_name$/, @databases) { unless (grep /^$db_name$/, @databases) {
print "Creating database $db_name ...\n"; print "Creating database $db_name ...\n";
$drh->func('createdb', $db_name, 'admin') $drh->func('createdb', $db_name, "$db_host:$db_port", $db_user, $db_pass, 'admin')
or die <<"EOF" or die <<"EOF"
The '$db_name' database is not accessible. This might have several reasons: The '$db_name' database is not accessible. This might have several reasons:
...@@ -518,6 +520,7 @@ The '$db_name' database is not accessible. This might have several reasons: ...@@ -518,6 +520,7 @@ The '$db_name' database is not accessible. This might have several reasons:
'\$db_check' to zero.\n '\$db_check' to zero.\n
EOF EOF
} }
$dbh->disconnect if $dbh;
} }
# now get a handle to the database: # now get a handle to the database:
......
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