Parcourir la source

* Fix serverfilter and Refresh

git-svn-id: trunk@43039 -
michael il y a 5 ans
Parent
commit
64795253ae
1 fichiers modifiés avec 5 ajouts et 8 suppressions
  1. 5 8
      packages/fcl-db/src/sqldb/sqldb.pp

+ 5 - 8
packages/fcl-db/src/sqldb/sqldb.pp

@@ -2899,13 +2899,9 @@ end;
 procedure TCustomSQLQuery.ApplyFilter;
 procedure TCustomSQLQuery.ApplyFilter;
 
 
 begin
 begin
-  FreeFldBuffers;
-  FStatement.Unprepare;
-  FIsEOF := False;
-  inherited InternalClose;
-  FStatement.DoPrepare;
-  FStatement.DoExecute;
-  inherited InternalOpen;
+  if Prepared then
+    FStatement.Unprepare;
+  InternalRefresh;
   First;
   First;
 end;
 end;
 
 
@@ -2940,7 +2936,8 @@ end;
 procedure TCustomSQLQuery.UnPrepare;
 procedure TCustomSQLQuery.UnPrepare;
 
 
 begin
 begin
-  CheckInactive;
+  if Not Refreshing then
+    CheckInactive;
   If Assigned(FStatement) then
   If Assigned(FStatement) then
     FStatement.Unprepare;
     FStatement.Unprepare;
 end;
 end;