From 217c191a1ba3ac03b847d261a32e19975380fcad Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 11 May 2015 22:42:41 +0200
Subject: More SQLite compatibility

Additional changes to add compatibility with SQLite for the new
hash/lastSeen mode of updating articles.
---
 lib/Minz/ModelPdo.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/Minz/ModelPdo.php')

diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index ac7a1bed7..3e8ec1f43 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -134,4 +134,9 @@ class MinzPDO extends PDO {
 		MinzPDO::check($statement);
 		return parent::exec($statement);
 	}
+
+	public function query($statement) {
+		MinzPDO::check($statement);
+		return parent::query($statement);
+	}
 }
-- 
cgit v1.2.3


From 568ab2313d5a922e06d7f0c33b3e39dd152d43db Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 3 Jun 2015 22:07:25 +0200
Subject: PDO options for e.g. SSL

https://github.com/FreshRSS/FreshRSS/issues/868
---
 data/config.default.php |  3 +++
 lib/Minz/ModelPdo.php   | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib/Minz/ModelPdo.php')

diff --git a/data/config.default.php b/data/config.default.php
index 80d331df7..7c179c8a0 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -99,6 +99,9 @@ return array(
 		# MySQL table prefix.
 		'prefix' => '',
 
+		'pdo_options' => array(
+		),
+
 	),
 
 	# List of enabled FreshRSS extensions.
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 3e8ec1f43..e82c1f30a 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -53,21 +53,19 @@ class Minz_ModelPdo {
 		$this->current_user = $currentUser;
 		self::$sharedCurrentUser = $currentUser;
 
+		$driver_options = is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
+
 		try {
 			$type = $db['type'];
 			if ($type === 'mysql') {
 				$string = 'mysql:host=' . $db['host']
 				        . ';dbname=' . $db['base']
 				        . ';charset=utf8';
-				$driver_options = array(
-					PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
-				);
+				$driver_options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8';
 				$this->prefix = $db['prefix'] . $currentUser . '_';
 			} elseif ($type === 'sqlite') {
 				$string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite');
-				$driver_options = array(
-					//PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-				);
+				//$driver_options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_EXCEPTION;
 				$this->prefix = '';
 			} else {
 				throw new Minz_PDOConnectionException(
-- 
cgit v1.2.3


From 9b512b82e2e65c6ca18199ed328de2645a7bc84e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 3 Jun 2015 22:17:40 +0200
Subject: PDO config isset

https://github.com/FreshRSS/FreshRSS/issues/868
---
 lib/Minz/ModelPdo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/Minz/ModelPdo.php')

diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index e82c1f30a..25999f02b 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -53,7 +53,7 @@ class Minz_ModelPdo {
 		$this->current_user = $currentUser;
 		self::$sharedCurrentUser = $currentUser;
 
-		$driver_options = is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
+		$driver_options = isset($conf->db['pdo_options']) && is_array($conf->db['pdo_options']) ? $conf->db['pdo_options'] : array();
 
 		try {
 			$type = $db['type'];
-- 
cgit v1.2.3