sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3684 from owncloud/pg_install_db_master 

Try connection with specified db when postgres does not work
remotes/origin/stable6
Morris Jobke 2013-06-14 02:50:01 +07:00
parent 27f7ef49e4 7093b0829f
commit 8d62bb3aab
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/setup.php
Unescape Escape View File

@ -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