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

Fix #11394 Export/import Designer view

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-08-13 10:17:24 +05:30
parent 6f84ecf3a4
commit 9cf71d9169
2 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -89,6 +89,7 @@ phpMyAdmin - ChangeLog
- issue #10250 Displayed git revision info is not set
+ Improved schema SVG export
- issue #10726 Do not try to set port 80 for https requests
+ issue #11394 Export/import Designer view
4.4.14.0 (not yet released)
- issue #11367 Export after search, missing WHERE clause

70
libraries/plugins/export/ExportSql.class.php
View File

@ -1036,8 +1036,7 @@ class ExportSql extends ExportPlugin
$types = array(
'bookmark' => 'dbase',
'relation' => 'master_db',
//'pdf_pages' => 'db_name',
//'table_coords' => 'db_name',
'pdf_pages' => 'db_name',
'savedsearches' => 'db_name',
'central_columns' => 'db_name',
);
@ -1071,6 +1070,69 @@ class ExportSql extends ExportPlugin
foreach ($types as $type => $dbNameColumn) {
if (in_array($type, $metadataTypes) && isset($cfgRelation[$type])) {
// special case, designer pages and their coordinates
if ($type == 'pdf_pages') {
$sql_query = "SELECT `page_nr`, `page_descr` FROM "
. PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation[$type])
. " WHERE " . PMA_Util::backquote($dbNameColumn)
. " = '" . PMA_Util::sqlAddSlashes($db) . "'";
$result = $GLOBALS['dbi']->fetchResult(
$sql_query, 'page_nr', 'page_descr'
);
foreach ($result as $page => $name) {
// insert row for pdf_page
$sql_query_row = "SELECT `db_name`, `page_descr` FROM "
. PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation[$type])
. " WHERE " . PMA_Util::backquote($dbNameColumn)
. " = '" . PMA_Util::sqlAddSlashes($db) . "'"
. " AND `page_nr` = '" . $page . "'";
if (! $this->exportData(
$cfgRelation['db'],
$cfgRelation[$type],
$GLOBALS['crlf'],
'',
$sql_query_row,
$aliases
)) {
return false;
}
$lastPage = $GLOBALS['crlf']
. "SET @LAST_PAGE = LAST_INSERT_ID();"
. $GLOBALS['crlf'] ;
if (! PMA_exportOutputHandler($lastPage)) {
return false;
}
$sql_query_coords = "SELECT `db_name`, `table_name`, "
. "'@LAST_PAGE' AS `pdf_page_number`, `x`, `y` FROM "
. PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation['table_coords'])
. " WHERE `pdf_page_number` = '" . $page . "'";
$GLOBALS['exporting_metadata'] = true;
if (! $this->exportData(
$cfgRelation['db'],
$cfgRelation['table_coords'],
$GLOBALS['crlf'],
'',
$sql_query_coords,
$aliases
)) {
$GLOBALS['exporting_metadata'] = false;
return false;
}
$GLOBALS['exporting_metadata'] = false;
}
continue;
}
// remove auto_incrementing id field for some tables
if ($type == 'bookmark') {
$sql_query = "SELECT `dbase`, `user`, `label`, `query` FROM ";
@ -2224,6 +2286,10 @@ class ExportSql extends ExportPlugin
)
)
. "'";
} elseif (! empty($GLOBALS['exporting_metadata'])
&& $row[$j] == '@LAST_PAGE'
) {
$values[] = '@LAST_PAGE';
} else {
// something else -> treat as a string
$values[] = '\''