Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix PostgreSQL install #2735

Merged
merged 4 commits into from
Dec 30, 2019
Merged

Fix PostgreSQL install #2735

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b7807d
Fix PostgreSQL install
Alkarex Dec 28, 2019
ac5dcc9
Add more comments
Alkarex Dec 29, 2019
eca5d44
Merge branch 'master' into fix_postgresql_install
Alkarex Dec 29, 2019
8804ad1
Merge branch 'master' into fix_postgresql_install
Alkarex Dec 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/lib_install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ function initDb() {
if ($db['type'] !== 'sqlite') {
Minz_ModelPdo::$usesSharedPdo = false;
$dbBase = isset($db['base']) ? $db['base'] : '';
$db['base'] = '';
//Use default database for PostgreSQL, empty database for MySQL / MariaDB:
$db['base'] = $db['type'] === 'pgsql' ? 'postgres' : '';
Alkarex marked this conversation as resolved.
Show resolved Hide resolved
$conf->db = $db;
//First connection without database name to create the database
$databaseDAO = FreshRSS_Factory::createDatabaseDAO();
Expand Down