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

- Renamed TSQLQuery.Filter and Filtered to ServerFilter and ServerFiltered

Browse Source 
git-svn-id: trunk@5494 -
This commit is contained in:
joost 2006-11-26 16:54:16 +00:00
parent 0c64a02826
commit 38213ba71e
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fcl/db/sqldb/sqldb.pp
View File

@ -193,6 +193,9 @@ type
FMasterLink : TMasterParamsDatalink; FMasterLink : TMasterParamsDatalink;
// FSchemaInfo : TSchemaInfo; // FSchemaInfo : TSchemaInfo;
FServerFilterText : string;
FServerFiltered : Boolean;
FUpdateQry, FUpdateQry,
FDeleteQry, FDeleteQry,
FInsertQry : TSQLQuery; FInsertQry : TSQLQuery;
@ -228,8 +231,8 @@ type
procedure ApplyRecUpdate(UpdateKind : TUpdateKind); override; procedure ApplyRecUpdate(UpdateKind : TUpdateKind); override;
Function IsPrepared : Boolean; virtual; Function IsPrepared : Boolean; virtual;
Procedure SetActive (Value : Boolean); override; Procedure SetActive (Value : Boolean); override;
procedure SetFiltered(Value: Boolean); override; procedure SetServerFiltered(Value: Boolean); virtual;
procedure SetFilterText(const Value: string); override; procedure SetServerFilterText(const Value: string); virtual;
Function GetDataSource : TDatasource; override; Function GetDataSource : TDatasource; override;
Procedure SetDataSource(AValue : TDatasource); Procedure SetDataSource(AValue : TDatasource);
procedure LoadBlobIntoStream(Field: TField;AStream: TStream); override; procedure LoadBlobIntoStream(Field: TField;AStream: TStream); override;
@ -245,8 +248,10 @@ type
published published
// redeclared data set properties // redeclared data set properties
property Active; property Active;
property Filter; // property Filter;
property Filtered; // property Filtered;
property ServerFilter: string read FServerFilterText write SetServerFilterText;
property ServerFiltered: Boolean read FServerFiltered write SetServerFiltered default False;
// property FilterOptions; // property FilterOptions;
property BeforeOpen; property BeforeOpen;
property AfterOpen; property AfterOpen;
@ -696,7 +701,7 @@ begin
s := FSQLBuf; s := FSQLBuf;
if Filtered then s := AddFilter(s); if ServerFiltered then s := AddFilter(s);
(Database as tsqlconnection).PrepareStatement(Fcursor,(transaction as tsqltransaction),S,FParams); (Database as tsqlconnection).PrepareStatement(Fcursor,(transaction as tsqltransaction),S,FParams);
@ -715,22 +720,22 @@ begin
end; end;
procedure TSQLQuery.SetFiltered(Value: Boolean); procedure TSQLQuery.SetServerFiltered(Value: Boolean);
begin begin
if Value and not FParseSQL then DatabaseErrorFmt(SNoParseSQL,['Filtering ']); if Value and not FParseSQL then DatabaseErrorFmt(SNoParseSQL,['Filtering ']);
if (Filtered <> Value) then if (ServerFiltered <> Value) then
begin begin
inherited setfiltered(Value); FServerFiltered := Value;
if active then ApplyFilter; if active then ApplyFilter;
end; end;
end; end;
procedure TSQLQuery.SetFilterText(const Value: string); procedure TSQLQuery.SetServerFilterText(const Value: string);
begin begin
if Value <> Filter then if Value <> ServerFilter then
begin begin
inherited SetFilterText(Value); FServerFilterText := Value;
if active then ApplyFilter; if active then ApplyFilter;
end; end;
end; end;
@ -764,7 +769,7 @@ begin
SQLParser(FSQLBuf); SQLParser(FSQLBuf);
if filtered then if ServerFiltered then
Db.PrepareStatement(Fcursor,sqltr,AddFilter(FSQLBuf),FParams) Db.PrepareStatement(Fcursor,sqltr,AddFilter(FSQLBuf),FParams)
else else
Db.PrepareStatement(Fcursor,sqltr,FSQLBuf,FParams); Db.PrepareStatement(Fcursor,sqltr,FSQLBuf,FParams);
@ -1084,6 +1089,10 @@ begin
FIndexDefs := TIndexDefs.Create(Self); FIndexDefs := TIndexDefs.Create(Self);
FReadOnly := false; FReadOnly := false;
FParseSQL := True; FParseSQL := True;
FServerFiltered := False;
FServerFilterText := '';
// Delphi has upWhereAll as default, but since strings and oldvalue's don't work yet // Delphi has upWhereAll as default, but since strings and oldvalue's don't work yet
// (variants) set it to upWhereKeyOnly // (variants) set it to upWhereKeyOnly
FUpdateMode := upWhereKeyOnly; FUpdateMode := upWhereKeyOnly;
@ -1124,7 +1133,7 @@ begin
if not AValue then if not AValue then
begin begin
FReadOnly := True; FReadOnly := True;
Filtered := False; FServerFiltered := False;
FParseSQL := False; FParseSQL := False;
end end
else else