paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 20:29:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

sqliteds: simplify FindRecordItem and SetFieldData handling of double values since comparison of double is not done by string value anymore

Browse Source 
git-svn-id: trunk@19603 -
This commit is contained in:
blikblum 2011-11-07 16:55:11 +00:00
parent f55bf0ff05
commit c1ccac04ca
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/fcl-db/src/sqlite/customsqliteds.pas
View File

@ -1099,7 +1099,6 @@ var
AFieldList: TList;
i, AFieldCount: Integer;
MatchRecord: Boolean;
AValue: String;
TempItem: PDataRecord;
begin
@ -1169,10 +1168,9 @@ begin
LocateFields[i].CompFunction := @CompDouble;
//get float types in appropriate format
if VarIsArray(KeyValues) then
Str(VarToDateTime(keyvalues[i]), AValue)
Str(VarToDateTime(keyvalues[i]), LocateFields[i].Key)
else
Str(VarToDateTime(keyvalues), AValue);
LocateFields[i].Key := Trim(AValue);
Str(VarToDateTime(keyvalues), LocateFields[i].Key);
end;
LocateFields[i].Index := FieldNo - 1;
end;
@ -1324,8 +1322,7 @@ procedure TCustomSqliteDataset.SetFieldData(Field: TField; Buffer: Pointer;
NativeFormat: Boolean);
var
TempStr: String;
FloatStr: PChar;
FloatLen, FieldOffset: Integer;
FieldOffset: Integer;
EditItem: PDataRecord;
begin
if not (State in [dsEdit, dsInsert, dsCalcFields]) then
@ -1371,21 +1368,8 @@ begin
ftFloat, ftDateTime, ftDate, ftTime, ftCurrency:
begin
Str(Double(Buffer^), TempStr);
//Str returns an space as the first character for positive values
//and the - sign for negative values. It's necessary to remove the extra
//space while keeping the - sign
if TempStr[1] = ' ' then
begin
FloatStr := PChar(TempStr) + 1;
FloatLen := Length(TempStr);
end
else
begin
FloatStr := PChar(TempStr);
FloatLen := Length(TempStr) + 1;
end;
EditItem^.Row[FieldOffset] := StrAlloc(FloatLen);
Move(FloatStr^, (EditItem^.Row[FieldOffset])^, FloatLen);
EditItem^.Row[FieldOffset] := StrAlloc(Length(TempStr) + 1);
Move(PChar(TempStr)^, (EditItem^.Row[FieldOffset])^, Length(TempStr) + 1);
end;
ftLargeInt:
begin