makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Another one bites the dust

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6059 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-06-13 22:39:04 +00:00
parent 1aac08acc0
commit 76a475f107
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
phpBB/includes/acp/acp_database.php
View file

@ -404,7 +404,8 @@ class acp_database
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
// Grab all of the data from current table. // Grab all of the data from current table.
$sql = "SELECT * FROM {$table_name}"; $sql = "SELECT *
FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$i_num_fields = pg_num_fields($result); $i_num_fields = pg_num_fields($result);
@ -524,7 +525,8 @@ class acp_database
$ident_set = false; $ident_set = false;
// Grab all of the data from current table. // Grab all of the data from current table.
$sql = "SELECT * FROM {$table_name}"; $sql = "SELECT *
FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$retrieved_data = odbc_num_rows($result); $retrieved_data = odbc_num_rows($result);
@ -634,7 +636,8 @@ class acp_database
$ident_set = false; $ident_set = false;
// Grab all of the data from current table. // Grab all of the data from current table.
$sql = "SELECT * FROM {$table_name}"; $sql = "SELECT *
FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$retrieved_data = mssql_num_rows($result); $retrieved_data = mssql_num_rows($result);
@ -744,7 +747,8 @@ class acp_database
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
// Grab all of the data from current table. // Grab all of the data from current table.
$sql = "SELECT * FROM {$table_name}"; $sql = "SELECT *
FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$i_num_fields = ibase_num_fields($result); $i_num_fields = ibase_num_fields($result);
@ -828,7 +832,8 @@ class acp_database
$ary_type = $ary_name = array(); $ary_type = $ary_name = array();
// Grab all of the data from current table. // Grab all of the data from current table.
$sql = "SELECT * FROM {$table_name}"; $sql = "SELECT *
FROM {$table_name}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$i_num_fields = ocinumcols($result); $i_num_fields = ocinumcols($result);
@ -953,7 +958,10 @@ class acp_database
switch (SQL_LAYER) switch (SQL_LAYER)
{ {
case 'sqlite': case 'sqlite':
$sql = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name"; $sql = "SELECT name
FROM sqlite_master
WHERE type='table'
ORDER BY name";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -968,7 +976,8 @@ class acp_database
case 'mysqli': case 'mysqli':
case 'mysql4': case 'mysql4':
case 'mysql': case 'mysql':
$sql = "SHOW TABLES LIKE '{$table_prefix}%'"; $sql = "SHOW TABLES
LIKE '{$table_prefix}%'";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -978,7 +987,9 @@ class acp_database
break; break;
case 'postgres': case 'postgres':
$sql = "SELECT relname FROM pg_stat_user_tables ORDER BY relname;"; $sql = "SELECT relname
FROM pg_stat_user_tables
ORDER BY relname;";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -992,7 +1003,10 @@ class acp_database
case 'mssql': case 'mssql':
case 'mssql_odbc': case 'mssql_odbc':
$sql = "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' ORDER BY TABLE_NAME"; $sql = "SELECT TABLE_NAME
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_TYPE = 'BASE TABLE'
ORDER BY TABLE_NAME";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -1005,7 +1019,10 @@ class acp_database
break; break;
case 'firebird': case 'firebird':
$sql = 'SELECT RDB$RELATION_NAME as TABLE_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG=0 AND RDB$VIEW_BLR IS NULL'; $sql = 'SELECT RDB$RELATION_NAME as TABLE_NAME
FROM RDB$RELATIONS
WHERE RDB$SYSTEM_FLAG=0
AND RDB$VIEW_BLR IS NULL';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -1018,7 +1035,8 @@ class acp_database
break; break;
case 'oracle': case 'oracle':
$sql = 'SELECT TNAME as table_name FROM TAB'; $sql = 'SELECT TNAME as table_name
FROM TAB';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -1233,7 +1251,9 @@ class acp_database
$sql_data .= "CREATE TABLE $table_name(\n"; $sql_data .= "CREATE TABLE $table_name(\n";
$rows = array(); $rows = array();
$result = $db->sql_query("SHOW FIELDS FROM $table_name"); $sql = "SHOW FIELDS
FROM $table_name";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {

2
phpBB/includes/acp/acp_profile.php
View file

@ -903,7 +903,7 @@ class acp_profile
case 'mysqli': case 'mysqli':
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field. // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
$sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident "; $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD `$field_ident` ";
switch ($field_type) switch ($field_type)
{ {
case FIELD_STRING: case FIELD_STRING: