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

Tracking report should obey MaxCharactersInDisplayedSQL

Browse Source
This commit is contained in:
Marc Delisle
2010-04-26 16:38:20 -04:00
parent bd4e0b83d8
commit 06c8fa0abb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2974067 [display] non-binary fields shown as hex - bug #2974067 [display] non-binary fields shown as hex
- bug #2983065 [operations] Error when changing from Maria to MyISAM engine - bug #2983065 [operations] Error when changing from Maria to MyISAM engine
- bug #2975408 [tracking] Data too long for column data_sql - bug #2975408 [tracking] Data too long for column data_sql
- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL
3.3.2.0 (2010-04-13) 3.3.2.0 (2010-04-13)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

14
tbl_tracking.php
View File

@@ -417,8 +417,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
<?php <?php
$style = 'odd'; $style = 'odd';
foreach ($data['ddlog'] as $entry) { foreach ($data['ddlog'] as $entry) {
$parsed_sql = PMA_SQP_parse($entry['statement']); if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$statement = PMA_formatSql($parsed_sql); $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
} else {
$statement = PMA_formatSql(PMA_SQP_parse($entry['statement']));
}
$timestamp = strtotime($entry['date']); $timestamp = strtotime($entry['date']);
if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to &&
@@ -465,8 +468,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
<?php <?php
$style = 'odd'; $style = 'odd';
foreach ($data['dmlog'] as $entry) { foreach ($data['dmlog'] as $entry) {
$parsed_sql = PMA_SQP_parse($entry['statement']); if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$statement = PMA_formatSql($parsed_sql); $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
} else {
$statement = PMA_formatSql(PMA_SQP_parse($entry['statement']));
}
$timestamp = strtotime($entry['date']); $timestamp = strtotime($entry['date']);
if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to &&