paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-10 10:29:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: interbase: SQLState must be obtained before isc_interprete is called.

Browse Source 
git-svn-id: trunk@29165 -
This commit is contained in:
lacak 2014-11-27 14:05:39 +00:00
parent 628d6243be
commit 6b0cd8bb0e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/fcl-db/src/sqldb/interbase/ibconnection.pp
View File

@ -152,27 +152,25 @@ const
procedure TIBConnection.CheckError(ProcName : string; Status : PISC_STATUS); procedure TIBConnection.CheckError(ProcName : string; Status : PISC_STATUS);
var var
Err : longint; ErrorCode : longint;
Msg : string; Msg, SQLState : string;
Buf : array [0..1023] of char; Buf : array [0..1023] of char;
E : EIBDatabaseError;
begin begin
if ((Status[0] = 1) and (Status[1] <> 0)) then if ((Status[0] = 1) and (Status[1] <> 0)) then
begin begin
Err := Status[1]; ErrorCode := Status[1];
Msg := '';
while isc_interprete(Buf, @Status) > 0 do
Msg := Msg + LineEnding + ' -' + StrPas(Buf);
E := EIBDatabaseError.CreateFmt('%s : %s', [ProcName,Msg], Self, Err, '');
{$IFDEF LinkDynamically} {$IFDEF LinkDynamically}
if assigned(fb_sqlstate) then // >= Firebird 2.5 if assigned(fb_sqlstate) then // >= Firebird 2.5
begin begin
fb_sqlstate(Buf, Status); fb_sqlstate(Buf, Status);
E.SQLState := StrPas(Buf); SQLState := StrPas(Buf);
end; end;
{$ENDIF} {$ENDIF}
Raise E; Msg := '';
while isc_interprete(Buf, @Status) > 0 do
Msg := Msg + LineEnding + ' -' + StrPas(Buf);
raise EIBDatabaseError.CreateFmt('%s : %s', [ProcName,Msg], Self, ErrorCode, SQLState);
end; end;
end; end;