diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-14 17:48:15 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-14 17:48:15 +0200 |
| commit | 8a82ec95a56f70b7b5ea10cfe9e98574e5230195 (patch) | |
| tree | cf302fef439e6816b09e532e47cd75bf5d51e8d5 /phpBB/includes/functions_install.php | |
| parent | 207a73537b2bb7f4608509f3ec79aaa313608ccb (diff) | |
| parent | 4effe8fb8bdf493e539b7bf883fbf1e290bf7ab2 (diff) | |
| download | forums-8a82ec95a56f70b7b5ea10cfe9e98574e5230195.tar forums-8a82ec95a56f70b7b5ea10cfe9e98574e5230195.tar.gz forums-8a82ec95a56f70b7b5ea10cfe9e98574e5230195.tar.bz2 forums-8a82ec95a56f70b7b5ea10cfe9e98574e5230195.tar.xz forums-8a82ec95a56f70b7b5ea10cfe9e98574e5230195.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/8240] Add ability to get a list of columns of a tables to db_tools.
[ticket/8240] Add ability to get a list of tables to db_tools.
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -rw-r--r-- | phpBB/includes/functions_install.php | 57 |
1 files changed, 8 insertions, 49 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 7742bb9263..7a99bca0e2 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -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(); } /** |