Merge PR #1101 branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/11219] Only update sequences that are affected by a fixture
  [ticket/11219] Recreate Oracle sequences instead of altering them
  [ticket/11219] Add unit test for inserting into a sequence column
  [ticket/11219] Update sequence values after loading fixtures

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'));
+	}
+}