[ticket/14044] Fix Sqlite error in tests

marc1706 · CHItA · commit e0d06ee83ebf · 2015-10-23T11:46:03.000+02:00
PHPBB3-14044
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php
@@ -136,7 +136,19 @@ public function sql_query($query = '', $cache_ttl = 0)
 			{
 				if (($this->query_result = @$this->dbo->query($query)) === false)
 				{
-					$this->sql_error($query);
+					// Try to recover a lost database connection
+					if ($this->dbo && !@$this->dbo->lastErrorMsg())
+					{
+						if ($this->sql_connect($this->server, $this->user, '', $this->dbname))
+						{
+							$this->query_result = @$this->dbo->query($query);
+						}
+					}
+
+					if ($this->query_result === false)
+					{
+						$this->sql_error($query);
+					}
 				}
 
 				if (defined('DEBUG'))
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
@@ -1478,10 +1478,7 @@ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_
 				$this->db->sql_return_on_error(false);
 			}
 			unset($new_words, $sql_ary);
-		}
-		else
-		{
-			$this->db->sql_transaction('begin');
+			$this->db->sql_transaction('commit');
 		}
 
 		// now update the search match table, remove links to removed words and add links to new words
@@ -1513,6 +1510,11 @@ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_
 			}
 		}
 
+		if (!count($unique_add_words))
+		{
+			$this->db->sql_transaction('begin');
+		}
+
 		$this->db->sql_return_on_error(true);
 		foreach ($words['add'] as $word_in => $word_ary)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1478,10 +1478,7 @@ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_`
`1478`	`1478`	`$this->db->sql_return_on_error(false);`
`1479`	`1479`	`}`
`1480`	`1480`	`unset($new_words, $sql_ary);`
`1481`		`- }`
`1482`		`- else`
`1483`		`- {`
`1484`		`- $this->db->sql_transaction('begin');`
	`1481`	`+ $this->db->sql_transaction('commit');`
`1485`	`1482`	`}`
`1486`	`1483`
`1487`	`1484`	`// now update the search match table, remove links to removed words and add links to new words`
`@@ -1513,6 +1510,11 @@ public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_`
`1513`	`1510`	`}`
`1514`	`1511`	`}`
`1515`	`1512`
	`1513`	`+ if (!count($unique_add_words))`
	`1514`	`+ {`
	`1515`	`+ $this->db->sql_transaction('begin');`
	`1516`	`+ }`
	`1517`	`+`
`1516`	`1518`	`$this->db->sql_return_on_error(true);`
`1517`	`1519`	`foreach ($words['add'] as $word_in => $word_ary)`
`1518`	`1520`	`{`