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

respect MaxCharactersInDisplayedSQL when displaying INSERT queries

Browse Source
This commit is contained in:
Marc Delisle
2009-10-03 14:14:15 +00:00
parent 7a3da21570
commit 0a36d8ee6a
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/server_synchronize.lib.php
View File

@@ -609,7 +609,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
} }
$insert_query .= ");"; $insert_query .= ");";
if ($display == true) { if ($display == true) {
echo "<p>".$insert_query."</p>"; PMA_displayQuery($insert_query);
} }
PMA_DBI_try_query($insert_query, $trg_link, 0); PMA_DBI_try_query($insert_query, $trg_link, 0);
} }
@@ -711,7 +711,7 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom
} }
$insert_query .= ');'; $insert_query .= ');';
if ($display == true) { if ($display == true) {
echo '<p>'.$insert_query.'</p>'; PMA_displayQuery($insert_query);
} }
PMA_DBI_try_query($insert_query, $trg_link, 0); PMA_DBI_try_query($insert_query, $trg_link, 0);
} }
@@ -1347,4 +1347,18 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind
PMA_DBI_try_query($drop_index_query, $trg_link, 0); PMA_DBI_try_query($drop_index_query, $trg_link, 0);
} }
} }
/**
* PMA_displayQuery() displays a query, taking the maximum display size
* into account
* @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
*
* @param $query the query to display
*/
function PMA_displayQuery($query) {
if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$query = substr($query, 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
}
echo '<p>' . htmlspecialchars($query) . '</p>';
}
?> ?>