mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-27 13:38:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix PostgreSQL install (#2735)

Browse Source 
* Fix PostgreSQL install

Fix https://github.com/FreshRSS/FreshRSS/issues/2732
When username is different from database name

* Add more comments

https://github.com/FreshRSS/FreshRSS/pull/2735/files/2b7807d1b3fdd0dc34538faad465934fb737fa3a#r361846714
This commit is contained in:
Alexandre Alapetite authored and GitHub committed 2019-12-30 13:17:09 +01:00
1 parent 03ddcf0772
commit 94db40a742
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
lib/lib_install.php
+5 -1
View File
@@ -87,15 +87,19 @@ function initDb() {
$db['pdo_options'][PDO::ATTR_ERRMODE] = PDO::ERRMODE_EXCEPTION;
$conf->db = $db; //TODO: Remove this Minz limitation "Indirect modification of overloaded property"
//Attempt to auto-create database if it does not already exist
if ($db['type'] !== 'sqlite') {
Minz_ModelPdo::$usesSharedPdo = false;
$dbBase = isset($db['base']) ? $db['base'] : '';
$db['base'] = '';
//For first connection, use default database for PostgreSQL, empty database for MySQL / MariaDB:
$db['base'] = $db['type'] === 'pgsql' ? 'postgres' : '';
$conf->db = $db;
//First connection without database name to create the database
$databaseDAO = FreshRSS_Factory::createDatabaseDAO();
//Restore final database parameters for auto-creation and for future connections
$db['base'] = $dbBase;
$conf->db = $db;
//Perfom database auto-creation
$databaseDAO->create();
}