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

* Fix for ValueOfKey for multiple-fields keys

Browse Source 
git-svn-id: trunk@10519 -
This commit is contained in:
joost 2008-03-21 13:38:44 +00:00
parent bd4b3dfa61
commit 805bcf1c1d
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2304,12 +2304,33 @@ end;
function TLookupList.ValueOfKey(const AKey: Variant): Variant; function TLookupList.ValueOfKey(const AKey: Variant): Variant;
Function VarArraySameValues(VarArray1,VarArray2 : Variant) : Boolean;
// This only works for one-dimensional vararrays with a lower bound of 0
// and equal higher bounds wich only contains variants.
// The vararrays returned by GetFieldValues do apply.
var i : integer;
begin
Result := True;
if (VarArrayHighBound(VarArray1,1))<> (VarArrayHighBound(VarArray2,1)) then exit;
for i := 0 to VarArrayHighBound(VarArray1,1) do
begin
if VarArray1[i]<>VarArray2[i] then
begin
Result := false;
Exit;
end;
end;
end;
var I: Integer; var I: Integer;
begin begin
Result := Null; Result := Null;
if VarIsNull(AKey) then Exit; if VarIsNull(AKey) then Exit;
i := FList.Count - 1; i := FList.Count - 1;
while (i > 0) And (PLookupListRec(FList.Items[I])^.Key <> AKey) do Dec(i); if VarIsArray(AKey) then
while (i > 0) And not VarArraySameValues(PLookupListRec(FList.Items[I])^.Key,AKey) do Dec(i)
else
while (i > 0) And (PLookupListRec(FList.Items[I])^.Key <> AKey) do Dec(i);
if i >= 0 then Result := PLookupListRec(FList.Items[I])^.Value; if i >= 0 then Result := PLookupListRec(FList.Items[I])^.Value;
end; end;