git-svn-id: file:///svn/phpbb/trunk@7223 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-03-24 05:20:20 +00:00
parent 369dc7502c
commit 99ba459014

View file

@ -193,14 +193,12 @@ function get_tables($db)
case 'mysql4': case 'mysql4':
case 'mysqli': case 'mysqli':
$sql = 'SHOW TABLES'; $sql = 'SHOW TABLES';
$field = 'Tables_in_' . strtolower($db->dbname);
break; break;
case 'sqlite': case 'sqlite':
$sql = 'SELECT name $sql = 'SELECT name
FROM sqlite_master FROM sqlite_master
WHERE type = "table"'; WHERE type = "table"';
$field = 'name';
break; break;
case 'mssql': case 'mssql':
@ -208,13 +206,11 @@ function get_tables($db)
$sql = "SELECT name $sql = "SELECT name
FROM sysobjects FROM sysobjects
WHERE type='U'"; WHERE type='U'";
$field = 'name';
break; break;
case 'postgres': case 'postgres':
$sql = 'SELECT relname $sql = 'SELECT relname
FROM pg_stat_user_tables'; FROM pg_stat_user_tables';
$field = 'relname';
break; break;
case 'firebird': case 'firebird':
@ -222,13 +218,11 @@ function get_tables($db)
FROM rdb$relations FROM rdb$relations
WHERE rdb$view_source is null WHERE rdb$view_source is null
AND rdb$system_flag = 0'; AND rdb$system_flag = 0';
$field = 'rdb$relation_name';
break; break;
case 'oracle': case 'oracle':
$sql = 'SELECT table_name $sql = 'SELECT table_name
FROM USER_TABLES'; FROM USER_TABLES';
$field = 'table_name';
break; break;
} }
@ -238,7 +232,7 @@ function get_tables($db)
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$tables[] = $row[$field]; $tables[] = current($row);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);