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

* Check for an empty statement before the cursor is allocated so that the right error message is shown. (+test which was committed partly in r12510 already)

Browse Source 
git-svn-id: trunk@12511 -
This commit is contained in:
joost 2009-01-05 12:23:54 +00:00
parent 3657380e77
commit 8922c3e310
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/fcl-db/src/sqldb/sqldb.pp
View File

@ -914,15 +914,14 @@ begin
if not Db.Connected then db.Open; if not Db.Connected then db.Open;
if not sqltr.Active then sqltr.StartTransaction; if not sqltr.Active then sqltr.StartTransaction;
// if assigned(fcursor) then FreeAndNil(fcursor);
if not assigned(fcursor) then
FCursor := Db.AllocateCursorHandle;
FSQLBuf := TrimRight(FSQL.Text); FSQLBuf := TrimRight(FSQL.Text);
if FSQLBuf = '' then if FSQLBuf = '' then
DatabaseError(SErrNoStatement); DatabaseError(SErrNoStatement);
if not assigned(fcursor) then
FCursor := Db.AllocateCursorHandle;
SQLParser(FSQLBuf); SQLParser(FSQLBuf);
if ServerFiltered then if ServerFiltered then

3
packages/fcl-db/tests/testfieldtypes.pas
View File

@ -1526,7 +1526,8 @@ begin
Open; Open;
except except
on E:EDatabaseError do on E:EDatabaseError do
if pos(SErrNoStatement,E.Message) > -1 then PassException := True; if Pos(SErrNoStatement,E.Message) > 0 then
PassException := True;
end; end;
AssertTrue(PassException); AssertTrue(PassException);
end; end;