From 83ee85c7dcc21c13b371d67eb41286857200357a Mon Sep 17 00:00:00 2001 From: Benjamin Southall Date: Tue, 26 Feb 2019 11:02:40 +1000 Subject: [PATCH] Add preliminary support for other types of databases (e.g PostgreSQL) in database wrapper, by changing hardcoded mysql settings to feature flag --- inc/database.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/inc/database.php b/inc/database.php index 84a050f2..9fe303a4 100644 --- a/inc/database.php +++ b/inc/database.php @@ -69,19 +69,23 @@ function sql_open() { try { $options = array( PDO::ATTR_TIMEOUT => $config['db']['timeout'], - PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true ); + + if ($config['db']['type'] == "mysql") + $options[PDO::MYSQL_ATTR_USE_BUFFERED_QUERY] = true; + if ($config['db']['persistent']) $options[PDO::ATTR_PERSISTENT] = true; $pdo = new PDO($dsn, $config['db']['user'], $config['db']['password'], $options); if ($config['debug']) $debug['time']['db_connect'] = '~' . round((microtime(true) - $start) * 1000, 2) . 'ms'; - - if (mysql_version() >= 50503) - query('SET NAMES utf8mb4') or error(db_error()); - else - query('SET NAMES utf8') or error(db_error()); + if ($config['db']['type'] == "mysql"){ + if (mysql_version() >= 50503) + query('SET NAMES utf8mb4') or error(db_error()); + else + query('SET NAMES utf8') or error(db_error()); + } return $pdo; } catch(PDOException $e) { $message = $e->getMessage();