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

bug 2953050 export VIEW as SQL includes INSERT statement

Browse Source
This commit is contained in:
Marc Delisle
2010-02-27 16:39:41 +00:00
parent e5750aa98c
commit bd31cbb260
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -9,6 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2941037 [core] Database structure not sorted by table correctly - bug #2941037 [core] Database structure not sorted by table correctly
- bug #2948492 [interface] Slide effect masks some fields on search page - bug #2948492 [interface] Slide effect masks some fields on search page
- bug #2959746 [interface] Unknown table status: TABLE_TYPE - bug #2959746 [interface] Unknown table status: TABLE_TYPE
- bug #2953050 [export] export VIEW as SQL includes INSERT statement
3.3.0.0 (not yet released) 3.3.0.0 (not yet released)
+ rfe #2308632 [edit] Use hex for (var)binary fields, + rfe #2308632 [edit] Use hex for (var)binary fields,

9
libraries/database_interface.lib.php
View File

@@ -447,7 +447,14 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
// Note 2: Instead of array_merge(), simply use the + operator because // Note 2: Instead of array_merge(), simply use the + operator because
// array_merge() renumbers numeric keys starting with 0, therefore // array_merge() renumbers numeric keys starting with 0, therefore
// we would lose a db name thats consists only of numbers // we would lose a db name thats consists only of numbers
PMA_Table::$cache = PMA_Table::$cache + $tables; foreach($tables as $one_database => $its_tables) {
if (isset(PMA_Table::$cache[$one_database])) {
PMA_Table::$cache[$one_database] = PMA_Table::$cache[$one_database] + $tables[$one_database];
} else {
PMA_Table::$cache[$one_database] = $tables[$one_database];
}
}
unset($one_database, $its_tables);
if (! is_array($database)) { if (! is_array($database)) {
if (isset($tables[$database])) { if (isset($tables[$database])) {