Merge commit 'release-3.0.8'

* commit 'release-3.0.8': (393 commits) [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP. [ticket/9509] Fix a typo and wrong period placement [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode. [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes. [ticket/9140] Check current board version in incremental update packages [ticket/9891] Updater drops language-selection after database-update [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1 [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20 [ticket/9886] Update fails on PostgreSQL because of an error in _add_module [ticket/9888] Update fails when Bing [Bot] was already added to the users table [develop-olympus] Bumping version number for 3.0.8-RC1. [ticket/9885] Fix extension group name updater. Loop through all languages. [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'. [ticket/9883] Change an American English spelling to British English. [task/phing-build] Correct the path for update package patch files. [ticket/9880] Change "antibot" to "anti-spambot". [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir. ...
author: Nils Adermann <naderman@naderman.de> 2010-11-20 17:00:05 +0100
committer: Nils Adermann <naderman@naderman.de> 2010-11-20 17:00:05 +0100
commit: 7f21a5f46156660d7ea6a4bdb59166ac553e2be8 (patch)
tree: 3963b4075f58c43ffc01fe290b04a800668bc53c /tests/dbal
parent: c4e02a191628b4b9f7b6340f2876607663baeb5a (diff)
parent: af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f (diff)
download: forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar
forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar.gz
forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar.bz2
forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar.xz
forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.zip
5 files changed, 572 insertions, 0 deletions
diff --git a/tests/dbal/all_tests.php b/tests/dbal/all_tests.php
new file mode 100644
index 0000000000..cfa8176246
--- /dev/null
+++ b/tests/dbal/all_tests.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('PHPUnit_MAIN_METHOD'))
+{
+	define('PHPUnit_MAIN_METHOD', 'phpbb_dbal_all_tests::main');
+}
+
+require_once 'test_framework/framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+require_once 'dbal/select.php';
+require_once 'dbal/write.php';
+
+class phpbb_dbal_all_tests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new PHPUnit_Framework_TestSuite('phpBB Database Abstraction Layer');
+
+		$suite->addTestSuite('phpbb_dbal_select_test');
+		$suite->addTestSuite('phpbb_dbal_write_test');
+
+		return $suite;
+	}
+}
+
+if (PHPUnit_MAIN_METHOD == 'phpbb_dbal_all_tests::main')
+{
+	phpbb_dbal_all_tests::main();
+}
diff --git a/tests/dbal/fixtures/config.xml b/tests/dbal/fixtures/config.xml
new file mode 100644
index 0000000000..019f582a91
--- /dev/null
+++ b/tests/dbal/fixtures/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_config">
+		<column>config_name</column>
+		<column>config_value</column>
+		<column>is_dynamic</column>
+		<row>
+			<value>config1</value>
+			<value>foo</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>config2</value>
+			<value>bar</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/dbal/fixtures/three_users.xml b/tests/dbal/fixtures/three_users.xml
new file mode 100644
index 0000000000..a6789f4a01
--- /dev/null
+++ b/tests/dbal/fixtures/three_users.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<row>
+			<value>1</value>
+			<value>barfoo</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>foobar</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>bertie</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/dbal/select.php b/tests/dbal/select.php
new file mode 100644
index 0000000000..70f27549d2
--- /dev/null
+++ b/tests/dbal/select.php
@@ -0,0 +1,321 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/functions.php';
+
+class phpbb_dbal_select_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
+	}
+
+	public static function return_on_error_select_data()
+	{
+		return array(
+			array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
+			array('phpbb_users', 'username_clean syntax_error', false),
+		);
+	}
+
+	/**
+	* @dataProvider return_on_error_select_data
+	*/
+	public function test_return_on_error_select($table, $where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$db->sql_return_on_error(true);
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM ' . $table . '
+			WHERE ' . $where . '
+			ORDER BY user_id ASC');
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public static function fetchrow_data()
+	{
+		return array(
+			array('', array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array('user_id = 2', array(array('username_clean' => 'foobar'))),
+			array("username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
+			array("username_clean = 'phpBB'", array()),
+		);
+	}
+
+	/**
+	* @dataProvider fetchrow_data
+	*/
+	public function test_fetchrow($where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$ary = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$ary[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $ary);
+	}
+
+	/**
+	* @dataProvider fetchrow_data
+	*/
+	public function test_fetchrowset($where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function fetchfield_data()
+	{
+		return array(
+			array('', array('barfoo', 'foobar', 'bertie')),
+			array('user_id = 2', array('foobar')),
+		);
+	}
+
+	/**
+	* @dataProvider fetchfield_data
+	*/
+	public function test_fetchfield($where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$ary = array();
+		while ($row = $db->sql_fetchfield('username_clean'))
+		{
+			$ary[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $ary);
+	}
+
+	public static function query_limit_data()
+	{
+		return array(
+			array(0, 0, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array(0, 1, array(array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array(1, 0, array(array('username_clean' => 'barfoo'))),
+			array(1, 2, array(array('username_clean' => 'bertie'))),
+			array(2, 0, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array(2, 2, array(array('username_clean' => 'bertie'))),
+			array(2, 5, array()),
+			array(10, 1, array(array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array(10, 5, array()),
+		);
+	}
+
+	/**
+	* @dataProvider query_limit_data
+	*/
+	public function test_query_limit($total, $offset, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query_limit('SELECT username_clean
+			FROM phpbb_users
+			ORDER BY user_id ASC', $total, $offset);
+
+		$ary = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$ary[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $ary);
+	}
+
+	public static function like_expression_data()
+	{
+		// * = any_char; # = one_char
+		return array(
+			array('barfoo', array(array('username_clean' => 'barfoo'))),
+			array('bar', array()),
+			array('bar*', array(array('username_clean' => 'barfoo'))),
+			array('*bar*', array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('b*r', array()),
+			array('b*e', array(array('username_clean' => 'bertie'))),
+			array('#b*e', array()),
+			array('b####e', array(array('username_clean' => 'bertie'))),
+		);
+	}
+
+	/**
+	* @dataProvider like_expression_data
+	*/
+	public function test_like_expression($like_expression, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$like_expression = str_replace('*', $db->any_char, $like_expression);
+		$like_expression = str_replace('#', $db->one_char, $like_expression);
+		$where = ($like_expression) ? 'username_clean ' . $db->sql_like_expression($like_expression) : '';
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function in_set_data()
+	{
+		return array(
+			array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))),
+			array('user_id', 3, false, true, array(array('username_clean' => 'bertie'))),
+			array('user_id', 3, true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', 3, true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('username_clean', 'bertie', false, false, array(array('username_clean' => 'bertie'))),
+			array('username_clean', 'bertie', false, true, array(array('username_clean' => 'bertie'))),
+			array('username_clean', 'bertie', true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('username_clean', 'bertie', true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', array(3), false, false, array(array('username_clean' => 'bertie'))),
+			array('user_id', array(3), false, true, array(array('username_clean' => 'bertie'))),
+			array('user_id', array(3), true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', array(3), true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', array(1, 3), false, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'bertie'))),
+			array('user_id', array(1, 3), false, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'bertie'))),
+			array('user_id', array(1, 3), true, false, array(array('username_clean' => 'foobar'))),
+			array('user_id', array(1, 3), true, true, array(array('username_clean' => 'foobar'))),
+			array('username_clean', '', false, false, array()),
+			array('username_clean', '', false, true, array()),
+			array('username_clean', '', true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array('username_clean', '', true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array('user_id', array(), false, true, array()),
+			array('user_id', array(), true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+
+			// These here would throw errors and therefor $result should be false.
+			// Removing for now because SQLite accepts empty IN() syntax
+			/*array('user_id', array(), false, false, false, true),
+			array('user_id', array(), true, false, false, true),*/
+		);
+	}
+
+	/**
+	* @dataProvider in_set_data
+	*/
+	public function test_in_set($field, $array, $negate, $allow_empty_set, $expected, $catch_error = false)
+	{
+		$db = $this->new_dbal();
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(true);
+		}
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			WHERE ' . $db->sql_in_set($field, $array, $negate, $allow_empty_set) . '
+			ORDER BY user_id ASC');
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(false);
+		}
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function build_array_data()
+	{
+		return array(
+			array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))),
+			array(array('username_clean' => 'barfoo', 'user_id' => 1), array(array('username_clean' => 'barfoo'))),
+			array(array('username_clean' => 'barfoo', 'user_id' => 2), array()),
+
+			// These here would throw errors and therefor $result should be false.
+			array(array(), false, true),
+			array('no_array', false, true),
+			array(0, false, true),
+		);
+	}
+
+	/**
+	* @dataProvider build_array_data
+	*/
+	public function test_build_array($assoc_ary, $expected, $catch_error = false)
+	{
+		$db = $this->new_dbal();
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(true);
+		}
+
+		$sql = 'SELECT username_clean
+			FROM phpbb_users
+			WHERE ' . $db->sql_build_array('SELECT', $assoc_ary) . '
+			ORDER BY user_id ASC';
+		$result = $db->sql_query($sql);
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(false);
+		}
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+}
diff --git a/tests/dbal/write.php b/tests/dbal/write.php
new file mode 100644
index 0000000000..01deacda69
--- /dev/null
+++ b/tests/dbal/write.php
@@ -0,0 +1,172 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once '../phpBB/includes/functions.php';
+
+class phpbb_dbal_write_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	public static function build_array_insert_data()
+	{
+		return array(
+			array(array(
+				'config_name'	=> 'test_version',
+				'config_value'	=> '0.0.0',
+				'is_dynamic'	=> 1,
+			)),
+			array(array(
+				'config_name'	=> 'second config',
+				'config_value'	=> '10',
+				'is_dynamic'	=> 0,
+			)),
+		);
+	}
+
+	/**
+	* @dataProvider build_array_insert_data
+	*/
+	public function test_build_array_insert($sql_ary)
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary);
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT *
+			FROM phpbb_config
+			WHERE config_name = '" . $sql_ary['config_name'] . "'";
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals($sql_ary, $db->sql_fetchrow($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public function test_delete()
+	{
+		$db = $this->new_dbal();
+
+		$sql = "DELETE FROM phpbb_config
+			WHERE config_name = 'config1'";
+		$result = $db->sql_query($sql);
+
+		$sql = 'SELECT *
+			FROM phpbb_config';
+		$result = $db->sql_query($sql);
+		$rows = $db->sql_fetchrowset($result);
+		
+		$this->assertEquals(1, sizeof($rows));
+		$this->assertEquals('config2', $rows[0]['config_name']);
+
+		$db->sql_freeresult($result);
+	}
+
+	public function test_multiple_insert()
+	{
+		$db = $this->new_dbal();
+
+		// empty the table
+		$sql = 'DELETE FROM phpbb_config';
+		$db->sql_query($sql);
+
+		$batch_ary = array(
+			array(
+				'config_name'	=> 'batch one',
+				'config_value'	=> 'b1',
+				'is_dynamic'	=> 0,
+			),
+			array(
+				'config_name'	=> 'batch two',
+				'config_value'	=> 'b2',
+				'is_dynamic'	=> 1,
+			),
+		);
+
+		$result = $db->sql_multi_insert('phpbb_config', $batch_ary);
+
+		$sql = 'SELECT *
+			FROM phpbb_config
+			ORDER BY config_name ASC';
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($batch_ary, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function update_data()
+	{
+		return array(
+			array(
+				array(
+					'config_value'	=> '23',
+					'is_dynamic'	=> 0,
+				),
+				" WHERE config_name = 'config1'",
+				array(
+					array(
+						'config_name'	=> 'config1',
+						'config_value'	=> '23',
+						'is_dynamic'	=> 0,
+					),
+					array(
+						'config_name'	=> 'config2',
+						'config_value'	=> 'bar',
+						'is_dynamic'	=> 1,
+					),
+				),
+			),
+			array(
+				array(
+					'config_value'	=> '0',
+					'is_dynamic'	=> 1,
+				),
+				'',
+				array(
+					array(
+						'config_name'	=> 'config1',
+						'config_value'	=> '0',
+						'is_dynamic'	=> 1,
+					),
+					array(
+						'config_name'	=> 'config2',
+						'config_value'	=> '0',
+						'is_dynamic'	=> 1,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider update_data
+	*/
+	public function test_update($sql_ary, $where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'UPDATE phpbb_config
+			SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where;
+		$result = $db->sql_query($sql);
+
+		$sql = 'SELECT *
+			FROM phpbb_config
+			ORDER BY config_name ASC';
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+}
author	Nils Adermann <naderman@naderman.de>	2010-11-20 17:00:05 +0100
committer	Nils Adermann <naderman@naderman.de>	2010-11-20 17:00:05 +0100
commit	7f21a5f46156660d7ea6a4bdb59166ac553e2be8 (patch)
tree	3963b4075f58c43ffc01fe290b04a800668bc53c /tests/dbal
parent	c4e02a191628b4b9f7b6340f2876607663baeb5a (diff)
parent	af4c2a3eb15fc4318b23dcb7794c230cf3ec2a0f (diff)
download	forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar.gz forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar.bz2 forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.tar.xz forums-7f21a5f46156660d7ea6a4bdb59166ac553e2be8.zip