Merge pull request #431 from nextcloud/postgres-password-not-quoted

Prevent syntax error when creating user or changing password
nextcloud · Jul 18, 2016 · 3e00edf · 3e00edf
2 parents 89a32a2 + 9781312
commit 3e00edf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
@@ -140,12 +140,12 @@ private function databaseExists(IDBConnection $connection) {
 
 	private function createDBUser(IDBConnection $connection) {
 		try {
-			if ($this->userExists($connection, $this->dbUser)) {
+			if ($this->userExists($connection)) {
 				// change the password
-				$query = $connection->prepare("ALTER ROLE " . addslashes($this->dbUser) . " CREATEDB WITH PASSWORD " . addslashes($this->dbPassword));
+				$query = $connection->prepare("ALTER ROLE " . addslashes($this->dbUser) . " CREATEDB WITH PASSWORD '" . addslashes($this->dbPassword) . "'");
 			} else {
 				// create the user
-				$query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD " . addslashes($this->dbPassword));
+				$query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
 			}
 			$query->execute();
 		} catch (DatabaseException $e) {