From 42e969cbcdc91407a24c79e212e28914ca9ed118 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Sun, 22 Feb 2009 13:50:44 +0000 Subject: [PATCH] Fix issue #991: Termination char ; in SQL log. --- source/main.pas | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/source/main.pas b/source/main.pas index 5a4cefdf..a7154d1b 100644 --- a/source/main.pas +++ b/source/main.pas @@ -3335,22 +3335,21 @@ var begin // Shorten very long messages snip := (prefLogSqlWidth > 0) and (Length(msg) > prefLogSqlWidth); - if snip then - begin + if snip then begin msg := Copy( msg, 0, prefLogSqlWidth ) + '/* large SQL query, snipped at ' + FormatNumber( prefLogSqlWidth ) + ' characters */'; - end; + end else if (not snip) and (not comment) then + msg := msg + Delimiter + else if comment then + msg := '/* ' + msg + ' */'; + msg := WideStringReplace( msg, #9, ' ', [rfReplaceAll] ); msg := WideStringReplace( msg, #10, ' ', [rfReplaceAll] ); msg := WideStringReplace( msg, #13, ' ', [rfReplaceAll] ); msg := WideStringReplace( msg, ' ', ' ', [rfReplaceAll] ); - if ( comment ) then - begin - msg := '/* ' + msg + ' */'; - end; EnterCriticalSection(SqlMessagesLock); try