fcl-db: tests: test for bug #35887

git-svn-id: trunk@42497 -

packages/fcl-db/tests/testfieldtypes.pas

@@ -112,7 +112,7 @@ type
     procedure TestErrorOnEmptyStatement;
     procedure TestExceptOnsecClose;
 
-    procedure TestServerFilter; // bug 15456
+    procedure TestServerFilter; // bug 15456, 35887
     procedure TestRowsAffected; // bug 9758
     procedure TestLocateNull;
     procedure TestLocateOnMoreRecords;
@@ -2048,6 +2048,15 @@ begin
     Open;
     CheckTrue(CanModify, SQL.Text);
     Close;
+
+    // tests change of ServerFilter, while DataSet is opened and not all records were fetched
+    PacketRecords:=2;
+    ServerFilter:='ID>=1';
+    Open;
+    CheckEquals(1, FieldByName('ID').AsInteger);
+    ServerFilter:='ID>=21';
+    CheckEquals(21, FieldByName('ID').AsInteger);
+    Close;
   end;
 end;
 
@@ -2058,7 +2067,7 @@ begin
     begin
     Query2 := GetNDataset(0) as TSQLQuery;
 
-    AssertEquals(-1, Query.RowsAffected);
+    CheckEquals(-1, Query.RowsAffected, 'Inactive dataset');
     Connection.ExecuteDirect('create table FPDEV2 (' +
                               '  ID INT NOT NULL,  ' +
                               '  NAME VARCHAR(250),' +