use pdo for postgres setup #381
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,42 +26,34 @@ | |
| */ | ||
| namespace OC\Setup; | ||
|
|
||
| use OC\DatabaseException; | ||
| use OC\DB\QueryBuilder\Literal; | ||
| use OCP\IDBConnection; | ||
|
|
||
| class PostgreSQL extends AbstractDatabase { | ||
| public $dbprettyname = 'PostgreSQL'; | ||
|
|
||
| public function setupDatabase($username) { | ||
| $connection = $this->connect([ | ||
| 'dbname' => 'postgres' | ||
| ]); | ||
| //check for roles creation rights in postgresql | ||
| $builder = $connection->getQueryBuilder(); | ||
| $builder->automaticTablePrefix(false); | ||
| $query = $builder | ||
| ->select('rolname') | ||
| ->from('pg_roles') | ||
| ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE'))) | ||
| ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser))); | ||
|
|
||
| try { | ||
| $result = $query->execute(); | ||
| $canCreateRoles = $result->rowCount() > 0; | ||
| } catch (DatabaseException $e) { | ||
| $canCreateRoles = false; | ||
| } | ||
|
|
||
| if($canCreateRoles) { | ||
| //use the admin login data for the new database user | ||
|
|
||
| //add prefix to the postgresql user name to prevent collisions | ||
|
|
@@ -72,106 +64,93 @@ public function setupDatabase($username) { | |
| $this->createDBUser($connection); | ||
| } | ||
|
|
||
| $systemConfig = $this->config->getSystemConfig(); | ||
| $systemConfig->setValues([ | ||
| 'dbuser' => $this->dbUser, | ||
| 'dbpassword' => $this->dbPassword, | ||
| ]); | ||
|
|
||
| //create the database | ||
| $this->createDatabase($connection); | ||
| $query = $connection->prepare("select count(*) FROM pg_class WHERE relname=? limit 1"); | ||
| $query->execute([$this->tablePrefix . "users"]); | ||
| $tablesSetup = $query->fetchColumn() > 0; | ||
|
|
||
| // the connection to dbname=postgres is not needed anymore | ||
| $connection->close(); | ||
|
|
||
| // connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled | ||
| $this->dbUser = $systemConfig->getValue('dbuser'); | ||
| $this->dbPassword = $systemConfig->getValue('dbpassword'); | ||
| $connection = $this->connect(); | ||
| try { | ||
| $connection->connect(); | ||
| } catch (\Exception $e) { | ||
| $this->logger->logException($e); | ||
| throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'), | ||
| $this->trans->t('You need to enter either an existing account or the administrator.')); | ||
| } | ||
|
|
||
|
|
||
| if(!$tablesSetup) { | ||
| \OC_DB::createDbFromStructure($this->dbDefinitionFile); | ||
| } | ||
| } | ||
|
|
||
| private function createDatabase(IDBConnection $connection) { | ||
| if(!$this->databaseExists($connection)) { | ||
| //The database does not exists... let's create it | ||
| $query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser)); | ||
| try { | ||
| $query->execute(); | ||
| } catch (DatabaseException $e) { | ||
| $this->logger->error('Error while trying to create database'); | ||
| $this->logger->logException($e); | ||
| } | ||
| } else { | ||
| $query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC"); | ||
| try { | ||
| $query->execute(); | ||
| } catch (DatabaseException $e) { | ||
| $this->logger->error('Error while trying to restrict database permissions'); | ||
| $this->logger->logException($e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private function userExists(IDBConnection $connection) { | ||
| $builder = $connection->getQueryBuilder(); | ||
| $builder->automaticTablePrefix(false); | ||
| $query = $builder->select('*') | ||
| ->from('pg_roles') | ||
| ->where($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser))); | ||
| $result = $query->execute(); | ||
| return $result->rowCount() > 0; | ||
| } | ||
|
|
||
| private function databaseExists(IDBConnection $connection) { | ||
| $builder = $connection->getQueryBuilder(); | ||
| $builder->automaticTablePrefix(false); | ||
| $query = $builder->select('datname') | ||
| ->from('pg_database') | ||
| ->where($builder->expr()->eq('datname', $builder->createNamedParameter($this->dbName))); | ||
| $result = $query->execute(); | ||
| return $result->rowCount() > 0; | ||
| } | ||
|
|
||
| private function createDBUser(IDBConnection $connection) { | ||
| try { | ||
| if ($this->userExists($connection, $this->dbUser)) { | ||
| // change the password | ||
| $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)); | ||
|
There was a problem hiding this comment. This broke the tests on my app: The https://travis-ci.org/nextcloud/announcementcenter/jobs/145487372 |
||
| } | ||
| $query->execute(); | ||
| } catch (DatabaseException $e) { | ||
| $this->logger->error('Error while trying to create database user'); | ||
| $this->logger->logException($e); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😰 why? just use the methods from above?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The connectionfactory wants a systemconfig instance
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then mark
@internalat least pleaseThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not exposed in the public interface
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mmmm Maybe we should change the connectionfactory at some point then.