From a7404409a8376e7db9f295e5cf598ccee59523b5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 19 Nov 2012 13:49:04 +0100
Subject: [ticket/11219] Add unit test for inserting into a sequence column

PHPBB3-11219
---
 tests/dbal/write_sequence_test.php | 55 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 tests/dbal/write_sequence_test.php

(limited to 'tests/dbal/write_sequence_test.php')

diff --git a/tests/dbal/write_sequence_test.php b/tests/dbal/write_sequence_test.php
new file mode 100644
index 0000000000..d2c30b4e89
--- /dev/null
+++ b/tests/dbal/write_sequence_test.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_dbal_write_sequence_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
+	}
+
+	static public function write_sequence_data()
+	{
+		return array(
+			array(
+				'ticket/11219',
+				4,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider write_sequence_data
+	*/
+	public function test_write_sequence($username, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'INSERT INTO phpbb_users ' . $db->sql_build_array('INSERT', array(
+			'username'			=> $username,
+			'username_clean'	=> $username,
+			'user_permissions'	=> '',
+			'user_sig'			=> '',
+			'user_occ'			=> '',
+			'user_interests'	=> '',
+		));
+		$db->sql_query($sql);
+
+		$this->assertEquals($expected, $db->sql_nextid());
+
+		$sql = "SELECT user_id
+			FROM phpbb_users
+			WHERE username_clean = '" . $db->sql_escape($username) . "'";
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals($expected, $db->sql_fetchfield('user_id'));
+	}
+}
-- 
cgit v1.2.1


From dbb54b217b4d0c0669a566f9c950e8331887d276 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Wed, 5 Dec 2012 22:57:06 -0600
Subject: [ticket/11219] Coding guidelines and naming consistency changes

PHPBB3-11219
---
 tests/dbal/write_sequence_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/dbal/write_sequence_test.php')

diff --git a/tests/dbal/write_sequence_test.php b/tests/dbal/write_sequence_test.php
index d2c30b4e89..8975cfbfb1 100644
--- a/tests/dbal/write_sequence_test.php
+++ b/tests/dbal/write_sequence_test.php
@@ -13,7 +13,7 @@ class phpbb_dbal_write_sequence_test extends phpbb_database_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/three_users.xml');
 	}
 
 	static public function write_sequence_data()
-- 
cgit v1.2.1


From 5b368dd53a2da6ab481bc608176f442dc067c4a7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 7 Dec 2012 15:32:06 -0500
Subject: [ticket/11255] Fix dbal write sequence test to run standalone.

PHPBB3-11255
---
 tests/dbal/write_sequence_test.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests/dbal/write_sequence_test.php')

diff --git a/tests/dbal/write_sequence_test.php b/tests/dbal/write_sequence_test.php
index 8975cfbfb1..f382a971a5 100644
--- a/tests/dbal/write_sequence_test.php
+++ b/tests/dbal/write_sequence_test.php
@@ -33,6 +33,10 @@ class phpbb_dbal_write_sequence_test extends phpbb_database_test_case
 	{
 		$db = $this->new_dbal();
 
+		// dbal uses cache
+		global $cache;
+		$cache = new phpbb_mock_cache();
+
 		$sql = 'INSERT INTO phpbb_users ' . $db->sql_build_array('INSERT', array(
 			'username'			=> $username,
 			'username_clean'	=> $username,
-- 
cgit v1.2.1