3 files changed, 26 insertions, 2 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 148f56b5a8..82fd03b5f3 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -246,7 +246,7 @@ class dbal
 	*
 	* @return bool Whether buffering is required.
 	*/
-	function sql_buffer_nested_transaction()
+	function sql_buffer_nested_transactions()
 	{
 		return false;
 	}
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 710a054e5f..2287bc716e 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -261,7 +261,7 @@ class dbal_mssqlnative extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_buffer_nested_transaction()
+	function sql_buffer_nested_transactions()
 	{
 		return true;
 	}
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 533416f14b..e0d08d9306 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -8,6 +8,7 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_dbal_select_test extends phpbb_database_test_case
 {
@@ -317,4 +318,27 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 
 		$db->sql_freeresult($result);
 	}
+
+	function test_nested_transactions()
+	{
+		$db = $this->new_dbal();
+
+		// nested transactions should work on systems that do not require
+		// buffering of nested transactions, so ignore the ones that need
+		// buffering
+		if ($db->sql_buffer_nested_transactions())
+		{
+			return;
+		}
+
+		$sql = 'SELECT user_id FROM phpbb_users ORDER BY user_id ASC';
+		$result1 = $db->sql_query($sql);
+
+		$db->sql_transaction('begin');
+		$result2 = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result2);
+		$db->sql_transaction('commit');
+
+		$this->assertEquals('1', $row['user_id']);
+	}
 }