Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Merge pull request #2556 from Lartza/fix-setup-pgsql-quotes 

Quote database and role in queries
pull/2571/head
Robin Appelman 10 years ago
committed by GitHub
parent
ce707912b4 9ebd5d5bb2
commit
880121d310
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      lib/private/Setup/PostgreSQL.php

8
lib/private/Setup/PostgreSQL.php
View File

@ -111,7 +111,7 @@ class PostgreSQL extends AbstractDatabase {
private function createDatabase(IDBConnection $connection) { private function createDatabase(IDBConnection $connection) {
if (!$this->databaseExists($connection)) { if (!$this->databaseExists($connection)) {
//The database does not exists... let's create it //The database does not exists... let's create it
$query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser));
$query = $connection->prepare("CREATE DATABASE \"" . addslashes($this->dbName) . "\" OWNER '" . addslashes($this->dbUser) . "'");
try { try {
$query->execute(); $query->execute();
} catch (DatabaseException $e) { } catch (DatabaseException $e) {
@ -119,7 +119,7 @@ class PostgreSQL extends AbstractDatabase {
$this->logger->logException($e); $this->logger->logException($e);
} }
} else { } else {
$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE \"" . addslashes($this->dbName) . "\" FROM PUBLIC");
try { try {
$query->execute(); $query->execute();
} catch (DatabaseException $e) { } catch (DatabaseException $e) {
@ -153,10 +153,10 @@ class PostgreSQL extends AbstractDatabase {
try { try {
if ($this->userExists($connection)) { if ($this->userExists($connection)) {
// change the password // change the password
$query = $connection->prepare("ALTER ROLE " . addslashes($this->dbUser) . " WITH CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
$query = $connection->prepare("ALTER ROLE \"" . addslashes($this->dbUser) . "\" WITH CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
} else { } else {
// create the user // 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(); $query->execute();
} catch (DatabaseException $e) { } catch (DatabaseException $e) {

Write Preview
Loading…
Cancel
Save