Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/core/ui/querya_shell_status.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ class QueryaShellStatus extends ChangeNotifier {
if (duration != null) _lastQueryDuration = duration;
if (rowCount != null) _rowCount = rowCount;
if (columnCount != null) _columnCount = columnCount;
if (message != null) _statusMessage = message;
// The message describes this result. A plain row count passes none (the
// counts are shown beside it), and then neither "Running query…" nor the
// text of an earlier run may stay (#1556).
_statusMessage = message;
_messageIsBusy = false;
notifyListeners();
}
Expand Down
36 changes: 36 additions & 0 deletions test/core/ui/querya_shell_status_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,42 @@ void main() {
expect(status.statusMessage, 'Explain failed');
});

test('a plain-count result leaves no "Running query…" behind (#1556)', () {
status.beginBusy(message: 'Running query…');

status.reportQueryResult(
duration: const Duration(milliseconds: 1),
rowCount: 12,
columnCount: 8,
);

expect(status.isBusy, isFalse);
expect(status.statusMessage, isNull);
expect(status.rowCount, 12);
expect(status.columnCount, 8);

status.endBusy();
expect(status.statusMessage, isNull);
});

test('a result without a message does not keep the text of an earlier run',
() {
status.reportQueryResult(rowCount: 3, columnCount: 1, message: 'Script done.');
status.beginBusy(message: 'Running query…');

status.reportQueryResult(rowCount: 12, columnCount: 8);

expect(status.statusMessage, isNull);
});

test('a result with a message shows it after the busy message', () {
status.beginBusy(message: 'Running query…');

status.reportQueryResult(message: '3 statements, 5 row(s) affected.');

expect(status.statusMessage, '3 statements, 5 row(s) affected.');
});

test('a result message is not cleared by a later endBusy', () {
status.reportQueryResult(rowCount: 1, columnCount: 1, message: '1 row(s).');

Expand Down
Loading