Merge pull request #3684 from owncloud/pg_install_db_master
Try connection with specified db when postgres does not work
This commit is contained in:
commit
8d62bb3aab
|
@ -320,7 +320,13 @@ class OC_Setup {
|
|||
$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
|
||||
$connection = @pg_connect($connection_string);
|
||||
if(!$connection) {
|
||||
throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
|
||||
// Try if we can connect to the DB with the specified name
|
||||
$e_dbname = addslashes($dbname);
|
||||
$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
|
||||
$connection = @pg_connect($connection_string);
|
||||
|
||||
if(!$connection)
|
||||
throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
|
||||
}
|
||||
$e_user = pg_escape_string($dbuser);
|
||||
//check for roles creation rights in postgresql
|
||||
|
|
Loading…
Reference in New Issue