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

* fcl-db: set blob field type for blob fields in SetDataType; fixes mantis issue #26064

Browse Source 
git-svn-id: trunk@27645 -
This commit is contained in:
reiniero 2014-04-24 14:04:47 +00:00
parent 9191f44c6e
commit 7702488182
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,7 +368,7 @@ type
procedure SetAsString(const AValue: string); virtual; procedure SetAsString(const AValue: string); virtual;
procedure SetAsWideString(const AValue: WideString); virtual; procedure SetAsWideString(const AValue: WideString); virtual;
procedure SetDataset(AValue : TDataset); virtual; procedure SetDataset(AValue : TDataset); virtual;
procedure SetDataType(AValue: TFieldType); procedure SetDataType(AValue: TFieldType); virtual;
procedure SetNewValue(const AValue: Variant); procedure SetNewValue(const AValue: Variant);
procedure SetSize(AValue: Integer); virtual; procedure SetSize(AValue: Integer); virtual;
procedure SetParentComponent(AParent: TComponent); override; procedure SetParentComponent(AParent: TComponent); override;
@ -880,6 +880,7 @@ type
procedure GetText(var TheText: string; ADisplayText: Boolean); override; procedure GetText(var TheText: string; ADisplayText: Boolean); override;
procedure SetAsBytes(const AValue: TBytes); override; procedure SetAsBytes(const AValue: TBytes); override;
procedure SetAsString(const AValue: string); override; procedure SetAsString(const AValue: string); override;
procedure SetDataType(AValue: TFieldType); override;
procedure SetText(const AValue: string); override; procedure SetText(const AValue: string); override;
procedure SetVarValue(const AValue: Variant); override; procedure SetVarValue(const AValue: Variant); override;
procedure SetAsWideString(const AValue: WideString); override; procedure SetAsWideString(const AValue: WideString); override;

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

@ -805,13 +805,11 @@ end;
procedure TField.SetAsLongint(AValue: Longint); procedure TField.SetAsLongint(AValue: Longint);
begin begin
SetAsInteger(AValue); SetAsInteger(AValue);
end; end;
procedure TField.SetAsInteger(AValue: Longint); procedure TField.SetAsInteger(AValue: Longint);
begin begin
raise AccessError(SInteger); raise AccessError(SInteger);
end; end;
@ -822,7 +820,6 @@ begin
end; end;
procedure TField.SetAsString(const AValue: string); procedure TField.SetAsString(const AValue: string);
begin begin
Raise AccessError(SString); Raise AccessError(SString);
end; end;
@ -1915,7 +1912,7 @@ constructor TFloatField.Create(AOwner: TComponent);
begin begin
Inherited Create(AOwner); Inherited Create(AOwner);
SetDatatype(ftfloat); SetDatatype(ftFloat);
FPrecision:=15; FPrecision:=15;
FValidChars := [DecimalSeparator, '+', '-', '0'..'9', 'E', 'e']; FValidChars := [DecimalSeparator, '+', '-', '0'..'9', 'E', 'e'];
end; end;
@ -2386,7 +2383,7 @@ constructor TVarBytesField.Create(AOwner: TComponent);
begin begin
INherited Create(AOwner); INherited Create(AOwner);
SetDataType(ftvarbytes); SetDataType(ftVarBytes);
Size:=16; Size:=16;
end; end;
@ -2897,6 +2894,13 @@ begin
end; end;
end; end;
procedure TBlobField.SetDataType(AValue: TFieldType);
begin
inherited SetDataType(AValue);
If AValue in [Low(TBlobType)..High(TBlobType)] then
FBlobType := AValue;
end;
procedure TBlobField.SetAsWideString(const AValue: WideString); procedure TBlobField.SetAsWideString(const AValue: WideString);
var var