Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.

1 files changed, 3 insertions, 10 deletions

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index b34b471e5c..c0c66b5be7 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -351,19 +351,12 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 	public function test_index_exists()
 	{
-		$db_tools = new phpbb_db_tools($this->db);
-
-		$this->assertTrue($db_tools->sql_index_exists('prefix_table_name', 'i_simple'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_simple'));
 	}
 
 	public function test_create_index_against_index_exists()
 	{
-		$db_tools = new phpbb_db_tools($this->db);
-
-		$table_name = 'prefix_table_name';
-		$index_name = 'fookey';
-
-		$db_tools->sql_create_index($table_name, $index_name, array('c_timestamp', 'c_decimal'));
-		$this->assertTrue($db_tools->sql_index_exists($table_name, $index_name));
+		$this->tools->sql_create_index('prefix_table_name', 'fookey', array('c_timestamp', 'c_decimal'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'fookey'));
 	}
 }