mirror_php/php-debugbar
1
0
Fork 0
mirror of https://github.com/maximebf/php-debugbar.git synced 2025-01-17 21:38:14 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/109'

Browse Source 
Conflicts:
	src/DebugBar/Resources/widgets/sqlqueries/widget.css
This commit is contained in:
maximebf 2014-04-25 11:30:40 -05:00
commit ab02c692d2
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/DebugBar/Resources/widgets/sqlqueries/widget.css
View File

@ -1,4 +1,3 @@
div.phpdebugbar-widgets-sqlqueries .phpdebugbar-widgets-status { div.phpdebugbar-widgets-sqlqueries .phpdebugbar-widgets-status {
font-family: monospace; font-family: monospace;
padding: 6px 6px; padding: 6px 6px;
@ -67,8 +66,17 @@ div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item span.phpdebu
display: block; display: block;
font-weight: bold; font-weight: bold;
} }
code.phpdebugbar-widgets-sql { code.phpdebugbar-widgets-sql {
white-space: pre-wrap; white-space: pre-wrap;
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; word-wrap: break-word;
} }
div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-widgets-sql-duplicate {
background-color: #ffd;
}
div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-widgets-sql-duplicate:hover {
background-color: #ffc;
}

23
src/DebugBar/Resources/widgets/sqlqueries/widget.js
View File

@ -53,10 +53,33 @@
this.$list.set('data', data.statements); this.$list.set('data', data.statements);
this.$status.empty(); this.$status.empty();
// Search for duplicate statements.
for (var sql = {}, duplicate = 0, i = 0; i < data.statements.length; i++) {
var stmt = data.statements[i].sql;
if (data.statements[i].params && !$.isEmptyObject(data.statements[i].params)) {
stmt += ' {' + $.param(data.statements[i].params, false) + '}';
}
sql[stmt] = sql[stmt] || { keys: [] };
sql[stmt].keys.push(i);
}
// Add classes to all duplicate SQL statements.
for (var stmt in sql) {
if (sql[stmt].keys.length > 1) {
duplicate++;
for (var i = 0; i < sql[stmt].keys.length; i++) {
this.$list.$el.find('.' + csscls('list-item')).eq(sql[stmt].keys[i])
.addClass(csscls('sql-duplicate')).addClass(csscls('sql-duplicate-'+duplicate));
}
}
}
var t = $('<span />').text(data.nb_statements + " statements were executed").appendTo(this.$status); var t = $('<span />').text(data.nb_statements + " statements were executed").appendTo(this.$status);
if (data.nb_failed_statements) { if (data.nb_failed_statements) {
t.append(", " + data.nb_failed_statements + " of which failed"); t.append(", " + data.nb_failed_statements + " of which failed");
} }
if (duplicate) {
t.append(", " + duplicate + " of which were duplicated");
}
if (data.accumulated_duration_str) { if (data.accumulated_duration_str) {
this.$status.append($('<span title="Accumulated duration" />').addClass(csscls('duration')).text(data.accumulated_duration_str)); this.$status.append($('<span title="Accumulated duration" />').addClass(csscls('duration')).text(data.accumulated_duration_str));
} }