external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix DB.class.php to match config and include SQLite support

Browse source 
In commit baf8a22 (git-interface: Support SQLite as database backend,
2016-08-03), conf/config.proto was changed so that dsn_prefix was
changed to backend and this fixes this in web/lib/DB.class.php.

Since SQLite's dsn is different, this adds a check of which backend is
desired and will quit if MySQL or SQLite are not the backend selected.
SQLite2 may be supported, but is untested and will trigger an error if
used.

Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Mark Weiman 2016-11-09 18:54:38 -05:00 • committed by Lukas Fleischer
parent 3e442a0f7d
commit 6502518d4e
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
web/lib/DB.class.php
View file

@ -17,20 +17,30 @@ class DB {
public static function connect() { public static function connect() {
if (self::$dbh === null) { if (self::$dbh === null) {
try { try {
$dsn_prefix = config_get('database', 'dsn_prefix'); $backend = config_get('database', 'backend');
$host = config_get('database', 'host'); $host = config_get('database', 'host');
$socket = config_get('database', 'socket'); $socket = config_get('database', 'socket');
$name = config_get('database', 'name'); $name = config_get('database', 'name');
$user = config_get('database', 'user'); $user = config_get('database', 'user');
$password = config_get('database', 'password'); $password = config_get('database', 'password');
$dsn = $dsn_prefix . if ($backend == "mysql") {
':host=' . $host . $dsn = $backend .
';unix_socket=' . $socket . ':host=' . $host .
';dbname=' . $name; ';unix_socket=' . $socket .
';dbname=' . $name;
self::$dbh = new PDO($dsn, $user, $password);
self::$dbh->exec("SET NAMES 'utf8' COLLATE 'utf8_general_ci';");
} else if ($backend == "sqlite") {
$dsn = $backend .
":" . $name;
self::$dbh = new PDO($dsn, null, null);
} else {
die("Error - " . $backend . " is not supported by aurweb");
}
self::$dbh = new PDO($dsn, $user, $password);
self::$dbh->exec("SET NAMES 'utf8' COLLATE 'utf8_general_ci';");
} catch (PDOException $e) { } catch (PDOException $e) {
die('Error - Could not connect to AUR database'); die('Error - Could not connect to AUR database');
} }