paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-21 23:59:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Some small corrections so code compiles with 2.6.4

Browse Source 
git-svn-id: trunk@51186 -
This commit is contained in:
michael 2016-01-04 13:41:09 +00:00
parent f5509e82cb
commit 0f5b62ad4c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/lazdatadesktop/fraquery.pp
View File

@ -561,7 +561,11 @@ begin
RowsAff:=Format(SRecordsFetched,[DS.RecordCount]); RowsAff:=Format(SRecordsFetched,[DS.RecordCount]);
end; end;
MResult.Append(Format(SSQLExecutedOK,[DateTimeToStr(TE)])); 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])])); MResult.Append(Format(SExecutionTime,[FormatDateTime('hh:nn:ss.zzz',TE-TS,[fdoInterval])]));
{$ENDIF}
if (RowsAff<>'') then if (RowsAff<>'') then
MResult.Append(RowsAff); MResult.Append(RowsAff);
AddToHistory(Qry); AddToHistory(Qry);
@ -585,6 +589,7 @@ begin
DoExecuteQuery(Qry,ACount); DoExecuteQuery(Qry,ACount);
Result:=True; Result:=True;
except except
{$IFNDEF VER2_6}
on Ed : ESQLDatabaseError do on Ed : ESQLDatabaseError do
begin begin
Msg:=Ed.Message; Msg:=Ed.Message;
@ -593,6 +598,7 @@ begin
if (Ed.SQLState<>'') then if (Ed.SQLState<>'') then
Msg:=Msg+sLineBreak+Format(SSQLStatus,[Ed.SQLState]); Msg:=Msg+sLineBreak+Format(SSQLStatus,[Ed.SQLState]);
end; end;
{$ENDIF}
On E : EDatabaseError do On E : EDatabaseError do
begin begin
Msg:=E.Message; Msg:=E.Message;

2
tools/lazdatadesktop/frmmain.pp
View File

@ -297,7 +297,7 @@ implementation
{$R *.lfm} {$R *.lfm}
{$DEFINE HAVEMSSQLCONN} { $DEFINE HAVEMSSQLCONN}
uses uses
frmselectconnectiontype, frmselectconnectiontype,