ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/IBCustomDataSet.pas
(Generate patch)

Comparing ibx/trunk/runtime/IBCustomDataSet.pas (file contents):
Revision 7 by tony, Sun Aug 5 18:28:19 2012 UTC vs.
Revision 15 by tony, Thu Feb 28 16:56:14 2013 UTC

# Line 934 | Line 934 | end;
934  
935   procedure TIBCustomDataSet.ApplyUpdates;
936   var
937 <  {$IF FPC_FULLVERSION > 20600 }
937 >  {$IF FPC_FULLVERSION > 20602 }
938    CurBookmark: TBookmark;
939    {$ELSE}
940    CurBookmark: string;
# Line 1626 | Line 1626 | function TIBCustomDataSet.InternalLocate
1626    const KeyValues: Variant; Options: TLocateOptions): Boolean;
1627   var
1628    keyFieldList: TList;
1629 <  {$IF FPC_FULLVERSION > 20600 }
1629 >  {$IF FPC_FULLVERSION >  20602 }
1630    CurBookmark: TBookmark;
1631    {$ELSE}
1632    CurBookmark: string;
# Line 2493 | Line 2493 | end;
2493   procedure TIBCustomDataSet.FetchAll;
2494   var
2495    SetCursor: Boolean;
2496 <  {$IF FPC_FULLVERSION > 20600 }
2496 >  {$IF FPC_FULLVERSION >  20602 }
2497    CurBookmark: TBookmark;
2498    {$ELSE}
2499    CurBookmark: string;
# Line 3386 | Line 3386 | end;
3386   function TIBCustomDataSet.Locate(const KeyFields: string; const KeyValues: Variant;
3387                                   Options: TLocateOptions): Boolean;
3388   var
3389 <  {$IF FPC_FULLVERSION > 20600 }
3389 >  {$IF FPC_FULLVERSION >  20602 }
3390    CurBookmark: TBookmark;
3391    {$ELSE}
3392    CurBookmark: string;
# Line 3408 | Line 3408 | function TIBCustomDataSet.Lookup(const K
3408                                   const ResultFields: string): Variant;
3409   var
3410    fl: TList;
3411 <  {$IF FPC_FULLVERSION > 20600 }
3411 >  {$IF FPC_FULLVERSION >  20602 }
3412    CurBookmark: TBookmark;
3413    {$ELSE}
3414    CurBookmark: string;
# Line 4031 | Line 4031 | end;
4031  
4032   procedure TIBGenerator.Apply;
4033   begin
4034 <  if (FGeneratorName <> '') and (FFieldName <> '')  then
4034 >  if (FGeneratorName <> '') and (FFieldName <> '') and Owner.FieldByName(FFieldName).IsNull then
4035      Owner.FieldByName(FFieldName).AsInteger := GetNextValue(Owner.Database,Owner.Transaction);
4036   end;
4037  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines