From 4d187ce1d7ebaa8bc26055e6e85796dc39386e8e Mon Sep 17 00:00:00 2001 From: Vitor Mattos Date: Sun, 21 Apr 2019 16:54:40 -0300 Subject: Check if database exists and grand permission Signed-off-by: Vitor Mattos --- lib/private/Setup/PostgreSQL.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/private/Setup') diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index 23c5ec73929..9bd4e57f60f 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -154,8 +154,10 @@ class PostgreSQL extends AbstractDatabase { // create the user $query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'"); $query->execute(); - $query = $connection->prepare('GRANT CONNECT ON DATABASE ' . $this->dbName . ' TO '.addslashes($this->dbUser)); - $query->execute(); + if ($this->databaseExists($connection)) { + $query = $connection->prepare('GRANT CONNECT ON DATABASE ' . $this->dbName . ' TO '.addslashes($this->dbUser)); + $query->execute(); + } } catch (DatabaseException $e) { $this->logger->error('Error while trying to create database user'); $this->logger->logException($e); -- cgit v1.2.3