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

fcl-db: tests: cosmetic

Browse Source 
git-svn-id: trunk@29480 -
This commit is contained in:
lacak 2015-01-16 13:17:36 +00:00
parent aa7dfdff96
commit 2175dd1403
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/fcl-db/tests/testsqldb.pas
View File

@ -32,7 +32,7 @@ type
FMyQ: TSQLQuery; FMyQ: TSQLQuery;
procedure DoAfterPost(DataSet: TDataSet); procedure DoAfterPost(DataSet: TDataSet);
Procedure DoApplyUpdates; Procedure DoApplyUpdates;
Procedure SetQueryOptions; Procedure TrySetQueryOptions;
Procedure TrySetPacketRecords; Procedure TrySetPacketRecords;
Protected Protected
Procedure Setup; override; Procedure Setup; override;
@ -86,6 +86,12 @@ implementation
{ TTestTSQLQuery } { TTestTSQLQuery }
Procedure TTestTSQLQuery.Setup;
begin
inherited Setup;
SQLDBConnector.Connection.Options:=[];
end;
procedure TTestTSQLQuery.TestMasterDetail; procedure TTestTSQLQuery.TestMasterDetail;
var MasterQuery, DetailQuery: TSQLQuery; var MasterQuery, DetailQuery: TSQLQuery;
MasterSource: TDataSource; MasterSource: TDataSource;
@ -185,6 +191,7 @@ begin
for I:=1 to 20 do for I:=1 to 20 do
ExecuteDirect(Format('INSERT INTO FPDEV2 values (%d,''%.6d'')',[i,i])); ExecuteDirect(Format('INSERT INTO FPDEV2 values (%d,''%.6d'')',[i,i]));
Transaction.Commit; Transaction.Commit;
Q := SQLDBConnector.Query; Q := SQLDBConnector.Query;
Q.SQL.Text:='select * from FPDEV2'; Q.SQL.Text:='select * from FPDEV2';
Q.Options:=[sqoKeepOpenOnCommit]; Q.Options:=[sqoKeepOpenOnCommit];
@ -193,6 +200,7 @@ begin
AssertEquals('Got all records',20,Q.RecordCount); AssertEquals('Got all records',20,Q.RecordCount);
Q.SQLTransaction.Commit; Q.SQLTransaction.Commit;
AssertTrue('Still open after transaction',Q.Active); AssertTrue('Still open after transaction',Q.Active);
// Now check editing // Now check editing
Q.Locate('id',20,[]); Q.Locate('id',20,[]);
Q.Edit; Q.Edit;
@ -213,12 +221,6 @@ begin
FMyQ.PacketRecords:=10; FMyQ.PacketRecords:=10;
end; end;
Procedure TTestTSQLQuery.Setup;
begin
inherited Setup;
SQLDBConnector.Connection.Options:=[];
end;
Procedure TTestTSQLQuery.TestKeepOpenOnCommitPacketRecords; Procedure TTestTSQLQuery.TestKeepOpenOnCommitPacketRecords;
begin begin
with SQLDBConnector do with SQLDBConnector do
@ -229,7 +231,7 @@ begin
end; end;
end; end;
Procedure TTestTSQLQuery.SetQueryOptions; Procedure TTestTSQLQuery.TrySetQueryOptions;
begin begin
FMyQ.Options:=[sqoKeepOpenOnCommit]; FMyQ.Options:=[sqoKeepOpenOnCommit];
end; end;
@ -240,14 +242,14 @@ begin
with SQLDBConnector do with SQLDBConnector do
begin begin
ExecuteDirect('create table FPDEV2 (id integer not null, a varchar(10), constraint PK_FPDEV2 primary key(id))'); ExecuteDirect('create table FPDEV2 (id integer not null, a varchar(10), constraint PK_FPDEV2 primary key(id))');
Transaction.COmmit; Transaction.Commit;
ExecuteDirect(Format('INSERT INTO FPDEV2 values (%d,''%.6d'')',[1,1])); ExecuteDirect(Format('INSERT INTO FPDEV2 values (%d,''%.6d'')',[1,1]));
Transaction.COmmit; Transaction.Commit;
FMyQ := SQLDBConnector.Query; FMyQ := SQLDBConnector.Query;
FMyQ.SQL.Text:='select * from FPDEV2'; FMyQ.SQL.Text:='select * from FPDEV2';
FMyQ := SQLDBConnector.Query; FMyQ := SQLDBConnector.Query;
FMyQ.OPen; FMyQ.Open;
AssertException('Cannot set packetrecords when sqoDisconnected is active',EDatabaseError,@SetQueryOptions); AssertException('Cannot set Options when query is active',EDatabaseError,@TrySetQueryOptions);
end; end;
end; end;