From 26ec06edcdea0c396856ca45d30b2a8ffec4f721 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Sun, 7 Jan 2018 12:05:19 +0100 Subject: [PATCH] Inform user about preference setting for limiting result tabs. Closes #73 --- out/locale/en/LC_MESSAGES/default.po | 3 +++ source/helpers.pas | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po index 1bfc13cb..8ca1348b 100644 --- a/out/locale/en/LC_MESSAGES/default.po +++ b/out/locale/en/LC_MESSAGES/default.po @@ -6322,3 +6322,6 @@ msgstr "Tab 5" msgid "Go to tab 5" msgstr "Go to tab 5" + +msgid "Reached maximum number of result tabs (%d). To display more results, increase setting in Preferences > SQL" +msgstr "Reached maximum number of result tabs (%d). To display more results, increase setting in Preferences > SQL" diff --git a/source/helpers.pas b/source/helpers.pas index 654463a6..63992ed7 100644 --- a/source/helpers.pas +++ b/source/helpers.pas @@ -2842,7 +2842,7 @@ var SQL: String; i, BatchStartOffset, ResultCount: Integer; PacketSize, MaxAllowedPacket: Int64; - DoStoreResult, ErrorAborted: Boolean; + DoStoreResult, ErrorAborted, LogMaxResultsDone: Boolean; begin inherited; @@ -2850,6 +2850,7 @@ begin i := 0; ResultCount := 0; ErrorAborted := False; + LogMaxResultsDone := False; while i < FBatch.Count do begin SQL := ''; @@ -2880,6 +2881,13 @@ begin try FConnection.LockedByThread := Self; DoStoreResult := ResultCount < AppSettings.ReadInt(asMaxQueryResults); + if (not DoStoreResult) and (not LogMaxResultsDone) then begin + // Inform user about preference setting for limiting result tabs + LogFromOutside( + f_('Reached maximum number of result tabs (%d). To display more results, increase setting in Preferences > SQL', [AppSettings.ReadInt(asMaxQueryResults)]), + lcInfo); + LogMaxResultsDone := True; + end; FConnection.Query(SQL, DoStoreResult, lcUserFiredSQL); Inc(ResultCount, FConnection.ResultCount); FBatchPosition := i;