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

set local_query only if we are exporting data

Browse Source
This commit is contained in:
Marc Delisle
2006-12-26 14:07:02 +00:00
parent c06c96f317
commit ac5be0261a
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL$
2006-12-26 Marc Delisle <lem9@users.sourceforge.net>
* export.php: set $local_query only if we are exporting data
2006-12-20 Marc Delisle <lem9@users.sourceforge.net>
* libraries/export/sql.php: bug #1619647, export of query results
should not contain procedure definitions

25
export.php
View File

@@ -421,13 +421,13 @@ if ($export_type == 'server') {
$views[] = $table;
continue;
}
$local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table);
if (isset($GLOBALS[$what . '_structure'])) {
if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates)) {
break 3;
}
}
if (isset($GLOBALS[$what . '_data'])) {
$local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table);
if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) {
break 3;
}
@@ -460,21 +460,17 @@ if ($export_type == 'server') {
$views[] = $table;
continue;
}
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
//if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|'))
//|| !isset($tmp_select)) {
if (isset($GLOBALS[$what . '_structure'])) {
if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates)) {
break 2;
}
}
if (isset($GLOBALS[$what . '_data'])) {
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
break 2;
}
}
//}
}
foreach ($views as $view) {
// no data export for a view
@@ -502,6 +498,14 @@ if ($export_type == 'server') {
$add_query = '';
}
if (isset($GLOBALS[$what . '_structure'])) {
if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates)) {
break;
}
}
// If this is an export of a single view, we have to export data;
// for example, a PDF report
if (isset($GLOBALS[$what . '_data'])) {
if (!empty($sql_query)) {
// only preg_replace if needed
if (!empty($add_query)) {
@@ -513,15 +517,6 @@ if ($export_type == 'server') {
} else {
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
}
if (isset($GLOBALS[$what . '_structure'])) {
if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates)) {
break;
}
}
// I think we have to export data for a single view; for example PDF report
//if (isset($GLOBALS[$what . '_data']) && ! PMA_table::isView($db, $table)) {
if (isset($GLOBALS[$what . '_data'])) {
if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
break;
}