diff --git a/tools/lazdatadesktop/fraquery.pp b/tools/lazdatadesktop/fraquery.pp index 42356808be..66bbeab42d 100644 --- a/tools/lazdatadesktop/fraquery.pp +++ b/tools/lazdatadesktop/fraquery.pp @@ -561,7 +561,11 @@ begin RowsAff:=Format(SRecordsFetched,[DS.RecordCount]); end; MResult.Append(Format(SSQLExecutedOK,[DateTimeToStr(TE)])); +{$IFDEF VER2_6} + MResult.Append(Format(SExecutionTime,[FormatDateTime('hh:nn:ss.zzz',TE-TS)])); +{$ELSE} MResult.Append(Format(SExecutionTime,[FormatDateTime('hh:nn:ss.zzz',TE-TS,[fdoInterval])])); +{$ENDIF} if (RowsAff<>'') then MResult.Append(RowsAff); AddToHistory(Qry); @@ -585,6 +589,7 @@ begin DoExecuteQuery(Qry,ACount); Result:=True; except +{$IFNDEF VER2_6} on Ed : ESQLDatabaseError do begin Msg:=Ed.Message; @@ -593,6 +598,7 @@ begin if (Ed.SQLState<>'') then Msg:=Msg+sLineBreak+Format(SSQLStatus,[Ed.SQLState]); end; +{$ENDIF} On E : EDatabaseError do begin Msg:=E.Message; diff --git a/tools/lazdatadesktop/frmmain.pp b/tools/lazdatadesktop/frmmain.pp index 80ce3661b4..aa8fa9c870 100644 --- a/tools/lazdatadesktop/frmmain.pp +++ b/tools/lazdatadesktop/frmmain.pp @@ -297,7 +297,7 @@ implementation {$R *.lfm} -{$DEFINE HAVEMSSQLCONN} +{ $DEFINE HAVEMSSQLCONN} uses frmselectconnectiontype,