summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2014-04-06 11:22:49 +0000
committermichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2014-04-06 11:22:49 +0000
commit18d231ddfbd274db78f3c2f0c5bf735c6ed0074a (patch)
tree850284625afcb0b2aa57ce5c8bc22979878ffd05
parent3f1ab2c539855ce0ea2abbc407ec5f5d9f6dcf18 (diff)
downloadfpc-18d231ddfbd274db78f3c2f0c5bf735c6ed0074a.tar.gz
* Only put unbound params in the list of fieldnames (bug ID 25955)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@27482 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--packages/fcl-db/src/base/datasource.inc18
1 files changed, 12 insertions, 6 deletions
diff --git a/packages/fcl-db/src/base/datasource.inc b/packages/fcl-db/src/base/datasource.inc
index d0414b7569..c63afb518b 100644
--- a/packages/fcl-db/src/base/datasource.inc
+++ b/packages/fcl-db/src/base/datasource.inc
@@ -463,6 +463,8 @@ Var
DS : TDataset;
F : TField;
I : Integer;
+ P : TParam;
+
begin
FN:='';
@@ -472,13 +474,17 @@ begin
F:=Nil;
For I:=0 to FParams.Count-1 do
begin
- If Assigned(DS) then
- F:=DS.FindField(FParams[i].Name);
- If (Not Assigned(DS)) or (not DS.Active) or (F<>Nil) then
+ P:=FParams[i];
+ if not P.Bound then
begin
- If (FN<>'') then
- FN:=FN+';';
- FN:=FN+FParams[i].Name;
+ If Assigned(DS) then
+ F:=DS.FindField(P.Name);
+ If (Not Assigned(DS)) or (not DS.Active) or (F<>Nil) then
+ begin
+ If (FN<>'') then
+ FN:=FN+';';
+ FN:=FN+P.Name;
+ end;
end;
end;
end;