nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMA_DBI_get_tables_full() first parameter now also accepts an array of database names not only a single name

Browse Source
This commit is contained in:
Sebastian Mendel
2006-01-14 17:56:18 +00:00
parent c7b1a57c25
commit e62ce1a6e2
2 changed files with 83 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2006-01-14 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-01-14 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/sql_query_form.lib.php: undefined js variable * libraries/sql_query_form.lib.php: undefined js variable
* libraries/database_interface.lib.php: PMA_DBI_get_tables_full() first parameter
now also accepts an array of database names not only a single name
2006-01-12 Marc Delisle <lem9@users.sourceforge.net> 2006-01-12 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: typo, thanks to Cédric Corazza * Documentation.html: typo, thanks to Cédric Corazza

99
libraries/database_interface.lib.php
View File

@@ -237,14 +237,10 @@ function PMA_DBI_get_tables_full( $database, $table = false,
$tbl_is_group = false, $link = null) $tbl_is_group = false, $link = null)
{ {
// prepare and check parameters // prepare and check parameters
if ( empty( $database ) ) { if ( ! is_array($database) ) {
return false; $databases = array(addslashes($database));
} elseif ( false !== strpos( '`', $database ) ) { } else {
// found ` in name $databases =& array_map($database, 'addslashes');
return false;
} elseif ( false !== strpos( '\\', $database ) ) {
// found \ in name
return false;
} }
if ( PMA_MYSQL_INT_VERSION >= 50002 ) { if ( PMA_MYSQL_INT_VERSION >= 50002 ) {
@@ -288,80 +284,91 @@ function PMA_DBI_get_tables_full( $database, $table = false,
`CREATE_OPTIONS` AS `Create_options`, `CREATE_OPTIONS` AS `Create_options`,
`TABLE_COMMENT` AS `Comment` `TABLE_COMMENT` AS `Comment`
FROM `information_schema`.`TABLES` FROM `information_schema`.`TABLES`
WHERE `TABLE_SCHEMA` = \'' . addslashes( $database ) . '\' WHERE `TABLE_SCHEMA` IN (\'' . implode("', '", $databases) . '\')
' . $sql_where_table; ' . $sql_where_table;
$tables = PMA_DBI_fetch_result( $sql, 'TABLE_NAME', null, $link ); $tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA','TABLE_NAME'),
null, $link);
unset( $sql_where_table, $sql ); unset( $sql_where_table, $sql );
} else { } else {
foreach ( $databases as $each_database ) {
if ( true === $tbl_is_group ) { if ( true === $tbl_is_group ) {
$sql = 'SHOW TABLE STATUS FROM ' $sql = 'SHOW TABLE STATUS FROM '
. PMA_backquote( addslashes( $database ) ) . PMA_backquote($each_database)
.' LIKE \'' . PMA_escape_mysql_wildcards(addslashes($table)) . '%\''; .' LIKE \'' . PMA_escape_mysql_wildcards(addslashes($table)) . '%\'';
} else { } else {
$sql = 'SHOW TABLE STATUS FROM ' $sql = 'SHOW TABLE STATUS FROM '
. PMA_backquote( addslashes( $database ) ) . ';'; . PMA_backquote($each_database) . ';';
} }
$tables = PMA_DBI_fetch_result( $sql, 'Name', null, $link ); $each_tables = PMA_DBI_fetch_result($sql, 'Name', null, $link);
foreach ( $tables as $table_name => $each_table ) { foreach ( $each_tables as $table_name => $each_table ) {
if ( 'comment' === $tbl_is_group if ( 'comment' === $tbl_is_group
&& 0 === strpos($each_table['Comment'], $table) ) && 0 === strpos($each_table['Comment'], $table) )
{ {
// remove table from list // remove table from list
unset( $tables[$table_name] ); unset( $each_tables[$table_name] );
continue; continue;
} }
if ( ! isset( $tables[$table_name]['Type'] ) if ( ! isset( $each_tables[$table_name]['Type'] )
&& isset( $tables[$table_name]['Engine'] ) ) { && isset( $each_tables[$table_name]['Engine'] ) ) {
// pma BC, same parts of PMA still uses 'Type' // pma BC, same parts of PMA still uses 'Type'
$tables[$table_name]['Type'] =& $tables[$table_name]['Engine']; $each_tables[$table_name]['Type']
} elseif ( ! isset( $tables[$table_name]['Engine'] ) =& $each_tables[$table_name]['Engine'];
&& isset( $tables[$table_name]['Type'] ) ) { } elseif ( ! isset( $each_tables[$table_name]['Engine'] )
&& isset( $each_tables[$table_name]['Type'] ) ) {
// old MySQL reports Type, newer MySQL reports Engine // old MySQL reports Type, newer MySQL reports Engine
$tables[$table_name]['Engine'] =& $tables[$table_name]['Type']; $each_tables[$table_name]['Engine']
=& $each_tables[$table_name]['Type'];
} }
// MySQL forward compatibility // MySQL forward compatibility
// so pma could use this array as if every server is of version >5.0 // so pma could use this array as if every server is of version >5.0
$tables[$table_name]['TABLE_SCHEMA'] = $database; $each_tables[$table_name]['TABLE_SCHEMA'] = $each_database;
$tables[$table_name]['TABLE_NAME'] =& $tables[$table_name]['Name']; $each_tables[$table_name]['TABLE_NAME'] =& $each_tables[$table_name]['Name'];
$tables[$table_name]['ENGINE'] =& $tables[$table_name]['Engine']; $each_tables[$table_name]['ENGINE'] =& $each_tables[$table_name]['Engine'];
$tables[$table_name]['VERSION'] =& $tables[$table_name]['Version']; $each_tables[$table_name]['VERSION'] =& $each_tables[$table_name]['Version'];
$tables[$table_name]['ROW_FORMAT'] =& $tables[$table_name]['Row_format']; $each_tables[$table_name]['ROW_FORMAT'] =& $each_tables[$table_name]['Row_format'];
$tables[$table_name]['TABLE_ROWS'] =& $tables[$table_name]['Rows']; $each_tables[$table_name]['TABLE_ROWS'] =& $each_tables[$table_name]['Rows'];
$tables[$table_name]['AVG_ROW_LENGTH'] =& $tables[$table_name]['Avg_row_length']; $each_tables[$table_name]['AVG_ROW_LENGTH'] =& $each_tables[$table_name]['Avg_row_length'];
$tables[$table_name]['DATA_LENGTH'] =& $tables[$table_name]['Data_length']; $each_tables[$table_name]['DATA_LENGTH'] =& $each_tables[$table_name]['Data_length'];
$tables[$table_name]['MAX_DATA_LENGTH'] =& $tables[$table_name]['Max_data_length']; $each_tables[$table_name]['MAX_DATA_LENGTH'] =& $each_tables[$table_name]['Max_data_length'];
$tables[$table_name]['INDEX_LENGTH'] =& $tables[$table_name]['Index_length']; $each_tables[$table_name]['INDEX_LENGTH'] =& $each_tables[$table_name]['Index_length'];
$tables[$table_name]['DATA_FREE'] =& $tables[$table_name]['Data_free']; $each_tables[$table_name]['DATA_FREE'] =& $each_tables[$table_name]['Data_free'];
$tables[$table_name]['AUTO_INCREMENT'] =& $tables[$table_name]['Auto_increment']; $each_tables[$table_name]['AUTO_INCREMENT'] =& $each_tables[$table_name]['Auto_increment'];
$tables[$table_name]['CREATE_TIME'] =& $tables[$table_name]['Create_time']; $each_tables[$table_name]['CREATE_TIME'] =& $each_tables[$table_name]['Create_time'];
$tables[$table_name]['UPDATE_TIME'] =& $tables[$table_name]['Update_time']; $each_tables[$table_name]['UPDATE_TIME'] =& $each_tables[$table_name]['Update_time'];
$tables[$table_name]['CHECK_TIME'] =& $tables[$table_name]['Check_time']; $each_tables[$table_name]['CHECK_TIME'] =& $each_tables[$table_name]['Check_time'];
$tables[$table_name]['TABLE_COLLATION'] =& $tables[$table_name]['Collation']; $each_tables[$table_name]['TABLE_COLLATION'] =& $each_tables[$table_name]['Collation'];
$tables[$table_name]['CHECKSUM'] =& $tables[$table_name]['Checksum']; $each_tables[$table_name]['CHECKSUM'] =& $each_tables[$table_name]['Checksum'];
$tables[$table_name]['CREATE_OPTIONS'] =& $tables[$table_name]['Create_options']; $each_tables[$table_name]['CREATE_OPTIONS'] =& $each_tables[$table_name]['Create_options'];
$tables[$table_name]['TABLE_COMMENT'] =& $tables[$table_name]['Comment']; $each_tables[$table_name]['TABLE_COMMENT'] =& $each_tables[$table_name]['Comment'];
if ( strtoupper( $tables[$table_name]['Comment'] ) === 'VIEW' ) { if ( strtoupper( $each_tables[$table_name]['Comment'] ) === 'VIEW' ) {
$tables[$table_name]['TABLE_TYPE'] = 'VIEW'; $each_tables[$table_name]['TABLE_TYPE'] = 'VIEW';
} else { } else {
// TODO difference between 'TEMPORARY' and 'BASE TABLE' // TODO difference between 'TEMPORARY' and 'BASE TABLE'
// but how to detect? // but how to detect?
$tables[$table_name]['TABLE_TYPE'] = 'BASE TABLE'; $each_tables[$table_name]['TABLE_TYPE'] = 'BASE TABLE';
} }
} }
$tables[$each_database] = $each_tables;
}
} }
if ( $GLOBALS['cfg']['NaturalOrder'] ) { if ( $GLOBALS['cfg']['NaturalOrder'] ) {
uksort( $tables, 'strnatcasecmp' ); foreach ( $tables as $key => $val ) {
uksort($tables[$key], 'strnatcasecmp');
}
} }
if ( ! is_array($database) ) {
return $tables[$database];
} else {
return $tables; return $tables;
} }
}
/** /**
* returns array with databases containing extended infos about them * returns array with databases containing extended infos about them