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

fcl-db: base: fix TBlobField.SetBlobType. Bug #28103

Browse Source 
git-svn-id: trunk@30880 -
This commit is contained in:
lacak 2015-05-18 06:04:13 +00:00
parent b5081d76c6
commit d5570fb4c4
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,8 +866,7 @@ type
// This type is needed for compatibility. While it should contain only blob
// types, it actually does not.
// Instead of this, please use ftBlobTypes
TBlobType = ftBlob..ftWideMemo deprecated
'Warning: Does not contain BLOB types. Please use ftBlobTypes.';
TBlobType = ftBlob..ftWideMemo deprecated 'Warning: Does not contain BLOB types. Please use ftBlobTypes.';
TBlobField = class(TField)
private
@ -876,7 +875,7 @@ type
Function GetBlobStream (Mode : TBlobStreamMode) : TStream;
// Wrapper that retrieves FDataType as a TBlobType
function GetBlobType: TBlobType;
// Wrapper that calls SetFieldtype
// Wrapper that calls SetFieldType
procedure SetBlobType(AValue: TBlobType);
protected
procedure FreeBuffers; override;
@ -906,7 +905,7 @@ type
property Value: string read GetAsString write SetAsString;
property Transliterate: Boolean read FTransliterate write FTransliterate;
published
property BlobType: TBlobType read GetBlobType write SetBlobType;
property BlobType: TBlobType read GetBlobType write SetBlobType default ftBlob;
property Size default 0;
end;

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

@ -1047,7 +1047,7 @@ end;
procedure TStringField.SetFieldType(AValue: TFieldType);
begin
if avalue in [ftString, ftFixedChar] then
if AValue in [ftString, ftFixedChar] then
SetDataType(AValue);
end;
@ -1264,7 +1264,7 @@ end;
procedure TWideStringField.SetFieldType(AValue: TFieldType);
begin
if avalue in [ftWideString, ftFixedWideChar] then
if AValue in [ftWideString, ftFixedWideChar] then
SetDataType(AValue);
end;
@ -1405,7 +1405,7 @@ constructor TLongintField.Create(AOwner: TComponent);
begin
Inherited Create(AOwner);
SetDatatype(ftinteger);
SetDataType(ftInteger);
FMinRange:=Low(LongInt);
FMaxRange:=High(LongInt);
FValidchars:=['+','-','0'..'9'];
@ -1574,7 +1574,7 @@ constructor TLargeintField.Create(AOwner: TComponent);
begin
Inherited Create(AOwner);
SetDatatype(ftLargeint);
SetDataType(ftLargeint);
FMinRange:=Low(Largeint);
FMaxRange:=High(Largeint);
FValidchars:=['+','-','0'..'9'];
@ -1937,7 +1937,7 @@ constructor TFloatField.Create(AOwner: TComponent);
begin
Inherited Create(AOwner);
SetDatatype(ftFloat);
SetDataType(ftFloat);
FPrecision:=15;
FValidChars := [DecimalSeparator, '+', '-', '0'..'9', 'E', 'e'];
end;
@ -2782,7 +2782,7 @@ end;
procedure TBlobField.SetBlobType(AValue: TBlobType);
begin
SetFieldType(TFieldType(BlobType));
SetFieldType(TFieldType(AValue));
end;
procedure TBlobField.FreeBuffers;
@ -3051,7 +3051,7 @@ end;
procedure TBlobField.SetFieldType(AValue: TFieldType);
begin
if AValue in ftBlobTypes then
SetDatatype(AValue);
SetDataType(AValue);
end;
{ TMemoField }