From 025a95ea909d449e14cb22564983fb005e3f8c06 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 9 Mar 2011 21:50:45 -0500
Subject: [ticket/10205] Account for potentially missing extensions in dbal.

PHPBB3-10205
---
 phpBB/includes/db/sqlite.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/db/sqlite.php')

diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 8de72fd394..be0ad4fc8f 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -25,6 +25,8 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 */
 class dbal_sqlite extends dbal
 {
+	var $connect_error = '';
+
 	/**
 	* Connect to server
 	*/
@@ -36,7 +38,24 @@ class dbal_sqlite extends dbal
 		$this->dbname = $database;
 
 		$error = '';
-		$this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0666, $error) : @sqlite_open($this->server, 0666, $error);
+		if ($this->persistency)
+		{
+			if (!function_exists('sqlite_popen'))
+			{
+				$this->connect_error = 'sqlite_popen function does not exist, is sqlite extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @sqlite_popen($this->server, 0666, $error);
+		}
+		else
+		{
+			if (!function_exists('sqlite_open'))
+			{
+				$this->connect_error = 'sqlite_open function does not exist, is sqlite extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @sqlite_open($this->server, 0666, $error);
+		}
 
 		if ($this->db_connect_id)
 		{
-- 
cgit v1.2.1


From 9f549e8249acbd82b68e961a6e0a31de47d9ca32 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:50:41 -0500
Subject: [ticket/10205] Fix remaining db drivers.

PHPBB3-10205
---
 phpBB/includes/db/sqlite.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/db/sqlite.php')

diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index be0ad4fc8f..3c9b2cce34 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -300,10 +300,20 @@ class dbal_sqlite extends dbal
 	*/
 	function _sql_error()
 	{
-		return array(
-			'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
-			'code'		=> @sqlite_last_error($this->db_connect_id)
-		);
+		if (function_exists('sqlite_error_string'))
+		{
+			return array(
+				'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
+				'code'		=> @sqlite_last_error($this->db_connect_id)
+			);
+		}
+		else
+		{
+			return array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
+		}
 	}
 
 	/**
-- 
cgit v1.2.1


From 89c9c9d4b0daa7308fd015e8a6fca6386a8b8016 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:22:33 -0500
Subject: [ticket/10205] Cosmetic changes.

PHPBB3-10205
---
 phpBB/includes/db/sqlite.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/db/sqlite.php')

diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 3c9b2cce34..199b4eed23 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -304,7 +304,7 @@ class dbal_sqlite extends dbal
 		{
 			return array(
 				'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
-				'code'		=> @sqlite_last_error($this->db_connect_id)
+				'code'		=> @sqlite_last_error($this->db_connect_id),
 			);
 		}
 		else
-- 
cgit v1.2.1


From 597dea1e047b94f0a862f7f6e650771ffc780141 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:32:02 -0500
Subject: [ticket/10205] Rewrite _sql_error implementations to have a single
 return.

PHPBB3-10205
---
 phpBB/includes/db/sqlite.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/db/sqlite.php')

diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 199b4eed23..557b057cce 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -302,18 +302,20 @@ class dbal_sqlite extends dbal
 	{
 		if (function_exists('sqlite_error_string'))
 		{
-			return array(
+			$error = array(
 				'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
 				'code'		=> @sqlite_last_error($this->db_connect_id),
 			);
 		}
 		else
 		{
-			return array(
+			$error = array(
 				'message'	=> $this->connect_error,
 				'code'		=> '',
 			);
 		}
+
+		return $error;
 	}
 
 	/**
-- 
cgit v1.2.1