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

* Introduced factory possibility for TParams, TFieldDefs

Browse Source 
git-svn-id: trunk@26771 -
This commit is contained in:
michael 2014-02-14 15:00:51 +00:00
parent 8c5e1550a5
commit a9f1a8ae0b
4 changed files with 240 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

349
packages/fcl-db/src/base/dataset.inc
View File

File diff suppressed because it is too large Load Diff

17
packages/fcl-db/src/base/db.pas
View File

@ -198,7 +198,7 @@ type
property Precision: Longint read FPrecision write SetPrecision;
property Size: Integer read FSize write SetSize;
end;
TFieldDefClass = Class of TFieldDef;
{ TFieldDefs }
TFieldDefs = class(TDefCollection)
@ -206,6 +206,8 @@ type
FHiddenFields : Boolean;
function GetItem(Index: Longint): TFieldDef;
procedure SetItem(Index: Longint; const AValue: TFieldDef);
Protected
Class Function FieldDefClass : TFieldDefClass; virtual;
public
constructor Create(ADataSet: TDataSet);
// destructor Destroy; override;
@ -222,6 +224,7 @@ type
Property HiddenFields : Boolean Read FHiddenFields Write FHiddenFields;
property Items[Index: Longint]: TFieldDef read GetItem write SetItem; default;
end;
TFieldDefsClass = Class of TFieldDefs;
{ TField }
@ -1107,7 +1110,7 @@ type
Property Dataset : TDataset Read FDataset;
Property Fields [Index : Integer] : TField Read GetField Write SetField; default;
end;
TFieldsClass = Class of TFields;
{ TParam }
@ -1214,7 +1217,7 @@ type
Property Size : Integer read FSize write FSize default 0;
Property Value : Variant read GetAsVariant write SetAsVariant stored IsParamStored;
end;
TParamClass = Class of TParam;
{ TParams }
@ -1229,7 +1232,9 @@ type
Procedure AssignTo(Dest: TPersistent); override;
Function GetDataSet: TDataSet;
Function GetOwner: TPersistent; override;
Class Function ParamClass : TParamClass; virtual;
public
Constructor Create(AOwner: TPersistent; AItemClass : TCollectionItemClass); overload;
Constructor Create(AOwner: TPersistent); overload;
Constructor Create; overload;
Procedure AddParam(Value: TParam);
@ -1383,7 +1388,7 @@ type
FDisableControlsCount : Integer;
FDisableControlsState : TDatasetState;
FCurrentRecord: Longint;
FDataSources : TList;
FDataSources : TFPList;
FDefaultFields: Boolean;
FEOF: Boolean;
FEnableControlsEvent : TDataEvent;
@ -1566,6 +1571,8 @@ type
procedure PSSetCommandText(const CommandText: string); virtual;
procedure PSSetParams(AParams: TParams); virtual;
procedure PSStartTransaction; virtual;
class function FieldDefsClass : TFieldDefsClass; virtual;
class function FieldsClass : TFieldsClass; virtual;
function PSUpdateRecord(UpdateKind: TUpdateKind; Delta: TDataSet)
: Boolean; virtual;
public
@ -2200,7 +2207,7 @@ procedure TNamedItem.SetDisplayName(const AValue: string);
Var TmpInd : Integer;
begin
if FName=AValue then exit;
if (AValue <> '') and (Collection is TFieldDefs) then
if (AValue <> '') and (Collection is TFieldDefs ) then
begin
TmpInd := (TDefCollection(Collection).IndexOf(AValue));
if (TmpInd >= 0) and (TmpInd <> Index) then

61
packages/fcl-db/src/base/dsparams.inc
View File

