kas5986
diff --git a/Collapse file
‎phpBB/includes/db/db_tools.php‎
Copy file name to clipboardExpand all lines: phpBB/includes/db/db_tools.php
+60Lines changed: 60 additions & 0 deletions b/Collapse file
‎phpBB/includes/db/db_tools.php‎
Copy file name to clipboardExpand all lines: phpBB/includes/db/db_tools.php
+60Lines changed: 60 additions & 0 deletions
diff --git a/Collapse file
‎phpBB/includes/functions_install.php‎
Copy file name to clipboardExpand all lines: phpBB/includes/functions_install.php
+8-49Lines changed: 8 additions & 49 deletions b/Collapse file
‎phpBB/includes/functions_install.php‎
Copy file name to clipboardExpand all lines: phpBB/includes/functions_install.php
+8-49Lines changed: 8 additions & 49 deletions
diff --git a/Collapse file
‎tests/dbal/db_tools_test.php‎
Copy file name to clipboardExpand all lines: tests/dbal/db_tools_test.php
+7Lines changed: 7 additions & 0 deletions b/Collapse file
‎tests/dbal/db_tools_test.php‎
Copy file name to clipboardExpand all lines: tests/dbal/db_tools_test.php
+7Lines changed: 7 additions & 0 deletions
@@ -347,6 +347,66 @@ function phpbb_db_tools(&$db, $return_statements = false)
 		}
 	}
 
+	/**
+	* Gets a list of tables in the database.
+	*
+	* @return array		Array of table names  (all lower case)
+	*/
+	function sql_list_tables()
+	{
+		switch ($this->db->sql_layer)
+		{
+			case 'mysql':
+			case 'mysql4':
+			case 'mysqli':
+				$sql = 'SHOW TABLES';
+			break;
+
+			case 'sqlite':
+				$sql = 'SELECT name
+					FROM sqlite_master
+					WHERE type = "table"';
+			break;
+
+			case 'mssql':
+			case 'mssql_odbc':
+			case 'mssqlnative':
+				$sql = "SELECT name
+					FROM sysobjects
+					WHERE type='U'";
+			break;
+
+			case 'postgres':
+				$sql = 'SELECT relname
+					FROM pg_stat_user_tables';
+			break;
+
+			case 'firebird':
+				$sql = 'SELECT rdb$relation_name
+					FROM rdb$relations
+					WHERE rdb$view_source is null
+						AND rdb$system_flag = 0';
+			break;
+
+			case 'oracle':
+				$sql = 'SELECT table_name
+					FROM USER_TABLES';
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+
+		$tables = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$name = current($row);
+			$tables[$name] = $name;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $tables;
+	}
+
 	/**
 	* Check if table exists
 	*
 
@@ -211,61 +211,20 @@ function dbms_select($default = '', $only_20x_options = false)
 
 /**
 * Get tables of a database
+*
+* @deprecated
 */
-function get_tables($db)
+function get_tables(&$db)
 {
-	switch ($db->sql_layer)
-	{
-		case 'mysql':
-		case 'mysql4':
-		case 'mysqli':
-			$sql = 'SHOW TABLES';
-		break;
-
-		case 'sqlite':
-			$sql = 'SELECT name
-				FROM sqlite_master
-				WHERE type = "table"';
-		break;
-
-		case 'mssql':
-		case 'mssql_odbc':
-		case 'mssqlnative':
-			$sql = "SELECT name
-				FROM sysobjects
-				WHERE type='U'";
-		break;
-
-		case 'postgres':
-			$sql = 'SELECT relname
-				FROM pg_stat_user_tables';
-		break;
-
-		case 'firebird':
-			$sql = 'SELECT rdb$relation_name
-				FROM rdb$relations
-				WHERE rdb$view_source is null
-					AND rdb$system_flag = 0';
-		break;
-
-		case 'oracle':
-			$sql = 'SELECT table_name
-				FROM USER_TABLES';
-		break;
-	}
-
-	$result = $db->sql_query($sql);
-
-	$tables = array();
-
-	while ($row = $db->sql_fetchrow($result))
+	if (!class_exists('phpbb_db_tools'))
 	{
-		$tables[] = current($row);
+		global $phpbb_root_path, $phpEx;
+		require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
 	}
 
-	$db->sql_freeresult($result);
+	$db_tools = new phpbb_db_tools($db);
 
-	return $tables;
+	return $db_tools->sql_list_tables();
 }
 
 /**
 
@@ -258,6 +258,13 @@ public function test_column_remove_primary()
 		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
 	}
 
+	public function test_list_tables()
+	{
+		$tables = $this->tools->sql_list_tables();
+		$this->assertTrue(isset($tables['prefix_table_name']));
+		$this->assertFalse(isset($tables['prefix_does_not_exist']));
+	}
+
 	public function test_table_exists()
 	{
 		$this->assertTrue($this->tools->sql_table_exists('prefix_table_name'));
Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,13 @@ public function test_column_remove_primary()`
`258`	`258`	`$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_id'));`
`259`	`259`	`}`
`260`	`260`
	`261`	`+ public function test_list_tables()`
	`262`	`+ {`
	`263`	`+ $tables = $this->tools->sql_list_tables();`
	`264`	`+ $this->assertTrue(isset($tables['prefix_table_name']));`
	`265`	`+ $this->assertFalse(isset($tables['prefix_does_not_exist']));`
	`266`	`+ }`
	`267`	`+`
`261`	`268`	`public function test_table_exists()`
`262`	`269`	`{`
`263`	`270`	`$this->assertTrue($this->tools->sql_table_exists('prefix_table_name'));`