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

* Fix bug ID #35887

Browse Source 
git-svn-id: trunk@42831 -
This commit is contained in:
michael 2019-08-26 18:32:59 +00:00
parent db849a4a79
commit 25681cc2a3
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,7 +508,6 @@ type
procedure SetUpdateMode(AValue : TUpdateMode); procedure SetUpdateMode(AValue : TUpdateMode);
procedure OnChangeModifySQL(Sender : TObject); procedure OnChangeModifySQL(Sender : TObject);
procedure Execute; procedure Execute;
procedure ApplyFilter;
Function AddFilter(SQLstr : string) : string; Function AddFilter(SQLstr : string) : string;
protected protected
function CreateSQLStatement(aOwner: TComponent): TCustomSQLStatement; virtual; function CreateSQLStatement(aOwner: TComponent): TCustomSQLStatement; virtual;
@ -2696,19 +2695,6 @@ begin
end; end;
end; end;
procedure TCustomSQLQuery.ApplyFilter;
begin
FreeFldBuffers;
FStatement.Unprepare;
FIsEOF := False;
inherited InternalClose;
FStatement.DoPrepare;
FStatement.DoExecute;
inherited InternalOpen;
First;
end;
procedure TCustomSQLQuery.SetActive(Value: Boolean); procedure TCustomSQLQuery.SetActive(Value: Boolean);
begin begin
@ -2727,7 +2713,11 @@ begin
if (ServerFiltered <> Value) then if (ServerFiltered <> Value) then
begin begin
FServerFiltered := Value; FServerFiltered := Value;
if Active then ApplyFilter; if Active then
begin
Close;
Open;
end;
end; end;
end; end;
@ -2736,7 +2726,11 @@ begin
if Value <> ServerFilter then if Value <> ServerFilter then
begin begin
FServerFilterText := Value; FServerFilterText := Value;
if Active then ApplyFilter; if Active then
begin
Close;
Open;
end;
end; end;
end; end;