@ -24,27 +24,27 @@ end;
{ TParams }
Function TParams.GetItem(Index: Integer): TParam;
function TParams.GetItem(Index: Integer): TParam;
begin
Result:=(Inherited GetItem(Index)) as TParam;
end;
Function TParams.GetParamValue(const ParamName: string): Variant;
function TParams.GetParamValue(const ParamName: string): Variant;
begin
Result:=ParamByName(ParamName).Value;
end;
Procedure TParams.SetItem(Index: Integer; Value: TParam);
procedure TParams.SetItem(Index: Integer; Value: TParam);
begin
Inherited SetItem(Index,Value);
end;
Procedure TParams.SetParamValue(const ParamName: string; const Value: Variant);
procedure TParams.SetParamValue(const ParamName: string; const Value: Variant);
begin
ParamByName(ParamName).Value:=Value;
end;
Procedure TParams.AssignTo(Dest: TPersistent);
procedure TParams.AssignTo(Dest: TPersistent);
begin
if (Dest is TParams) then
TParams(Dest).Assign(Self)
@ -52,7 +52,7 @@ begin
inherited AssignTo(Dest);
end;
Function TParams.GetDataSet: TDataSet;
function TParams.GetDataSet: TDataSet;
begin
If (FOwner is TDataset) Then
Result:=TDataset(FOwner)
@ -60,16 +60,27 @@ begin
Result:=Nil;
end;
Function TParams.GetOwner: TPersistent;
function TParams.GetOwner: TPersistent;
begin
Result:=FOwner;
end;
class function TParams.ParamClass: TParamClass;
begin
Result:=TParam;
end;
constructor TParams.Create(AOwner: TPersistent; AItemClass: TCollectionItemClass
);
begin
Inherited Create(AItemClass);
FOwner:=AOwner;
end;
constructor TParams.Create(AOwner: TPersistent);
begin
Inherited Create(TParam);
Fowner:=AOwner;
Create(AOwner,ParamClass);
end;
constructor TParams.Create;
@ -77,12 +88,12 @@ begin
Create(TPersistent(Nil));
end;
Procedure TParams.AddParam(Value: TParam);
procedure TParams.AddParam(Value: TParam);
begin
Value.Collection:=Self;
end;
Procedure TParams.AssignValues(Value: TParams);
procedure TParams.AssignValues(Value: TParams);
Var
I : Integer;
@ -98,7 +109,7 @@ begin
end;
end;
Function TParams.CreateParam(FldType: TFieldType; const ParamName: string;
function TParams.CreateParam(FldType: TFieldType; const ParamName: string;
ParamType: TParamType): TParam;
begin
@ -108,7 +119,7 @@ begin
Result.ParamType:=ParamType;
end;
Function TParams.FindParam(const Value: string): TParam;
function TParams.FindParam(const Value: string): TParam;
Var
I : Integer;
@ -123,7 +134,7 @@ begin
Dec(i);
end;
Procedure TParams.GetParamList(List: TList; const ParamNames: string);
procedure TParams.GetParamList(List: TList; const ParamNames: string);
Var
P: TParam;
@ -141,7 +152,7 @@ begin
until StrPos > Length(ParamNames);
end;
Function TParams.IsEqual(Value: TParams): Boolean;
function TParams.IsEqual(Value: TParams): Boolean;
Var
I : Integer;
@ -156,14 +167,14 @@ begin
end;
end;
Function TParams.ParamByName(const Value: string): TParam;
function TParams.ParamByName(const Value: string): TParam;
begin
Result:=FindParam(Value);
If (Result=Nil) then
DatabaseErrorFmt(SParameterNotFound,[Value],Dataset);
end;
Function TParams.ParseSQL(SQL: String; DoCreate: Boolean): String;
function TParams.ParseSQL(SQL: String; DoCreate: Boolean): String;
var pb : TParamBinding;
rs : string;
@ -172,7 +183,8 @@ begin
Result := ParseSQL(SQL,DoCreate,True,True,psInterbase, pb, rs);
end;
Function TParams.ParseSQL(SQL: String; DoCreate, EscapeSlash, EscapeRepeat : Boolean; ParameterStyle : TParamStyle): String;
function TParams.ParseSQL(SQL: String; DoCreate, EscapeSlash,
EscapeRepeat: Boolean; ParameterStyle: TParamStyle): String;
var pb : TParamBinding;
rs : string;
@ -181,7 +193,9 @@ begin
Result := ParseSQL(SQL,DoCreate,EscapeSlash,EscapeRepeat,ParameterStyle,pb, rs);
end;
Function TParams.ParseSQL(SQL: String; DoCreate, EscapeSlash, EscapeRepeat : Boolean; ParameterStyle : TParamStyle; out ParamBinding: TParambinding): String;
function TParams.ParseSQL(SQL: String; DoCreate, EscapeSlash,
EscapeRepeat: Boolean; ParameterStyle: TParamStyle; out
ParamBinding: TParambinding): String;
var rs : string;
@ -232,7 +246,9 @@ begin
end; {case}
end;
Function TParams.ParseSQL(SQL: String; DoCreate, EscapeSlash, EscapeRepeat: Boolean; ParameterStyle : TParamStyle; out ParamBinding: TParambinding; out ReplaceString : string): String;
function TParams.ParseSQL(SQL: String; DoCreate, EscapeSlash,
EscapeRepeat: Boolean; ParameterStyle: TParamStyle; out
ParamBinding: TParambinding; out ReplaceString: string): String;
type
// used for ParamPart
@ -419,7 +435,7 @@ begin
end;
Procedure TParams.RemoveParam(Value: TParam);
procedure TParams.RemoveParam(Value: TParam);
begin
Value.Collection:=Nil;
end;
@ -1085,7 +1101,8 @@ begin
end;
Procedure TParams.CopyParamValuesFromDataset(ADataset : TDataset; CopyBound : Boolean);
procedure TParams.CopyParamValuesFromDataset(ADataset: TDataset;
CopyBound: Boolean);
Var
I : Integer;

11
packages/fcl-db/src/base/fields.inc
View File

@ -214,9 +214,14 @@ begin
inherited Items[Index] := AValue;
end;
constructor TFieldDefs.Create(ADataset: TDataset);
class function TFieldDefs.FieldDefClass: TFieldDefClass;
begin
Inherited Create(ADataset, Owner, TFieldDef);
Result:=TFieldDef;
end;
constructor TFieldDefs.Create(ADataSet: TDataSet);
begin
Inherited Create(ADataset, Owner, FieldDefClass);
end;
procedure TFieldDefs.Assign(FieldDefs: TFieldDefs);
@ -271,7 +276,7 @@ begin
end;
end;
Function TFieldDefs.AddFieldDef : TFieldDef;
function TFieldDefs.AddFieldDef: TFieldDef;
begin
Result:=TFieldDef.Create(Self,'',ftUnknown,0,False,Count+1);