Skip to content

Commit e81ab60

Browse files
committed
Fix support for SQLite
1 parent eb206cf commit e81ab60

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

includes/qi_functions.php

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -543,13 +543,30 @@ function get_db_doctrine()
543543
{
544544
global $settings;
545545

546+
$dbms = $settings->get_config('dbms');
547+
$dbhost = $settings->get_config('dbhost');
548+
$dbuser = $settings->get_config('dbuser');
549+
$dbpasswd = $settings->get_config('dbpasswd');
550+
$dbname = $settings->get_config('dbname');
551+
$dbport = $settings->get_config('dbport');
552+
$db_prefix = $settings->get_config('db_prefix');
553+
554+
// We need the db prefix to be prepended to the database name
555+
$dbname = $db_prefix . $dbname;
556+
557+
// SQLite needs the dbname appended to the dbhost
558+
if (in_array($dbms, array('sqlite', 'sqlite3')))
559+
{
560+
$dbhost .= $dbname;
561+
}
562+
546563
return \phpbb\db\doctrine\connection_factory::get_connection_from_params(
547-
$settings->get_config('dbms'),
548-
$settings->get_config('dbhost'),
549-
$settings->get_config('dbuser'),
550-
$settings->get_config('dbpasswd'),
551-
$settings->get_config('db_prefix') . $settings->get_config('dbname'),
552-
$settings->get_config('dbport')
564+
$dbms,
565+
$dbhost,
566+
$dbuser,
567+
$dbpasswd,
568+
$dbname,
569+
$dbport
553570
);
554571
}
555572

0 commit comments

Comments
 (0)