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 1 by tony, Mon Jul 31 16:43:00 2000 UTC vs.
Revision 104 by tony, Thu Jan 18 14:37:29 2018 UTC

# Line 24 | Line 24
24   {       Corporation. All Rights Reserved.                                }
25   {    Contributor(s): Jeff Overcash                                       }
26   {                                                                        }
27 + {    IBX For Lazarus (Firebird Express)                                  }
28 + {    Contributor: Tony Whyman, MWA Software http://www.mwasoftware.co.uk }
29 + {    Portions created by MWA Software are copyright McCallum Whyman      }
30 + {    Associates Ltd 2011 - 2015                                                }
31 + {                                                                        }
32   {************************************************************************}
33  
34   unit IBCustomDataSet;
35  
36 + {$R-}
37 +
38 + {$IFDEF FPC}
39 + {$Mode Delphi}
40 + {$codepage UTF8}
41 + {$ENDIF}
42 +
43 + {$IFDEF DELPHI}
44 + {$DEFINE TDBDFIELD_IS_BCD}
45 + {$ENDIF}
46 +
47   interface
48  
49   uses
50 <  Windows, SysUtils, Classes, Forms, Controls, StdVCL,
51 <  IBExternals, IB, IBHeader, IBDatabase, IBSQL, Db,
52 <  IBUtils, IBBlob;
50 > {$IFDEF WINDOWS }
51 >  Windows,
52 > {$ELSE}
53 >  unix,
54 > {$ENDIF}
55 >  SysUtils, Classes, IBDatabase, IBExternals, IB,  IBSQL, Db,
56 >  IBUtils, IBBlob, IBSQLParser, IBDatabaseInfo;
57  
58   const
59    BufferCacheSize    =  1000;  { Allocate cache in this many record chunks}
# Line 43 | Line 63 | type
63    TIBCustomDataSet = class;
64    TIBDataSet = class;
65  
66 +  { TIBDataSetUpdateObject }
67 +
68    TIBDataSetUpdateObject = class(TComponent)
69    private
70      FRefreshSQL: TStrings;
# Line 50 | Line 72 | type
72    protected
73      function GetDataSet: TIBCustomDataSet; virtual; abstract;
74      procedure SetDataSet(ADataSet: TIBCustomDataSet); virtual; abstract;
75 <    procedure Apply(UpdateKind: TUpdateKind); virtual; abstract;
75 >    procedure Apply(UpdateKind: TUpdateKind; buff: PChar); virtual; abstract;
76      function GetSQL(UpdateKind: TUpdateKind): TStrings; virtual; abstract;
77 +    procedure InternalSetParams(Params: ISQLParams; buff: PChar); overload;
78 +    procedure InternalSetParams(Query: TIBSQL; buff: PChar); overload;
79 +    procedure UpdateRecordFromQuery(QryResults: IResults; Buffer: PChar);
80      property DataSet: TIBCustomDataSet read GetDataSet write SetDataSet;
81    public
82      constructor Create(AOwner: TComponent); override;
# Line 60 | Line 85 | type
85      property RefreshSQL: TStrings read FRefreshSQL write SetRefreshSQL;
86    end;
87  
63  PDateTime = ^TDateTime;
88    TBlobDataArray = array[0..0] of TIBBlobStream;
89    PBlobDataArray = ^TBlobDataArray;
90 +  TIBArrayField = class;
91  
92 <  { TIBCustomDataSet }
93 <  TFieldData = record
94 <    fdDataType: Short;
95 <    fdDataScale: Short;
96 <    fdNullable: Boolean;
97 <    fdIsNull: Boolean;
98 <    fdDataSize: Short;
99 <    fdDataLength: Short;
100 <    fdDataOfs: Integer;
92 >  { TIBArray }
93 >
94 >  {Wrapper class to support array cache in TIBCustomDataset and event handling}
95 >
96 >  TIBArray = class
97 >  private
98 >    FArray: IArray;
99 >    FRecNo: integer;
100 >    FField: TIBArrayField;
101 >    procedure EventHandler(Sender: IArray; Reason: TArrayEventReason);
102 >  public
103 >    constructor Create(aField: TIBArrayField; anArray: IArray);
104 >    destructor Destroy; override;
105 >    property ArrayIntf: IArray read FArray;
106    end;
107 <  PFieldData = ^TFieldData;
107 >
108 >  TArrayDataArray = array [0..0] of TIBArray;
109 >  PArrayDataArray = ^TArrayDataArray;
110 >
111 >  { TIBCustomDataSet }
112  
113    TCachedUpdateStatus = (
114                           cusUnmodified, cusModified, cusInserted,
# Line 85 | Line 119 | type
119    end;
120    PIBDBKey = ^TIBDBKey;
121  
122 +  PFieldData = ^TFieldData;
123 +  TFieldData = record
124 +   fdIsNull: Boolean;
125 +   fdDataLength: Short;
126 + end;
127 +
128 + PColumnData = ^TColumnData;
129 + TColumnData = record
130 +  fdDataType: Short;
131 +  fdDataScale: Short;
132 +  fdNullable: Boolean;
133 +  fdDataSize: Short;
134 +  fdDataOfs: Integer;
135 +  fdCodePage: TSystemCodePage;
136 + end;
137 +
138 + PFieldColumns = ^TFieldColumns;
139 + TFieldColumns =  array[1..1] of TColumnData;
140 +
141    TRecordData = record
142      rdBookmarkFlag: TBookmarkFlag;
143      rdFieldCount: Short;
144 <    rdRecordNumber: Long;
144 >    rdRecordNumber: Integer;
145      rdCachedUpdateStatus: TCachedUpdateStatus;
146      rdUpdateStatus: TUpdateStatus;
147      rdSavedOffset: DWORD;
# Line 97 | Line 150 | type
150    end;
151    PRecordData = ^TRecordData;
152  
153 +  { TIBArrayField }
154 +
155 +  TIBArrayField = class(TField)
156 +  private
157 +    FArrayBounds: TArrayBounds;
158 +    FArrayDimensions: integer;
159 +    FRelationName: string;
160 +    FCacheOffset: word;
161 +    function GetArrayID: TISC_QUAD;
162 +    function GetArrayIntf: IArray;
163 +    procedure SetArrayIntf(AValue: IArray);
164 +  protected
165 +    class procedure CheckTypeSize(AValue: Longint); override;
166 +    function GetAsString: string; override;
167 +    function GetDataSize: Integer; override;
168 +    procedure Bind(Binding: Boolean); override;
169 +  public
170 +    constructor Create(AOwner: TComponent); override;
171 +    function CreateArray: IArray;
172 +    property ArrayID: TISC_QUAD read GetArrayID;
173 +    property ArrayIntf: IArray read GetArrayIntf write SetArrayIntf;
174 +    property ArrayDimensions: integer read FArrayDimensions write FArrayDimensions;
175 +    property ArrayBounds: TArrayBounds read FArrayBounds write FArrayBounds;
176 +  end;
177 +
178    { TIBStringField allows us to have strings longer than 8196 }
179  
180    TIBStringField = class(TStringField)
181 +  private
182 +    FCharacterSetName: RawByteString;
183 +    FCharacterSetSize: integer;
184 +    FAutoFieldSize: boolean;
185 +    FCodePage: TSystemCodePage;
186 +    FDataSize: integer;
187 +  protected
188 +    procedure Bind(Binding: Boolean); override;
189 +    function GetDataSize: Integer; override;
190    public
191 <    constructor create(AOwner: TComponent); override;
191 >    constructor Create(aOwner: TComponent); override;
192      class procedure CheckTypeSize(Value: Integer); override;
193      function GetAsString: string; override;
194      function GetAsVariant: Variant; override;
195      function GetValue(var Value: string): Boolean;
196      procedure SetAsString(const Value: string); override;
197 +    property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
198 +    property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
199 +    property CodePage: TSystemCodePage read FCodePage write FCodePage;
200 +  published
201 +    property AutoFieldSize: boolean read FAutoFieldSize write FAutoFieldSize default true;
202    end;
203  
204    { TIBBCDField }
# Line 117 | Line 209 | type
209       Note: y > 4 will default to Floats
210    }
211    TIBBCDField = class(TBCDField)
212 +  private
213 +    FIdentityColumn: boolean;
214    protected
215 +    procedure Bind(Binding: Boolean); override;
216      class procedure CheckTypeSize(Value: Integer); override;
217      function GetAsCurrency: Currency; override;
218      function GetAsString: string; override;
# Line 125 | Line 220 | type
220      function GetDataSize: Integer; override;
221    public
222      constructor Create(AOwner: TComponent); override;
223 +    property IdentityColumn: boolean read FIdentityColumn;
224    published
225      property Size default 8;
226    end;
227  
228 +  {The following integer field types extend the built in versions to enable IBX appplications
229 +   to check for an Identity column}
230 +
231 +  { TIBSmallintField }
232 +
233 +  TIBSmallintField = class(TSmallintField)
234 +  private
235 +    FIdentityColumn: boolean;
236 +  protected
237 +    procedure Bind(Binding: Boolean); override;
238 +  public
239 +    property IdentityColumn: boolean read FIdentityColumn;
240 +  end;
241 +
242 +  { TIBIntegerField }
243 +
244 +  TIBIntegerField = class(TIntegerField)
245 +  private
246 +    FIdentityColumn: boolean;
247 +  protected
248 +    procedure Bind(Binding: Boolean); override;
249 +  public
250 +    property IdentityColumn: boolean read FIdentityColumn;
251 +  end;
252 +
253 +  { TIBLargeIntField }
254 +
255 +  TIBLargeIntField = class(TLargeIntField)
256 +  private
257 +    FIdentityColumn: boolean;
258 +  protected
259 +    procedure Bind(Binding: Boolean); override;
260 +  public
261 +    property IdentityColumn: boolean read FIdentityColumn;
262 +  end;
263 +
264 +  {TIBMemoField}
265 +  {Allows us to show truncated text in DBGrids and anything else that uses
266 +   DisplayText}
267 +
268 +   TIBMemoField = class(TMemoField)
269 +   private
270 +     FCharacterSetName: RawByteString;
271 +     FCharacterSetSize: integer;
272 +     FDisplayTextAsClassName: boolean;
273 +     function GetTruncatedText: string;
274 +   protected
275 +     procedure Bind(Binding: Boolean); override;
276 +     function GetAsString: string; override;
277 +     function GetDefaultWidth: Longint; override;
278 +     procedure GetText(var AText: string; ADisplayText: Boolean); override;
279 +     procedure SetAsString(const AValue: string); override;
280 +   public
281 +     constructor Create(AOwner: TComponent); override;
282 +     property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
283 +     property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
284 +   published
285 +     property DisplayTextAsClassName: boolean read FDisplayTextAsClassName
286 +                                            write FDisplayTextAsClassName;
287 +   private
288 +     FCodePage: TSystemCodePage;
289 +     FFCodePage: TSystemCodePage;
290 +   public
291 +     property CodePage: TSystemCodePage read FFCodePage write FFCodePage;
292 +   end;
293 +
294    TIBDataLink = class(TDetailDataLink)
295    private
296      FDataSet: TIBCustomDataSet;
# Line 142 | Line 304 | type
304      destructor Destroy; override;
305    end;
306  
307 +  TIBGeneratorApplyOnEvent = (gaeOnNewRecord,gaeOnPostRecord);
308 +
309 +  { TIBGenerator }
310 +
311 +  TIBGenerator = class(TPersistent)
312 +  private
313 +    FOwner: TIBCustomDataSet;
314 +    FApplyOnEvent: TIBGeneratorApplyOnEvent;
315 +    FFieldName: string;
316 +    FGeneratorName: string;
317 +    FIncrement: integer;
318 +    FQuery: TIBSQL;
319 +    function GetDatabase: TIBDatabase;
320 +    function GetTransaction: TIBTransaction;
321 +    procedure SetDatabase(AValue: TIBDatabase);
322 +    procedure SetGeneratorName(AValue: string);
323 +    procedure SetIncrement(const AValue: integer);
324 +    procedure SetTransaction(AValue: TIBTransaction);
325 +    procedure SetQuerySQL;
326 +  protected
327 +    function GetNextValue: integer;
328 +  public
329 +    constructor Create(Owner: TIBCustomDataSet);
330 +    destructor Destroy; override;
331 +    procedure Apply;
332 +    property Owner: TIBCustomDataSet read FOwner;
333 +    property Database: TIBDatabase read GetDatabase write SetDatabase;
334 +    property Transaction: TIBTransaction read GetTransaction write SetTransaction;
335 +  published
336 +    property Generator: string read FGeneratorName write SetGeneratorName;
337 +    property Field: string read FFieldName write FFieldName;
338 +    property Increment: integer read FIncrement write SetIncrement default 1;
339 +    property ApplyOnEvent: TIBGeneratorApplyOnEvent read FApplyOnEvent write FApplyOnEvent;
340 +  end;
341 +
342 +  {TIBControlLink - Allows IB Aware controls to react to dataset state changes}
343 +
344 +  TIBControlLink = class
345 +  private
346 +    FTIBDataSet: TIBCustomDataSet;
347 +    procedure SetIBDataSet(AValue: TIBCustomDataSet);
348 +  protected
349 +    procedure UpdateSQL(Sender: TObject); virtual;
350 +    procedure UpdateParams(Sender: TObject); virtual;
351 +  public
352 +    destructor Destroy; override;
353 +    property IBDataSet: TIBCustomDataSet read FTIBDataSet write SetIBDataSet;
354 +  end;
355 +
356 +  TIBAutoCommit = (acDisabled, acCommitRetaining);
357 +
358    { TIBCustomDataSet }
359 +
360    TIBUpdateAction = (uaFail, uaAbort, uaSkip, uaRetry, uaApply, uaApplied);
361  
362    TIBUpdateErrorEvent = procedure(DataSet: TDataSet; E: EDatabaseError;
363 <                                 UpdateKind: TUpdateKind; var UpdateAction: TIBUpdateAction)
363 >                                 UpdateKind: TUpdateKind; var TheUpdateAction: TIBUpdateAction)
364                                   of object;
365    TIBUpdateRecordEvent = procedure(DataSet: TDataSet; UpdateKind: TUpdateKind;
366                                     var UpdateAction: TIBUpdateAction) of object;
367  
368    TIBUpdateRecordTypes = set of TCachedUpdateStatus;
369  
370 +  TDataSetCloseAction = (dcDiscardChanges, dcSaveChanges);
371 +
372 +  TOnValidatePost = procedure (Sender: TObject; var CancelPost: boolean) of object;
373 +
374    TIBCustomDataSet = class(TDataset)
375    private
376 +    FAllowAutoActivateTransaction: Boolean;
377 +    FArrayFieldCount: integer;
378 +    FArrayCacheOffset: integer;
379 +    FAutoCommit: TIBAutoCommit;
380 +    FGenerateParamNames: Boolean;
381 +    FGeneratorField: TIBGenerator;
382      FNeedsRefresh: Boolean;
383      FForcedRefresh: Boolean;
384      FDidActivate: Boolean;
161    FIBLoaded: Boolean;
385      FBase: TIBBase;
386      FBlobCacheOffset: Integer;
387      FBlobStreamList: TList;
388 +    FArrayList: TList;
389      FBufferChunks: Integer;
390      FBufferCache,
391      FOldBufferCache: PChar;
# Line 179 | Line 403 | type
403      FDeletedRecords: Long;
404      FModelBuffer,
405      FOldBuffer: PChar;
406 +    FOnValidatePost: TOnValidatePost;
407      FOpen: Boolean;
408      FInternalPrepared: Boolean;
409      FQDelete,
# Line 186 | Line 411 | type
411      FQRefresh,
412      FQSelect,
413      FQModify: TIBSQL;
414 +    FDatabaseInfo: TIBDatabaseInfo;
415      FRecordBufferSize: Integer;
416      FRecordCount: Integer;
417      FRecordSize: Integer;
418 +    FDataSetCloseAction: TDataSetCloseAction;
419      FUniDirectional: Boolean;
420      FUpdateMode: TUpdateMode;
421      FUpdateObject: TIBDataSetUpdateObject;
# Line 206 | Line 433 | type
433      FBeforeTransactionEnd,
434      FAfterTransactionEnd,
435      FTransactionFree: TNotifyEvent;
436 <
437 <    function GetSelectStmtHandle: TISC_STMT_HANDLE;
436 >    FAliasNameMap: array of string;
437 >    FAliasNameList: array of string;
438 >    FBaseSQLSelect: TStrings;
439 >    FParser: TSelectSQLParser;
440 >    FCloseAction: TTransactionAction;
441 >    FInTransactionEnd: boolean;
442 >    FIBLinks: TList;
443 >    FFieldColumns: PFieldColumns;
444 >    procedure ColumnDataToBuffer(QryResults: IResults; ColumnIndex,
445 >      FieldIndex: integer; Buffer: PChar);
446 >    procedure InitModelBuffer(Qry: TIBSQL; Buffer: PChar);
447 >    function GetSelectStmtIntf: IStatement;
448      procedure SetUpdateMode(const Value: TUpdateMode);
449      procedure SetUpdateObject(Value: TIBDataSetUpdateObject);
450  
# Line 219 | Line 456 | type
456      function CanRefresh: Boolean;
457      procedure CheckEditState;
458      procedure ClearBlobCache;
459 +    procedure ClearArrayCache;
460 +    procedure ClearIBLinks;
461      procedure CopyRecordBuffer(Source, Dest: Pointer);
462      procedure DoBeforeDatabaseDisconnect(Sender: TObject);
463      procedure DoAfterDatabaseDisconnect(Sender: TObject);
464      procedure DoDatabaseFree(Sender: TObject);
465 <    procedure DoBeforeTransactionEnd(Sender: TObject);
465 >    procedure DoBeforeTransactionEnd(Sender: TObject; Action: TTransactionAction);
466      procedure DoAfterTransactionEnd(Sender: TObject);
467      procedure DoTransactionFree(Sender: TObject);
468      procedure FetchCurrentRecordToBuffer(Qry: TIBSQL; RecordNumber: Integer;
469                                           Buffer: PChar);
470      function GetDatabase: TIBDatabase;
232    function GetDBHandle: PISC_DB_HANDLE;
471      function GetDeleteSQL: TStrings;
472      function GetInsertSQL: TStrings;
473 <    function GetSQLParams: TIBXSQLDA;
473 >    function GetSQLParams: ISQLParams;
474      function GetRefreshSQL: TStrings;
475      function GetSelectSQL: TStrings;
476 <    function GetStatementType: TIBSQLTypes;
476 >    function GetStatementType: TIBSQLStatementTypes;
477      function GetModifySQL: TStrings;
478      function GetTransaction: TIBTransaction;
479 <    function GetTRHandle: PISC_TR_HANDLE;
480 <    procedure InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer);
479 >    function GetParser: TSelectSQLParser;
480 >    procedure InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer); virtual;
481      function InternalLocate(const KeyFields: string; const KeyValues: Variant;
482                              Options: TLocateOptions): Boolean; virtual;
483 <    procedure InternalPostRecord(Qry: TIBSQL; Buff: Pointer);
484 <    procedure InternalRevertRecord(RecordNumber: Integer);
483 >    procedure InternalPostRecord(Qry: TIBSQL; Buff: Pointer); virtual;
484 >    procedure InternalRevertRecord(RecordNumber: Integer); virtual;
485      function IsVisible(Buffer: PChar): Boolean;
486 +    procedure RegisterIBLink(Sender: TIBControlLink);
487 +    procedure UnRegisterIBLink(Sender: TIBControlLink);
488      procedure SaveOldBuffer(Buffer: PChar);
489      procedure SetBufferChunks(Value: Integer);
490      procedure SetDatabase(Value: TIBDatabase);
491      procedure SetDeleteSQL(Value: TStrings);
492      procedure SetInsertSQL(Value: TStrings);
493 <    procedure SetInternalSQLParams(Qry: TIBSQL; Buffer: Pointer);
493 >    procedure SetInternalSQLParams(Params: ISQLParams; Buffer: Pointer);
494      procedure SetRefreshSQL(Value: TStrings);
495      procedure SetSelectSQL(Value: TStrings);
496      procedure SetModifySQL(Value: TStrings);
497      procedure SetTransaction(Value: TIBTransaction);
498      procedure SetUpdateRecordTypes(Value: TIBUpdateRecordTypes);
499      procedure SetUniDirectional(Value: Boolean);
500 +    procedure UpdateRecordFromQuery(QryResults: IResults; Buffer: PChar);
501      procedure RefreshParams;
261    procedure SQLChanging(Sender: TObject); virtual;
502      function AdjustPosition(FCache: PChar; Offset: DWORD;
503 <                            Origin: Integer): Integer;
503 >                            Origin: Integer): DWORD;
504      procedure ReadCache(FCache: PChar; Offset: DWORD; Origin: Integer;
505                         Buffer: PChar);
506      procedure ReadRecordCache(RecordNumber: Integer; Buffer: PChar;
# Line 269 | Line 509 | type
509                          Buffer: PChar);
510      procedure WriteRecordCache(RecordNumber: Integer; Buffer: PChar);
511      function InternalGetRecord(Buffer: PChar; GetMode: TGetMode;
512 <                       DoCheck: Boolean): TGetResult;
512 >                       DoCheck: Boolean): TGetResult; virtual;
513  
514    protected
515      procedure ActivateConnection;
# Line 277 | Line 517 | type
517      procedure DeactivateTransaction;
518      procedure CheckDatasetClosed;
519      procedure CheckDatasetOpen;
520 +    function CreateParser: TSelectSQLParser; virtual;
521 +    procedure FieldDefsFromQuery(SourceQuery: TIBSQL);
522      function GetActiveBuf: PChar;
523 <    procedure InternalBatchInput(InputObject: TIBBatchInput);
524 <    procedure InternalBatchOutput(OutputObject: TIBBatchOutput);
523 >    procedure InternalBatchInput(InputObject: TIBBatchInput); virtual;
524 >    procedure InternalBatchOutput(OutputObject: TIBBatchOutput); virtual;
525      procedure InternalPrepare; virtual;
526      procedure InternalUnPrepare; virtual;
527      procedure InternalExecQuery; virtual;
528      procedure InternalRefreshRow; virtual;
529 <    procedure InternalSetParamsFromCursor;
529 >    procedure InternalSetParamsFromCursor; virtual;
530      procedure CheckNotUniDirectional;
531 +    procedure SQLChanging(Sender: TObject); virtual;
532 +    procedure SQLChanged(Sender: TObject); virtual;
533  
534      { IProviderSupport }
535      procedure PSEndTransaction(Commit: Boolean); override;
# Line 309 | Line 553 | type
553      procedure ClearCalcFields(Buffer: PChar); override;
554      function AllocRecordBuffer: PChar; override;
555      procedure DoBeforeDelete; override;
556 +    procedure DoAfterDelete; override;
557      procedure DoBeforeEdit; override;
558 +    procedure DoAfterEdit; override;
559      procedure DoBeforeInsert; override;
560 +    procedure DoAfterInsert; override;
561 +    procedure DoBeforeClose; override;
562 +    procedure DoBeforeOpen; override;
563 +    procedure DoBeforePost; override;
564 +    procedure DoAfterPost; override;
565      procedure FreeRecordBuffer(var Buffer: PChar); override;
566      procedure GetBookmarkData(Buffer: PChar; Data: Pointer); override;
567      function GetBookmarkFlag(Buffer: PChar): TBookmarkFlag; override;
568      function GetCanModify: Boolean; override;
569      function GetDataSource: TDataSource; override;
570 +    function GetDBAliasName(FieldNo: integer): string;
571 +    function GetFieldDefFromAlias(aliasName: string): TFieldDef;
572      function GetFieldClass(FieldType: TFieldType): TFieldClass; override;
573      function GetRecNo: Integer; override;
574      function GetRecord(Buffer: PChar; GetMode: TGetMode;
575                         DoCheck: Boolean): TGetResult; override;
576      function GetRecordCount: Integer; override;
577      function GetRecordSize: Word; override;
578 +    procedure InternalAutoCommit;
579      procedure InternalAddRecord(Buffer: Pointer; Append: Boolean); override;
580      procedure InternalCancel; override;
581      procedure InternalClose; override;
582      procedure InternalDelete; override;
583      procedure InternalFirst; override;
584 <    function InternalGetFieldData(Field: TField; Buffer: Pointer): Boolean;
584 >    function InternalGetFieldData(Field: TField; Buffer: Pointer): Boolean; virtual;
585      procedure InternalGotoBookmark(Bookmark: Pointer); override;
586      procedure InternalHandleException; override;
587      procedure InternalInitFieldDefs; override;
# Line 336 | Line 590 | type
590      procedure InternalOpen; override;
591      procedure InternalPost; override;
592      procedure InternalRefresh; override;
593 <    procedure InternalSetFieldData(Field: TField; Buffer: Pointer);
593 >    procedure InternalSetFieldData(Field: TField; Buffer: Pointer); virtual;
594      procedure InternalSetToRecord(Buffer: PChar); override;
595      function IsCursorOpen: Boolean; override;
596 +    procedure Loaded; override;
597      procedure ReQuery;
598      procedure SetBookmarkFlag(Buffer: PChar; Value: TBookmarkFlag); override;
599      procedure SetBookmarkData(Buffer: PChar; Data: Pointer); override;
600      procedure SetCachedUpdates(Value: Boolean);
601      procedure SetDataSource(Value: TDataSource);
602 +    procedure SetGenerateParamNames(AValue: Boolean); virtual;
603      procedure SetFieldData(Field : TField; Buffer : Pointer); override;
604      procedure SetFieldData(Field : TField; Buffer : Pointer;
605        NativeFormat : Boolean); overload; override;
# Line 351 | Line 607 | type
607  
608    protected
609      {Likely to be made public by descendant classes}
610 <    property SQLParams: TIBXSQLDA read GetSQLParams;
611 <    property Params: TIBXSQLDA read GetSQLParams;
610 >    property AutoCommit: TIBAutoCommit read FAutoCommit write FAutoCommit default acDisabled;
611 >    property SQLParams: ISQLParams read GetSQLParams;
612 >    property Params: ISQLParams read GetSQLParams;
613      property InternalPrepared: Boolean read FInternalPrepared;
614      property QDelete: TIBSQL read FQDelete;
615      property QInsert: TIBSQL read FQInsert;
616      property QRefresh: TIBSQL read FQRefresh;
617      property QSelect: TIBSQL read FQSelect;
618      property QModify: TIBSQL read FQModify;
619 <    property StatementType: TIBSQLTypes read GetStatementType;
620 <    property SelectStmtHandle: TISC_STMT_HANDLE read GetSelectStmtHandle;
619 >    property StatementType: TIBSQLStatementTypes read GetStatementType;
620 >    property SelectStmtHandle: IStatement read GetSelectStmtIntf;
621  
622      {Likely to be made published by descendant classes}
623      property BufferChunks: Integer read FBufferChunks write SetBufferChunks;
624      property CachedUpdates: Boolean read FCachedUpdates write SetCachedUpdates;
625      property UniDirectional: Boolean read FUniDirectional write SetUniDirectional default False;
626 +    property GeneratorField: TIBGenerator read FGeneratorField write FGeneratorField;
627      property DeleteSQL: TStrings read GetDeleteSQL write SetDeleteSQL;
628      property InsertSQL: TStrings read GetInsertSQL write SetInsertSQL;
629      property RefreshSQL: TStrings read GetRefreshSQL write SetRefreshSQL;
# Line 373 | Line 631 | type
631      property ModifySQL: TStrings read GetModifySQL write SetModifySQL;
632      property UpdateMode: TUpdateMode read FUpdateMode write SetUpdateMode default upWhereAll;
633      property ParamCheck: Boolean read FParamCheck write FParamCheck default True;
634 +    property Parser: TSelectSQLParser read GetParser;
635 +    property BaseSQLSelect: TStrings read FBaseSQLSelect;
636  
637      property BeforeDatabaseDisconnect: TNotifyEvent read FBeforeDatabaseDisconnect
638                                                   write FBeforeDatabaseDisconnect;
# Line 386 | Line 646 | type
646                                              write FAfterTransactionEnd;
647      property TransactionFree: TNotifyEvent read FTransactionFree
648                                             write FTransactionFree;
649 +    property OnValidatePost: TOnValidatePost read FOnValidatePost write FOnValidatePost;
650  
651    public
652      constructor Create(AOwner: TComponent); override;
# Line 393 | Line 654 | type
654      procedure ApplyUpdates;
655      function CachedUpdateStatus: TCachedUpdateStatus;
656      procedure CancelUpdates;
657 +    function GetFieldPosition(AliasName: string): integer;
658      procedure FetchAll;
659      function LocateNext(const KeyFields: string; const KeyValues: Variant;
660                          Options: TLocateOptions): Boolean;
661      procedure RecordModified(Value: Boolean);
662      procedure RevertRecord;
663      procedure Undelete;
664 +    procedure ResetParser; virtual;
665 +    function HasParser: boolean;
666  
667      { TDataSet support methods }
668      function BookmarkValid(Bookmark: TBookmark): Boolean; override;
669      function CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer; override;
670      function CreateBlobStream(Field: TField; Mode: TBlobStreamMode): TStream; override;
671 +    function GetArray(Field: TIBArrayField): IArray;
672 +    procedure SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
673      function GetCurrentRecord(Buffer: PChar): Boolean; override;
674      function GetFieldData(Field : TField; Buffer : Pointer) : Boolean; overload; override;
675 <    function GetFieldData(FieldNo: Integer; Buffer: Pointer): Boolean; overload; override;
675 >    function GetFieldData(FieldNo: Integer; Buffer: Pointer): Boolean; overload; (*override;*)
676      function GetFieldData(Field : TField; Buffer : Pointer;
677        NativeFormat : Boolean) : Boolean; overload; override;
678 +    property GenerateParamNames: Boolean read FGenerateParamNames write SetGenerateParamNames;
679      function Locate(const KeyFields: string; const KeyValues: Variant;
680                      Options: TLocateOptions): Boolean; override;
681      function Lookup(const KeyFields: string; const KeyValues: Variant;
682                      const ResultFields: string): Variant; override;
683      function UpdateStatus: TUpdateStatus; override;
684      function IsSequenced: Boolean; override;
685 <
686 <    property DBHandle: PISC_DB_HANDLE read GetDBHandle;
687 <    property TRHandle: PISC_TR_HANDLE read GetTRHandle;
685 >    procedure Post; override;
686 >    function ParamByName(ParamName: String): ISQLParam;
687 >    property ArrayFieldCount: integer read FArrayFieldCount;
688      property UpdateObject: TIBDataSetUpdateObject read FUpdateObject write SetUpdateObject;
689      property UpdatesPending: Boolean read FUpdatesPending;
690      property UpdateRecordTypes: TIBUpdateRecordTypes read FUpdateRecordTypes
691                                                        write SetUpdateRecordTypes;
692 +    property DataSetCloseAction: TDataSetCloseAction
693 +               read FDataSetCloseAction write FDataSetCloseAction;
694  
695    published
696 +    property AllowAutoActivateTransaction: Boolean read FAllowAutoActivateTransaction
697 +                 write FAllowAutoActivateTransaction;
698      property Database: TIBDatabase read GetDatabase write SetDatabase;
699      property Transaction: TIBTransaction read GetTransaction
700                                            write SetTransaction;
701      property ForcedRefresh: Boolean read FForcedRefresh
702                                      write FForcedRefresh default False;
703      property AutoCalcFields;
433    property ObjectView default False;
704  
705      property AfterCancel;
706      property AfterClose;
# Line 461 | Line 731 | type
731                                                     write FOnUpdateRecord;
732    end;
733  
734 <  TIBDataSet = class(TIBCustomDataSet)
734 >  TIBParserDataSet = class(TIBCustomDataSet)
735 >  public
736 >    property Parser;
737 >  end;
738 >
739 >  TIBDataSet = class(TIBParserDataSet)
740    private
741      function GetPrepared: Boolean;
742  
# Line 486 | Line 761 | type
761      property QModify;
762      property StatementType;
763      property SelectStmtHandle;
764 +    property BaseSQLSelect;
765  
766    published
767      { TIBCustomDataSet }
768 +    property AutoCommit;
769      property BufferChunks;
770      property CachedUpdates;
771      property DeleteSQL;
# Line 496 | Line 773 | type
773      property RefreshSQL;
774      property SelectSQL;
775      property ModifySQL;
776 +    property GeneratorField;
777 +    property GenerateParamNames;
778      property ParamCheck;
779      property UniDirectional;
780      property Filtered;
781 +    property DataSetCloseAction;
782  
783      property BeforeDatabaseDisconnect;
784      property AfterDatabaseDisconnect;
# Line 534 | Line 814 | type
814      property OnFilterRecord;
815      property OnNewRecord;
816      property OnPostError;
817 +    property OnValidatePost;
818    end;
819  
820    { TIBDSBlobStream }
821    TIBDSBlobStream = class(TStream)
822 +  private
823 +    FHasWritten: boolean;
824    protected
825      FField: TField;
826      FBlobStream: TIBBlobStream;
827 +    function  GetSize: Int64; override;
828    public
829      constructor Create(AField: TField; ABlobStream: TIBBlobStream;
830                         Mode: TBlobStreamMode);
831 +    destructor Destroy; override;
832      function Read(var Buffer; Count: Longint): Longint; override;
833      function Seek(Offset: Longint; Origin: Word): Longint; override;
834      procedure SetSize(NewSize: Longint); override;
835      function Write(const Buffer; Count: Longint): Longint; override;
836    end;
837  
838 +  {Extended Field Def for character set info}
839 +
840 +  { TIBFieldDef }
841 +
842 +  TIBFieldDef = class(TFieldDef)
843 +  private
844 +    FArrayBounds: TArrayBounds;
845 +    FArrayDimensions: integer;
846 +    FCharacterSetName: RawByteString;
847 +    FCharacterSetSize: integer;
848 +    FCodePage: TSystemCodePage;
849 +    FIdentityColumn: boolean;
850 +    FRelationName: string;
851 +    FDataSize: integer;
852 +  published
853 +    property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
854 +    property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
855 +    property CodePage: TSystemCodePage read FCodePage write FCodePage;
856 +    property DataSize: integer read FDataSize write FDataSize;
857 +    property RelationName: string read FRelationName write FRelationName;
858 +    property ArrayDimensions: integer read FArrayDimensions write FArrayDimensions;
859 +    property ArrayBounds: TArrayBounds read FArrayBounds write FArrayBounds;
860 +    property IdentityColumn: boolean read FIdentityColumn write FIdentityColumn default false;
861 +  end;
862 +
863   const
864   DefaultFieldClasses: array[TFieldType] of TFieldClass = (
865      nil,                { ftUnknown }
866      TIBStringField,     { ftString }
867 <    TSmallintField,     { ftSmallint }
868 <    TIntegerField,      { ftInteger }
867 >    TIBSmallintField,   { ftSmallint }
868 >    TIBIntegerField,      { ftInteger }
869      TWordField,         { ftWord }
870      TBooleanField,      { ftBoolean }
871      TFloatField,        { ftFloat }
# Line 568 | Line 878 | DefaultFieldClasses: array[TFieldType] o
878      TVarBytesField,     { ftVarBytes }
879      TAutoIncField,      { ftAutoInc }
880      TBlobField,         { ftBlob }
881 <    TMemoField,         { ftMemo }
881 >    TIBMemoField,       { ftMemo }
882      TGraphicField,      { ftGraphic }
883      TBlobField,         { ftFmtMemo }
884      TBlobField,         { ftParadoxOle }
# Line 576 | Line 886 | DefaultFieldClasses: array[TFieldType] o
886      TBlobField,         { ftTypedBinary }
887      nil,                { ftCursor }
888      TStringField,       { ftFixedChar }
889 <    nil, {TWideStringField } { ftWideString }
890 <    TLargeIntField,     { ftLargeInt }
889 >    nil,    { ftWideString }
890 >    TIBLargeIntField,     { ftLargeInt }
891 >    nil,          { ftADT }
892 >    TIBArrayField,        { ftArray }
893 >    nil,    { ftReference }
894 >    nil,     { ftDataSet }
895 >    TBlobField,         { ftOraBlob }
896 >    TMemoField,         { ftOraClob }
897 >    TVariantField,      { ftVariant }
898 >    nil,    { ftInterface }
899 >    nil,     { ftIDispatch }
900 >    TGuidField,        { ftGuid }
901 >    TDateTimeField,    {ftTimestamp}
902 >    TIBBCDField,       {ftFMTBcd}
903 >    nil,  {ftFixedWideChar}
904 >    nil);   {ftWideMemo}
905 > (*
906      TADTField,          { ftADT }
907      TArrayField,        { ftArray }
908      TReferenceField,    { ftReference }
# Line 587 | Line 912 | DefaultFieldClasses: array[TFieldType] o
912      TVariantField,      { ftVariant }
913      TInterfaceField,    { ftInterface }
914      TIDispatchField,     { ftIDispatch }
915 <    TGuidField);        { ftGuid }
916 < var
917 <  CreateProviderProc: function(DataSet: TIBCustomDataSet): IProvider = nil;
915 >    TGuidField);        { ftGuid } *)
916 > (*var
917 >  CreateProviderProc: function(DataSet: TIBCustomDataSet): IProvider = nil;*)
918  
919   implementation
920  
921 < uses IBIntf, IBQuery;
921 > uses Variants, FmtBCD, LazUTF8, FBMessages, IBQuery;
922 >
923 > const FILE_BEGIN = 0;
924 >      FILE_CURRENT = 1;
925 >      FILE_END = 2;
926  
927   type
928  
# Line 602 | Line 931 | type
931      FieldName : String;
932      COMPUTED_BLR : Boolean;
933      DEFAULT_VALUE : boolean;
934 +    IDENTITY_COLUMN : boolean;
935      NextField : TFieldNode;
936    end;
937  
# Line 613 | Line 943 | type
943    end;
944  
945  
946 +  {  Copied from LCLProc in order to avoid LCL dependency
947 +
948 +    Ensures the covenient look of multiline string
949 +    when displaying it in the single line
950 +    * Replaces CR and LF with spaces
951 +    * Removes duplicate spaces
952 +  }
953 +  function TextToSingleLine(const AText: string): string;
954 +  var
955 +    str: string;
956 +    i, wstart, wlen: Integer;
957 +  begin
958 +    str := Trim(AText);
959 +    wstart := 0;
960 +    wlen := 0;
961 +    i := 1;
962 +    while i < Length(str) - 1 do
963 +    begin
964 +      if (str[i] in [' ', #13, #10]) then
965 +      begin
966 +        if (wstart = 0) then
967 +        begin
968 +          wstart := i;
969 +          wlen := 1;
970 +        end else
971 +          Inc(wlen);
972 +      end else
973 +      begin
974 +        if wstart > 0 then
975 +        begin
976 +          str[wstart] := ' ';
977 +          Delete(str, wstart+1, wlen-1);
978 +          Dec(i, wlen-1);
979 +          wstart := 0;
980 +        end;
981 +      end;
982 +      Inc(i);
983 +    end;
984 +    Result := str;
985 +  end;
986 +
987 + { TIBLargeIntField }
988 +
989 + procedure TIBLargeIntField.Bind(Binding: Boolean);
990 + begin
991 +  inherited Bind(Binding);
992 +  if Binding and (FieldDef <> nil) then
993 +     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
994 + end;
995 +
996 + { TIBIntegerField }
997 +
998 + procedure TIBIntegerField.Bind(Binding: Boolean);
999 + begin
1000 +  inherited Bind(Binding);
1001 +  if Binding and (FieldDef <> nil) then
1002 +     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
1003 + end;
1004 +
1005 + { TIBSmallintField }
1006 +
1007 + procedure TIBSmallintField.Bind(Binding: Boolean);
1008 + begin
1009 +  inherited Bind(Binding);
1010 +  if Binding and (FieldDef <> nil) then
1011 +     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
1012 + end;
1013 +
1014 + { TIBArray }
1015 +
1016 + procedure TIBArray.EventHandler(Sender: IArray; Reason: TArrayEventReason);
1017 + begin
1018 +  case Reason of
1019 +  arChanging:
1020 +    if FRecNo <> FField.Dataset.RecNo then
1021 +      IBError(ibxeNotCurrentArray,[nil]);
1022 +
1023 +  arChanged:
1024 +    FField.DataChanged;
1025 +  end;
1026 + end;
1027 +
1028 + constructor TIBArray.Create(aField: TIBArrayField; anArray: IArray);
1029 + begin
1030 +  inherited Create;
1031 +  FField := aField;
1032 +  FArray := anArray;
1033 +  FRecNo := FField.Dataset.RecNo;
1034 +  FArray.AddEventHandler(EventHandler);
1035 + end;
1036 +
1037 + destructor TIBArray.Destroy;
1038 + begin
1039 +  FArray.RemoveEventHandler(EventHandler);
1040 +  inherited Destroy;
1041 + end;
1042 +
1043 + { TIBArrayField }
1044 +
1045 + function TIBArrayField.GetArrayIntf: IArray;
1046 + begin
1047 +  Result := TIBCustomDataSet(DataSet).GetArray(self);
1048 + end;
1049 +
1050 + function TIBArrayField.GetArrayID: TISC_QUAD;
1051 + begin
1052 +  GetData(@Result);
1053 + end;
1054 +
1055 + procedure TIBArrayField.SetArrayIntf(AValue: IArray);
1056 + begin
1057 +  TIBCustomDataSet(DataSet).SetArrayIntf(AValue,self);
1058 +  DataChanged;
1059 + end;
1060 +
1061 + class procedure TIBArrayField.CheckTypeSize(AValue: Longint);
1062 + begin
1063 +  //Ignore
1064 + end;
1065 +
1066 + function TIBArrayField.GetAsString: string;
1067 + begin
1068 +  Result := '(Array)';
1069 + end;
1070 +
1071 + function TIBArrayField.GetDataSize: Integer;
1072 + begin
1073 +  Result := sizeof(TISC_QUAD);
1074 + end;
1075 +
1076 + procedure TIBArrayField.Bind(Binding: Boolean);
1077 + begin
1078 +  inherited Bind(Binding);
1079 +  if Binding then
1080 +  begin
1081 +    FCacheOffset := TIBCustomDataSet(DataSet).ArrayFieldCount;
1082 +    Inc(TIBCustomDataSet(DataSet).FArrayFieldCount);
1083 +    if FieldDef <> nil then
1084 +    begin
1085 +      FRelationName := TIBFieldDef(FieldDef).FRelationName;
1086 +      FArrayDimensions := TIBFieldDef(FieldDef).ArrayDimensions;
1087 +      FArrayBounds :=  TIBFieldDef(FieldDef).ArrayBounds;
1088 +    end;
1089 +  end;
1090 + end;
1091 +
1092 + constructor TIBArrayField.Create(AOwner: TComponent);
1093 + begin
1094 +  inherited Create(AOwner);
1095 +  SetDataType(ftArray);
1096 + end;
1097 +
1098 + function TIBArrayField.CreateArray: IArray;
1099 + begin
1100 + with DataSet as TIBCustomDataSet do
1101 +  Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,FRelationName,FieldName);
1102 + end;
1103 +
1104 + { TIBMemoField }
1105 +
1106 + function TIBMemoField.GetTruncatedText: string;
1107 + begin
1108 +   Result := GetAsString;
1109 +
1110 +   if Result <> '' then
1111 +   begin
1112 +       case CharacterSetSize of
1113 +       1:
1114 +         if DisplayWidth = 0 then
1115 +           Result := TextToSingleLine(Result)
1116 +         else
1117 +         if Length(Result) > DisplayWidth then {Show truncation with elipses}
1118 +           Result := TextToSingleLine(system.copy(Result,1,DisplayWidth-3)) + '...';
1119 +
1120 +       {2: case 2 ignored. This should be handled by TIBWideMemo}
1121 +
1122 +       3, {Assume UNICODE_FSS is really UTF8}
1123 +       4: {Include GB18030 - assuming UTF8 routines work for this codeset}
1124 +         if DisplayWidth = 0 then
1125 +           Result := ValidUTF8String(TextToSingleLine(Result))
1126 +         else
1127 +         if UTF8Length(Result) > DisplayWidth then {Show truncation with elipses}
1128 +           Result := ValidUTF8String(TextToSingleLine(UTF8Copy(Result,1,DisplayWidth-3))) + '...';
1129 +       end;
1130 +   end
1131 + end;
1132 +
1133 + procedure TIBMemoField.Bind(Binding: Boolean);
1134 + var IBFieldDef: TIBFieldDef;
1135 + begin
1136 +  inherited Bind(Binding);
1137 +  if Binding and (FieldDef <> nil) then
1138 +  begin
1139 +    IBFieldDef := FieldDef as TIBFieldDef;
1140 +    CharacterSetSize := IBFieldDef.CharacterSetSize;
1141 +    CharacterSetName := IBFieldDef.CharacterSetName;
1142 +    CodePage := IBFieldDef.CodePage;
1143 +  end;
1144 + end;
1145 +
1146 + function TIBMemoField.GetAsString: string;
1147 + var s: RawByteString;
1148 + begin
1149 +  s := inherited GetAsString;
1150 +  SetCodePage(s,CodePage,false);
1151 +  if (CodePage <> CP_NONE) and (CodePage <> CP_UTF8) then
1152 +    SetCodePage(s,CP_UTF8,true);  {LCL only accepts UTF8}
1153 +  Result := s;
1154 + end;
1155 +
1156 + function TIBMemoField.GetDefaultWidth: Longint;
1157 + begin
1158 +  if DisplayTextAsClassName then
1159 +    Result := inherited
1160 +  else
1161 +    Result := 128;
1162 + end;
1163 +
1164 + procedure TIBMemoField.GetText(var AText: string; ADisplayText: Boolean);
1165 + begin
1166 +  if ADisplayText then
1167 +  begin
1168 +    if not DisplayTextAsClassName and (CharacterSetName <> '') then
1169 +      AText := GetTruncatedText
1170 +    else
1171 +      inherited GetText(AText, ADisplayText);
1172 +  end
1173 +  else
1174 +    AText := GetAsString;
1175 + end;
1176 +
1177 + procedure TIBMemoField.SetAsString(const AValue: string);
1178 + var s: RawByteString;
1179 + begin
1180 +  s := AValue;
1181 +  if StringCodePage(s) <> CodePage then
1182 +    SetCodePage(s,CodePage,CodePage<>CP_NONE);
1183 +  inherited SetAsString(s);
1184 + end;
1185 +
1186 + constructor TIBMemoField.Create(AOwner: TComponent);
1187 + begin
1188 +  inherited Create(AOwner);
1189 +  BlobType := ftMemo;
1190 +  FCodePage := CP_NONE;
1191 + end;
1192 +
1193 + { TIBControlLink }
1194 +
1195 + destructor TIBControlLink.Destroy;
1196 + begin
1197 +  IBDataSet := nil;
1198 +  inherited Destroy;
1199 + end;
1200 +
1201 + procedure TIBControlLink.UpdateParams(Sender: TObject);
1202 + begin
1203 +
1204 + end;
1205 +
1206 + procedure TIBControlLink.UpdateSQL(Sender: TObject);
1207 + begin
1208 +
1209 + end;
1210 +
1211 + procedure TIBControlLink.SetIBDataSet(AValue: TIBCustomDataSet);
1212 + begin
1213 +  if FTIBDataSet = AValue then Exit;
1214 +  if IBDataSet <> nil then
1215 +    IBDataSet.UnRegisterIBLink(self);
1216 +  FTIBDataSet := AValue;
1217 +  if IBDataSet <> nil then
1218 +    IBDataSet.RegisterIBLink(self);
1219 + end;
1220 +
1221 +
1222   { TIBStringField}
1223  
1224 < constructor TIBStringField.Create(AOwner: TComponent);
1224 > procedure TIBStringField.Bind(Binding: Boolean);
1225 > var IBFieldDef: TIBFieldDef;
1226 > begin
1227 >  inherited Bind(Binding);
1228 >  if Binding and (FieldDef <> nil) then
1229 >  begin
1230 >    IBFieldDef := FieldDef as TIBFieldDef;
1231 >    CharacterSetSize := IBFieldDef.CharacterSetSize;
1232 >    CharacterSetName := IBFieldDef.CharacterSetName;
1233 >    FDataSize := IBFieldDef.DataSize + 1;
1234 >    if AutoFieldSize then
1235 >      Size := IBFieldDef.Size;
1236 >    CodePage := IBFieldDef.CodePage;
1237 >  end;
1238 > end;
1239 >
1240 > function TIBStringField.GetDataSize: Integer;
1241   begin
1242 <  inherited;
1242 >  Result := FDataSize;
1243 > end;
1244 >
1245 > constructor TIBStringField.Create(aOwner: TComponent);
1246 > begin
1247 >  inherited Create(aOwner);
1248 >  FCharacterSetSize := 1;
1249 >  FCodePage := CP_NONE;
1250 >  FAutoFieldSize := true;
1251   end;
1252  
1253   class procedure TIBStringField.CheckTypeSize(Value: Integer);
# Line 640 | Line 1270 | end;
1270   function TIBStringField.GetValue(var Value: string): Boolean;
1271   var
1272    Buffer: PChar;
1273 +  s: RawByteString;
1274   begin
1275    Buffer := nil;
1276 <  IBAlloc(Buffer, 0, Size + 1);
1276 >  IBAlloc(Buffer, 0, DataSize);
1277    try
1278      Result := GetData(Buffer);
1279      if Result then
1280      begin
1281 <      Value := string(Buffer);
1281 >      s := strpas(Buffer);
1282 >      SetCodePage(s,CodePage,false);
1283 >      if (CodePage <> CP_NONE) and (CodePage <> CP_UTF8) then
1284 >        SetCodePage(s,CP_UTF8,true);  {LCL only accepts UTF8}
1285 >      Value := s;
1286 > //      writeln(FieldName,': ', StringCodePage(Value),', ',Value);
1287        if Transliterate and (Value <> '') then
1288          DataSet.Translate(PChar(Value), PChar(Value), False);
1289      end
# Line 659 | Line 1295 | end;
1295   procedure TIBStringField.SetAsString(const Value: string);
1296   var
1297    Buffer: PChar;
1298 +  s: RawByteString;
1299   begin
1300    Buffer := nil;
1301 <  IBAlloc(Buffer, 0, Size + 1);
1301 >  IBAlloc(Buffer, 0, DataSize);
1302    try
1303 <    StrLCopy(Buffer, PChar(Value), Size);
1303 >    s := Value;
1304 >    if StringCodePage(s) <> CodePage then
1305 >      SetCodePage(s,CodePage,CodePage<>CP_NONE);
1306 >    StrLCopy(Buffer, PChar(s), DataSize-1);
1307      if Transliterate then
1308        DataSet.Translate(Buffer, Buffer, True);
1309      SetData(Buffer);
# Line 672 | Line 1312 | begin
1312    end;
1313   end;
1314  
1315 +
1316   { TIBBCDField }
1317  
1318   constructor TIBBCDField.Create(AOwner: TComponent);
# Line 681 | Line 1322 | begin
1322    Size := 8;
1323   end;
1324  
1325 + procedure TIBBCDField.Bind(Binding: Boolean);
1326 + begin
1327 +  inherited Bind(Binding);
1328 +  if Binding and (FieldDef <> nil) then
1329 +     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
1330 + end;
1331 +
1332   class procedure TIBBCDField.CheckTypeSize(Value: Integer);
1333   begin
1334   { No need to check as the base type is currency, not BCD }
# Line 714 | Line 1362 | end;
1362  
1363   function TIBBCDField.GetDataSize: Integer;
1364   begin
1365 + {$IFDEF TBCDFIELD_IS_BCD}
1366    Result := 8;
1367 + {$ELSE}
1368 +  Result := inherited GetDataSize
1369 + {$ENDIF}
1370   end;
1371  
1372   { TIBDataLink }
# Line 728 | Line 1380 | end;
1380   destructor TIBDataLink.Destroy;
1381   begin
1382    FDataSet.FDataLink := nil;
1383 <  inherited;
1383 >  inherited Destroy;
1384   end;
1385  
1386  
# Line 760 | Line 1412 | end;
1412  
1413   constructor TIBCustomDataSet.Create(AOwner: TComponent);
1414   begin
1415 <  inherited;
764 <  FIBLoaded := False;
765 <  CheckIBLoaded;
766 <  FIBLoaded := True;
1415 >  inherited Create(AOwner);
1416    FBase := TIBBase.Create(Self);
1417 +  FDatabaseInfo := TIBDatabaseInfo.Create(self);
1418 +  FIBLinks := TList.Create;
1419    FCurrentRecord := -1;
1420    FDeletedRecords := 0;
1421    FUniDirectional := False;
1422    FBufferChunks := BufferCacheSize;
1423    FBlobStreamList := TList.Create;
1424 +  FArrayList := TList.Create;
1425 +  FGeneratorField := TIBGenerator.Create(self);
1426    FDataLink := TIBDataLink.Create(Self);
1427    FQDelete := TIBSQL.Create(Self);
1428    FQDelete.OnSQLChanging := SQLChanging;
# Line 782 | Line 1435 | begin
1435    FQRefresh.GoToFirstRecordOnExecute := False;
1436    FQSelect := TIBSQL.Create(Self);
1437    FQSelect.OnSQLChanging := SQLChanging;
1438 +  FQSelect.OnSQLChanged := SQLChanged;
1439    FQSelect.GoToFirstRecordOnExecute := False;
1440    FQModify := TIBSQL.Create(Self);
1441    FQModify.OnSQLChanging := SQLChanging;
1442    FQModify.GoToFirstRecordOnExecute := False;
1443    FUpdateRecordTypes := [cusUnmodified, cusModified, cusInserted];
1444    FParamCheck := True;
1445 +  FGenerateParamNames := False;
1446    FForcedRefresh := False;
1447 +  FAutoCommit:= acDisabled;
1448 +  FDataSetCloseAction := dcDiscardChanges;
1449    {Bookmark Size is Integer for IBX}
1450    BookmarkSize := SizeOf(Integer);
1451    FBase.BeforeDatabaseDisconnect := DoBeforeDatabaseDisconnect;
# Line 802 | Line 1459 | begin
1459    else
1460      if AOwner is TIBTransaction then
1461        Transaction := TIBTransaction(AOwner);
1462 +  FBaseSQLSelect := TStringList.Create;
1463   end;
1464  
1465   destructor TIBCustomDataSet.Destroy;
1466   begin
1467 <  inherited;
1468 <  if FIBLoaded then
1469 <  begin
1470 <    FDataLink.Free;
1471 <    FBase.Free;
1472 <    ClearBlobCache;
1473 <    FBlobStreamList.Free;
1474 <    FreeMem(FBufferCache);
1475 <    FBufferCache := nil;
1476 <    FreeMem(FOldBufferCache);
1477 <    FOldBufferCache := nil;
1478 <    FCacheSize := 0;
1479 <    FOldCacheSize := 0;
1480 <    FMappedFieldPosition := nil;
1481 <  end;
1467 >  if Active then Active := false;
1468 >  if assigned(FGeneratorField) then FGeneratorField.Free;
1469 >  FDataLink.Free;
1470 >  FBase.Free;
1471 >  ClearBlobCache;
1472 >  ClearIBLinks;
1473 >  FIBLinks.Free;
1474 >  FBlobStreamList.Free;
1475 >  FArrayList.Free;
1476 >  FreeMem(FBufferCache);
1477 >  FBufferCache := nil;
1478 >  FreeMem(FOldBufferCache);
1479 >  FOldBufferCache := nil;
1480 >  FCacheSize := 0;
1481 >  FOldCacheSize := 0;
1482 >  FMappedFieldPosition := nil;
1483 >  if assigned(FBaseSQLSelect) then FBaseSQLSelect.Free;
1484 >  if assigned(FParser) then FParser.Free;
1485 >  inherited Destroy;
1486   end;
1487  
1488   function TIBCustomDataSet.AdjustCurrentRecord(Buffer: Pointer; GetMode: TGetMode):
# Line 842 | Line 1504 | begin
1504        Inc(FCurrentRecord);
1505        if (FCurrentRecord = FRecordCount) then
1506        begin
1507 <        if (not FQSelect.EOF) and (FQSelect.Next <> nil) then
1507 >        if (not FQSelect.EOF) and FQSelect.Next  then
1508          begin
1509            FetchCurrentRecordToBuffer(FQSelect, FCurrentRecord, Buffer);
1510            Inc(FRecordCount);
# Line 861 | Line 1523 | end;
1523  
1524   procedure TIBCustomDataSet.ApplyUpdates;
1525   var
1526 <  CurBookmark: string;
1526 >  CurBookmark: TBookmark;
1527    Buffer: PRecordData;
1528    CurUpdateTypes: TIBUpdateRecordTypes;
1529    UpdateAction: TIBUpdateAction;
# Line 921 | Line 1583 | var
1583    procedure UpdateUsingUpdateObject;
1584    begin
1585      try
1586 <      FUpdateObject.Apply(UpdateKind);
1586 >      FUpdateObject.Apply(UpdateKind,PChar(Buffer));
1587        ResetBufferUpdateStatus;
1588      except
1589        on E: Exception do
# Line 1059 | Line 1721 | begin
1721    end;
1722   end;
1723  
1724 + function TIBCustomDataSet.GetFieldPosition(AliasName: string): integer;
1725 + var i: integer;
1726 +    Prepared: boolean;
1727 + begin
1728 +  Result := 0;
1729 +  Prepared := FInternalPrepared;
1730 +  if not Prepared then
1731 +    InternalPrepare;
1732 +  try
1733 +    for i := 0 to Length(FAliasNameList) - 1 do
1734 +      if FAliasNameList[i] = AliasName then
1735 +      begin
1736 +        Result := i + 1;
1737 +        Exit
1738 +      end;
1739 +  finally
1740 +    if not Prepared then
1741 +      InternalUnPrepare;
1742 +  end;
1743 + end;
1744 +
1745   procedure TIBCustomDataSet.ActivateConnection;
1746   begin
1747    if not Assigned(Database) then
# Line 1071 | Line 1754 | end;
1754   function TIBCustomDataSet.ActivateTransaction: Boolean;
1755   begin
1756    Result := False;
1757 <  if not Assigned(Transaction) then
1075 <    IBError(ibxeTransactionNotAssigned, [nil]);
1076 <  if not Transaction.Active then
1757 >  if AllowAutoActivateTransaction or (csDesigning in ComponentState) then
1758    begin
1759 <    Result := True;
1760 <    Transaction.StartTransaction;
1761 <    FDidActivate := True;
1759 >    if not Assigned(Transaction) then
1760 >      IBError(ibxeTransactionNotAssigned, [nil]);
1761 >    if not Transaction.Active then
1762 >    begin
1763 >      Result := True;
1764 >      Transaction.StartTransaction;
1765 >      FDidActivate := True;
1766 >    end;
1767    end;
1768   end;
1769  
# Line 1119 | Line 1805 | begin
1805      IBError(ibxeDatasetClosed, [nil]);
1806   end;
1807  
1808 + function TIBCustomDataSet.CreateParser: TSelectSQLParser;
1809 + begin
1810 +  Result := TSelectSQLParser.Create(self,FBaseSQLSelect);
1811 +  Result.OnSQLChanging := SQLChanging
1812 + end;
1813 +
1814   procedure TIBCustomDataSet.CheckNotUniDirectional;
1815   begin
1816    if UniDirectional then
# Line 1196 | Line 1888 | begin
1888    FBlobStreamList.Pack;
1889   end;
1890  
1891 + procedure TIBCustomDataSet.ClearArrayCache;
1892 + var
1893 +  i: Integer;
1894 + begin
1895 +  for i := 0 to FArrayList.Count - 1 do
1896 +  begin
1897 +    TIBArray(FArrayList[i]).Free;
1898 +    FArrayList[i] := nil;
1899 +  end;
1900 +  FArrayList.Pack;
1901 + end;
1902 +
1903   procedure TIBCustomDataSet.CopyRecordBuffer(Source, Dest: Pointer);
1904   begin
1905    Move(Source^, Dest^, FRecordBufferSize);
# Line 1205 | Line 1909 | procedure TIBCustomDataSet.DoBeforeDatab
1909   begin
1910    if Active then
1911      Active := False;
1912 <  FInternalPrepared := False;
1912 >  InternalUnPrepare;
1913    if Assigned(FBeforeDatabaseDisconnect) then
1914      FBeforeDatabaseDisconnect(Sender);
1915   end;
# Line 1222 | Line 1926 | begin
1926      FDatabaseFree(Sender);
1927   end;
1928  
1929 < procedure TIBCustomDataSet.DoBeforeTransactionEnd(Sender: TObject);
1929 > procedure TIBCustomDataSet.DoBeforeTransactionEnd(Sender: TObject;
1930 >  Action: TTransactionAction);
1931   begin
1932 <  if Active then
1933 <    Active := False;
1932 >  FCloseAction := Action;
1933 >  FInTransactionEnd := true;
1934 >  try
1935 >    if Active then
1936 >      Active := False;
1937 >  finally
1938 >    FInTransactionEnd := false;
1939 >  end;
1940    if FQSelect <> nil then
1941      FQSelect.FreeHandle;
1942    if FQDelete <> nil then
# Line 1236 | Line 1947 | begin
1947      FQModify.FreeHandle;
1948    if FQRefresh <> nil then
1949      FQRefresh.FreeHandle;
1950 +  InternalUnPrepare;
1951    if Assigned(FBeforeTransactionEnd) then
1952      FBeforeTransactionEnd(Sender);
1953   end;
# Line 1252 | Line 1964 | begin
1964      FTransactionFree(Sender);
1965   end;
1966  
1967 < { Read the record from FQSelect.Current into the record buffer
1968 <  Then write the buffer to in memory cache }
1969 < procedure TIBCustomDataSet.FetchCurrentRecordToBuffer(Qry: TIBSQL;
1970 <  RecordNumber: Integer; Buffer: PChar);
1971 < var
1260 <  p: PRecordData;
1261 <  pbd: PBlobDataArray;
1262 <  i, j: Integer;
1263 <  LocalData: Pointer;
1264 <  LocalDate, LocalDouble: Double;
1265 <  LocalInt: Integer;
1266 <  LocalInt64: Int64;
1267 <  LocalCurrency: Currency;
1268 <  FieldsLoaded: Integer;
1967 > procedure TIBCustomDataSet.InitModelBuffer(Qry: TIBSQL; Buffer: PChar);
1968 > var i, j: Integer;
1969 >    FieldsLoaded: integer;
1970 >    p: PRecordData;
1971 >    colMetadata: IColumnMetaData;
1972   begin
1973    p := PRecordData(Buffer);
1271  { Make sure blob cache is empty }
1272  pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
1273  if RecordNumber > -1 then
1274    for i := 0 to BlobFieldCount - 1 do
1275      pbd^[i] := nil;
1974    { Get record information }
1975    p^.rdBookmarkFlag := bfCurrent;
1976 <  p^.rdFieldCount := Qry.Current.Count;
1977 <  p^.rdRecordNumber := RecordNumber;
1976 >  p^.rdFieldCount := Qry.FieldCount;
1977 >  p^.rdRecordNumber := -1;
1978    p^.rdUpdateStatus := usUnmodified;
1979    p^.rdCachedUpdateStatus := cusUnmodified;
1980    p^.rdSavedOffset := $FFFFFFFF;
1981  
1982    { Load up the fields }
1983 <  FieldsLoaded := FQSelect.Current.Count;
1983 >  FieldsLoaded := FQSelect.MetaData.Count;
1984    j := 1;
1985 <  for i := 0 to Qry.Current.Count - 1 do
1985 >  for i := 0 to Qry.MetaData.Count - 1 do
1986    begin
1987      if (Qry = FQSelect) then
1988        j := i + 1
1989 <    else begin
1989 >    else
1990 >    begin
1991        if FieldsLoaded = 0 then
1992          break;
1993 <      j := FQSelect.FieldIndex[Qry.Current[i].Name] + 1;
1993 >      j := FQSelect.FieldIndex[Qry[i].Name] + 1;
1994        if j < 1 then
1995          continue
1996        else
1997          Dec(FieldsLoaded);
1998      end;
1999 <    with FQSelect.Current[j - 1].Data^ do
2000 <      if aliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
1999 >    if j > 0 then
2000 >    begin
2001 >      colMetadata := Qry.MetaData[i];
2002 >      with p^.rdFields[j], FFieldColumns^[j] do
2003        begin
2004 <        if sqllen <= 8 then
2005 <          p^.rdDBKey := PIBDBKEY(Qry.Current[i].AsPointer)^;
2006 <        continue;
2004 >        fdDataType := colMetadata.GetSQLType;
2005 >        if fdDataType = SQL_BLOB then
2006 >          fdDataScale := 0
2007 >        else
2008 >          fdDataScale := colMetadata.getScale;
2009 >        fdNullable := colMetadata.getIsNullable;
2010 >        fdIsNull := true;
2011 >        fdDataSize := colMetadata.GetSize;
2012 >        fdDataLength := 0;
2013 >        fdCodePage := CP_NONE;
2014 >
2015 >        case fdDataType of
2016 >        SQL_TIMESTAMP,
2017 >        SQL_TYPE_DATE,
2018 >        SQL_TYPE_TIME:
2019 >          fdDataSize := SizeOf(TDateTime);
2020 >        SQL_SHORT, SQL_LONG:
2021 >        begin
2022 >          if (fdDataScale = 0) then
2023 >            fdDataSize := SizeOf(Integer)
2024 >          else
2025 >          if (fdDataScale >= (-4)) then
2026 >            fdDataSize := SizeOf(Currency)
2027 >          else
2028 >            fdDataSize := SizeOf(Double);
2029 >        end;
2030 >        SQL_INT64:
2031 >        begin
2032 >          if (fdDataScale = 0) then
2033 >            fdDataSize := SizeOf(Int64)
2034 >          else
2035 >          if (fdDataScale >= (-4)) then
2036 >            fdDataSize := SizeOf(Currency)
2037 >          else
2038 >            fdDataSize := SizeOf(Double);
2039 >        end;
2040 >        SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2041 >          fdDataSize := SizeOf(Double);
2042 >        SQL_BOOLEAN:
2043 >          fdDataSize := SizeOf(wordBool);
2044 >        SQL_VARYING,
2045 >        SQL_TEXT,
2046 >        SQL_BLOB:
2047 >          fdCodePage := Qry.Metadata[i].getCodePage;
2048 >        end;
2049 >        fdDataOfs := FRecordSize;
2050 >        Inc(FRecordSize, fdDataSize);
2051        end;
2052 <    if j > 0 then with p^ do
2052 >    end;
2053 >  end;
2054 > end;
2055 >
2056 > {Update Buffer Fields from Query Results}
2057 >
2058 > procedure TIBCustomDataSet.UpdateRecordFromQuery(QryResults: IResults;
2059 >  Buffer: PChar);
2060 > var i, j: integer;
2061 > begin
2062 >  for i := 0 to QryResults.Count - 1 do
2063 >  begin
2064 >    j := GetFieldPosition(QryResults[i].GetAliasName);
2065 >    if j > 0 then
2066 >      ColumnDataToBuffer(QryResults,i,j,Buffer);
2067 >  end;
2068 > end;
2069 >
2070 >
2071 > {Move column data returned from query to row buffer}
2072 >
2073 > procedure TIBCustomDataSet.ColumnDataToBuffer(QryResults: IResults;
2074 >               ColumnIndex, FieldIndex: integer; Buffer: PChar);
2075 > var
2076 >  LocalData: PByte;
2077 >  LocalDate, LocalDouble: Double;
2078 >  LocalInt: Integer;
2079 >  LocalBool: wordBool;
2080 >  LocalInt64: Int64;
2081 >  LocalCurrency: Currency;
2082 >  p: PRecordData;
2083 >  ColData: ISQLData;
2084 > begin
2085 >  p := PRecordData(Buffer);
2086 >  LocalData := nil;
2087 >  with p^.rdFields[FieldIndex], FFieldColumns^[FieldIndex] do
2088 >  begin
2089 >    QryResults.GetData(ColumnIndex,fdIsNull,fdDataLength,LocalData);
2090 >    if not fdIsNull then
2091      begin
2092 <      rdFields[j].fdDataType :=
2093 <        Qry.Current[i].Data^.sqltype and (not 1);
1311 <      rdFields[j].fdDataScale :=
1312 <        Qry.Current[i].Data^.sqlscale;
1313 <      rdFields[j].fdNullable :=
1314 <        (Qry.Current[i].Data^.sqltype and 1 = 1);
1315 <      rdFields[j].fdIsNull :=
1316 <        (rdFields[j].fdNullable and (Qry.Current[i].Data^.sqlind^ = -1));
1317 <      LocalData := Qry.Current[i].Data^.sqldata;
1318 <      case rdFields[j].fdDataType of
2092 >      ColData := QryResults[ColumnIndex];
2093 >      case fdDataType of  {Get Formatted data for column types that need formatting}
2094          SQL_TIMESTAMP:
2095          begin
2096 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2097 <          if RecordNumber >= 0 then
1323 <            LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(Qry.Current[i].AsDateTime));
1324 <          LocalData := PChar(@LocalDate);
2096 >          LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(ColData.AsDateTime));
2097 >          LocalData := PByte(@LocalDate);
2098          end;
2099          SQL_TYPE_DATE:
2100          begin
2101 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2102 <          if RecordNumber >= 0 then
1330 <            LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Date;
1331 <          LocalData := PChar(@LocalInt);
2101 >          LocalInt := DateTimeToTimeStamp(ColData.AsDateTime).Date;
2102 >          LocalData := PByte(@LocalInt);
2103          end;
2104          SQL_TYPE_TIME:
2105          begin
2106 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2107 <          if RecordNumber >= 0 then
1337 <            LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Time;
1338 <          LocalData := PChar(@LocalInt);
2106 >          LocalInt := DateTimeToTimeStamp(ColData.AsDateTime).Time;
2107 >          LocalData := PByte(@LocalInt);
2108          end;
2109          SQL_SHORT, SQL_LONG:
2110          begin
2111 <          if (rdFields[j].fdDataScale = 0) then
2111 >          if (fdDataScale = 0) then
2112            begin
2113 <            rdFields[j].fdDataSize := SizeOf(Integer);
2114 <            if RecordNumber >= 0 then
1346 <              LocalInt := Qry.Current[i].AsLong;
1347 <            LocalData := PChar(@LocalInt);
2113 >            LocalInt := ColData.AsLong;
2114 >            LocalData := PByte(@LocalInt);
2115            end
2116 <          else if (rdFields[j].fdDataScale >= (-4)) then
2117 <               begin
2118 <                 rdFields[j].fdDataSize := SizeOf(Currency);
2119 <                 if RecordNumber >= 0 then
2120 <                   LocalCurrency := Qry.Current[i].AsCurrency;
2121 <                 LocalData := PChar(@LocalCurrency);
2122 <               end
2123 <               else begin
2124 <                 rdFields[j].fdDataSize := SizeOf(Double);
2125 <                 if RecordNumber >= 0 then
2126 <                   LocalDouble := Qry.Current[i].AsDouble;
1360 <                LocalData := PChar(@LocalDouble);
1361 <              end;
2116 >          else
2117 >          if (fdDataScale >= (-4)) then
2118 >          begin
2119 >            LocalCurrency := ColData.AsCurrency;
2120 >            LocalData := PByte(@LocalCurrency);
2121 >          end
2122 >          else
2123 >          begin
2124 >           LocalDouble := ColData.AsDouble;
2125 >           LocalData := PByte(@LocalDouble);
2126 >          end;
2127          end;
2128          SQL_INT64:
2129          begin
2130 <          if (rdFields[j].fdDataScale = 0) then
2130 >          if (fdDataScale = 0) then
2131            begin
2132 <            rdFields[j].fdDataSize := SizeOf(Int64);
2133 <            if RecordNumber >= 0 then
1369 <              LocalInt64 := Qry.Current[i].AsInt64;
1370 <            LocalData := PChar(@LocalInt64);
2132 >            LocalInt64 := ColData.AsInt64;
2133 >            LocalData := PByte(@LocalInt64);
2134            end
2135 <          else if (rdFields[j].fdDataScale >= (-4)) then
2136 <               begin
2137 <                 rdFields[j].fdDataSize := SizeOf(Currency);
2138 <                 if RecordNumber >= 0 then
2139 <                   LocalCurrency := Qry.Current[i].AsCurrency;
2140 <                   LocalData := PChar(@LocalCurrency);
2141 <               end
2142 <               else begin
2143 <                  rdFields[j].fdDataSize := SizeOf(Double);
2144 <                  if RecordNumber >= 0 then
2145 <                    LocalDouble := Qry.Current[i].AsDouble;
1383 <                  LocalData := PChar(@LocalDouble);
1384 <               end
2135 >          else
2136 >          if (fdDataScale >= (-4)) then
2137 >          begin
2138 >            LocalCurrency := ColData.AsCurrency;
2139 >            LocalData := PByte(@LocalCurrency);
2140 >            end
2141 >            else
2142 >            begin
2143 >              LocalDouble := ColData.AsDouble;
2144 >              LocalData := PByte(@LocalDouble);
2145 >            end
2146          end;
2147          SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2148          begin
2149 <          rdFields[j].fdDataSize := SizeOf(Double);
2150 <          if RecordNumber >= 0 then
1390 <            LocalDouble := Qry.Current[i].AsDouble;
1391 <          LocalData := PChar(@LocalDouble);
1392 <        end;
1393 <        SQL_VARYING:
1394 <        begin
1395 <          rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
1396 <          rdFields[j].fdDataLength := isc_vax_integer(Qry.Current[i].Data^.sqldata, 2);
1397 <          if RecordNumber >= 0 then
1398 <          begin
1399 <            if (rdFields[j].fdDataLength = 0) then
1400 <              LocalData := nil
1401 <            else
1402 <              LocalData := @Qry.Current[i].Data^.sqldata[2];
1403 <          end;
2149 >          LocalDouble := ColData.AsDouble;
2150 >          LocalData := PByte(@LocalDouble);
2151          end;
2152 <        else { SQL_TEXT, SQL_BLOB, SQL_ARRAY, SQL_QUAD }
2152 >        SQL_BOOLEAN:
2153          begin
2154 <          rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
2155 <          if (rdFields[j].fdDataType = SQL_TEXT) then
1409 <            rdFields[j].fdDataLength := rdFields[j].fdDataSize;
2154 >          LocalBool := ColData.AsBoolean;
2155 >          LocalData := PByte(@LocalBool);
2156          end;
2157        end;
2158 <      if RecordNumber < 0 then
2158 >
2159 >      if fdDataType = SQL_VARYING then
2160 >        Move(LocalData^, Buffer[fdDataOfs], fdDataLength)
2161 >      else
2162 >        Move(LocalData^, Buffer[fdDataOfs], fdDataSize)
2163 >    end
2164 >    else {Null column}
2165 >    if fdDataType = SQL_VARYING then
2166 >      FillChar(Buffer[fdDataOfs],fdDataLength,0)
2167 >    else
2168 >      FillChar(Buffer[fdDataOfs],fdDataSize,0);
2169 >  end;
2170 > end;
2171 >
2172 > { Read the record from FQSelect.Current into the record buffer
2173 >  Then write the buffer to in memory cache }
2174 > procedure TIBCustomDataSet.FetchCurrentRecordToBuffer(Qry: TIBSQL;
2175 >  RecordNumber: Integer; Buffer: PChar);
2176 > var
2177 >  pbd: PBlobDataArray;
2178 >  pda: PArrayDataArray;
2179 >  i, j: Integer;
2180 >  FieldsLoaded: Integer;
2181 >  p: PRecordData;
2182 > begin
2183 >  if RecordNumber = -1 then
2184 >  begin
2185 >    InitModelBuffer(Qry,Buffer);
2186 >    Exit;
2187 >  end;
2188 >  p := PRecordData(Buffer);
2189 >  { Make sure blob cache is empty }
2190 >  pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
2191 >  pda := PArrayDataArray(Buffer + FArrayCacheOffset);
2192 >  for i := 0 to BlobFieldCount - 1 do
2193 >    pbd^[i] := nil;
2194 >  for i := 0 to ArrayFieldCount - 1 do
2195 >    pda^[i] := nil;
2196 >
2197 >  { Get record information }
2198 >  p^.rdBookmarkFlag := bfCurrent;
2199 >  p^.rdFieldCount := Qry.FieldCount;
2200 >  p^.rdRecordNumber := RecordNumber;
2201 >  p^.rdUpdateStatus := usUnmodified;
2202 >  p^.rdCachedUpdateStatus := cusUnmodified;
2203 >  p^.rdSavedOffset := $FFFFFFFF;
2204 >
2205 >  { Load up the fields }
2206 >  FieldsLoaded := FQSelect.MetaData.Count;
2207 >  j := 1;
2208 >  for i := 0 to Qry.FieldCount - 1 do
2209 >  begin
2210 >    if (Qry = FQSelect) then
2211 >      j := i + 1
2212 >    else
2213 >    begin
2214 >      if FieldsLoaded = 0 then
2215 >        break;
2216 >      j := FQSelect.FieldIndex[Qry[i].Name] + 1;
2217 >      if j < 1 then
2218 >        continue
2219 >      else
2220 >        Dec(FieldsLoaded);
2221 >    end;
2222 >    with FQSelect.MetaData[j - 1] do
2223 >      if GetAliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
2224        begin
2225 <        rdFields[j].fdIsNull := True;
2226 <        rdFields[j].fdDataOfs := FRecordSize;
2227 <        Inc(FRecordSize, rdFields[j].fdDataSize);
1417 <      end
1418 <      else begin
1419 <        if rdFields[j].fdDataType = SQL_VARYING then
1420 <        begin
1421 <          if LocalData <> nil then
1422 <            Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataLength)
1423 <        end
1424 <        else
1425 <          Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataSize)
2225 >        if (GetSize <= 8) then
2226 >          p^.rdDBKey := PIBDBKEY(Qry[i].AsPointer)^;
2227 >        continue;
2228        end;
2229 <    end;
2229 >    if j > 0 then
2230 >      ColumnDataToBuffer(Qry.Current,i,j,Buffer);
2231    end;
2232 <  WriteRecordCache(RecordNumber, PChar(p));
2232 >  WriteRecordCache(RecordNumber, Buffer);
2233   end;
2234  
2235   function TIBCustomDataSet.GetActiveBuf: PChar;
# Line 1471 | Line 2274 | begin
2274    result := FBase.Database;
2275   end;
2276  
1474 function TIBCustomDataSet.GetDBHandle: PISC_DB_HANDLE;
1475 begin
1476  result := FBase.DBHandle;
1477 end;
1478
2277   function TIBCustomDataSet.GetDeleteSQL: TStrings;
2278   begin
2279    result := FQDelete.SQL;
# Line 1486 | Line 2284 | begin
2284    result := FQInsert.SQL;
2285   end;
2286  
2287 < function TIBCustomDataSet.GetSQLParams: TIBXSQLDA;
2287 > function TIBCustomDataSet.GetSQLParams: ISQLParams;
2288   begin
2289    if not FInternalPrepared then
2290      InternalPrepare;
# Line 1503 | Line 2301 | begin
2301    result := FQSelect.SQL;
2302   end;
2303  
2304 < function TIBCustomDataSet.GetStatementType: TIBSQLTypes;
2304 > function TIBCustomDataSet.GetStatementType: TIBSQLStatementTypes;
2305   begin
2306 <  result := FQSelect.SQLType;
2306 >  result := FQSelect.SQLStatementType;
2307   end;
2308  
2309   function TIBCustomDataSet.GetModifySQL: TStrings;
# Line 1518 | Line 2316 | begin
2316    result := FBase.Transaction;
2317   end;
2318  
1521 function TIBCustomDataSet.GetTRHandle: PISC_TR_HANDLE;
1522 begin
1523  result := FBase.TRHandle;
1524 end;
1525
2319   procedure TIBCustomDataSet.InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer);
2320   begin
2321    if (Assigned(FUpdateObject) and (FUpdateObject.GetSQL(ukDelete).Text <> '')) then
2322 <    FUpdateObject.Apply(ukDelete)
2322 >    FUpdateObject.Apply(ukDelete,Buff)
2323    else
2324    begin
2325 <    SetInternalSQLParams(FQDelete, Buff);
2325 >    SetInternalSQLParams(FQDelete.Params, Buff);
2326      FQDelete.ExecQuery;
2327    end;
2328    with PRecordData(Buff)^ do
# Line 1543 | Line 2336 | end;
2336   function TIBCustomDataSet.InternalLocate(const KeyFields: string;
2337    const KeyValues: Variant; Options: TLocateOptions): Boolean;
2338   var
2339 <  fl: TList;
2340 <  CurBookmark: string;
2341 <  fld, val: Variant;
2342 <  i, fld_cnt: Integer;
2339 >  keyFieldList: TList;
2340 >  CurBookmark: TBookmark;
2341 >  fieldValue: Variant;
2342 >  lookupValues: array of variant;
2343 >  i, fieldCount: Integer;
2344 >  fieldValueAsString: string;
2345 >  lookupValueAsString: string;
2346   begin
2347 <  fl := TList.Create;
2347 >  keyFieldList := TList.Create;
2348    try
2349 <    GetFieldList(fl, KeyFields);
2350 <    fld_cnt := fl.Count;
2349 >    GetFieldList(keyFieldList, KeyFields);
2350 >    fieldCount := keyFieldList.Count;
2351      CurBookmark := Bookmark;
2352 <    result := False;
2353 <    while ((not result) and (not EOF)) do
2352 >    result := false;
2353 >    SetLength(lookupValues, fieldCount);
2354 >    if not EOF then
2355      begin
2356 <      i := 0;
1560 <      result := True;
1561 <      while (result and (i < fld_cnt)) do
2356 >      for i := 0 to fieldCount - 1 do  {expand key values into lookupValues array}
2357        begin
2358 <        if fld_cnt > 1 then
2359 <          val := KeyValues[i]
2358 >        if VarIsArray(KeyValues) then
2359 >          lookupValues[i] := KeyValues[i]
2360          else
2361 <          val := KeyValues;
2362 <        fld := TField(fl[i]).Value;
2363 <        result := not (VarIsNull(val) xor VarIsNull(fld));
2364 <        if result and not VarIsNull(val) then
2361 >        if i > 0 then
2362 >          lookupValues[i] := NULL
2363 >        else
2364 >          lookupValues[0] := KeyValues;
2365 >
2366 >        {convert to upper case is case insensitive search}
2367 >        if (TField(keyFieldList[i]).DataType = ftString) and
2368 >           not VarIsNull(lookupValues[i]) and (loCaseInsensitive in Options) then
2369 >            lookupValues[i] := UpperCase(lookupValues[i]);
2370 >      end;
2371 >    end;
2372 >    while not result and not EOF do   {search for a matching record}
2373 >    begin
2374 >      i := 0;
2375 >      result := true;
2376 >      while result and (i < fieldCount) do
2377 >      {see if all of the key fields matches}
2378 >      begin
2379 >        fieldValue := TField(keyFieldList[i]).Value;
2380 >        result := not (VarIsNull(fieldValue) xor VarIsNull(lookupValues[i]));
2381 >        if result and not VarIsNull(fieldValue) then
2382          begin
2383            try
2384 <            fld := VarAsType(fld, VarType(val));
1573 <          except
1574 <            on E: EVariantError do result := False;
1575 <          end;
1576 <          if Result then
1577 <            if TField(fl[i]).DataType = ftString then
2384 >            if TField(keyFieldList[i]).DataType = ftString then
2385              begin
2386 +              {strings need special handling because of the locate options that
2387 +               apply to them}
2388 +              fieldValueAsString := TField(keyFieldList[i]).AsString;
2389 +              lookupValueAsString := lookupValues[i];
2390                if (loCaseInsensitive in Options) then
2391 <              begin
2392 <                fld := AnsiUpperCase(fld);
1582 <                val := AnsiUpperCase(val);
1583 <              end;
1584 <              fld := TrimRight(fld);
1585 <              val := TrimRight(val);
2391 >                fieldValueAsString := UpperCase(fieldValueAsString);
2392 >
2393                if (loPartialKey in Options) then
2394 <                result := result and (AnsiPos(val, fld) = 1)
2394 >                result := result and (Pos(lookupValueAsString, fieldValueAsString) = 1)
2395                else
2396 <                result := result and (val = fld);
2397 <            end else
2398 <                result := result and (val = fld);
2396 >                result := result and (fieldValueAsString = lookupValueAsString);
2397 >            end
2398 >            else
2399 >              result := result and (lookupValues[i] =
2400 >                             VarAsType(fieldValue, VarType(lookupValues[i])));
2401 >          except on EVariantError do
2402 >            result := False;
2403 >          end;
2404          end;
2405          Inc(i);
2406        end;
2407        if not result then
2408 <        Next;
2408 >          Next;
2409      end;
2410      if not result then
2411        Bookmark := CurBookmark
2412      else
2413        CursorPosChanged;
2414    finally
2415 <    fl.Free;
2415 >    keyFieldList.Free;
2416 >    SetLength(lookupValues,0)
2417    end;
2418   end;
2419  
2420   procedure TIBCustomDataSet.InternalPostRecord(Qry: TIBSQL; Buff: Pointer);
2421   var
2422 <  i, j, k: Integer;
2422 >  i, j, k, arr: Integer;
2423    pbd: PBlobDataArray;
2424 +  pda: PArrayDataArray;
2425   begin
2426    pbd := PBlobDataArray(PChar(Buff) + FBlobCacheOffset);
2427 <  j := 0;
2427 >  pda := PArrayDataArray(PChar(Buff) + FArrayCacheOffset);
2428 >  j := 0; arr := 0;
2429    for i := 0 to FieldCount - 1 do
2430      if Fields[i].IsBlob then
2431      begin
# Line 1619 | Line 2434 | begin
2434        begin
2435          pbd^[j].Finalize;
2436          PISC_QUAD(
2437 <          PChar(Buff) + PRecordData(Buff)^.rdFields[k].fdDataOfs)^ :=
2437 >          PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=
2438            pbd^[j].BlobID;
2439          PRecordData(Buff)^.rdFields[k].fdIsNull := pbd^[j].Size = 0;
2440 +      end
2441 +      else
2442 +      begin
2443 +        PRecordData(Buff)^.rdFields[k].fdIsNull := true;
2444 +        with PISC_QUAD(PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ do
2445 +        begin
2446 +          gds_quad_high := 0;
2447 +          gds_quad_low := 0;
2448 +        end;
2449        end;
2450        Inc(j);
2451 +    end
2452 +    else
2453 +    if Fields[i] is TIBArrayField then
2454 +    begin
2455 +      if pda^[arr] <> nil then
2456 +      begin
2457 +        k := FMappedFieldPosition[Fields[i].FieldNo -1];
2458 +        PISC_QUAD(
2459 +          PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=  pda^[arr].ArrayIntf.GetArrayID;
2460 +        PRecordData(Buff)^.rdFields[k].fdIsNull := pda^[arr].ArrayIntf.IsEmpty;
2461 +      end;
2462 +      Inc(arr);
2463      end;
2464    if Assigned(FUpdateObject) then
2465    begin
2466      if (Qry = FQDelete) then
2467 <      FUpdateObject.Apply(ukDelete)
2467 >      FUpdateObject.Apply(ukDelete,Buff)
2468      else if (Qry = FQInsert) then
2469 <      FUpdateObject.Apply(ukInsert)
2469 >      FUpdateObject.Apply(ukInsert,Buff)
2470      else
2471 <      FUpdateObject.Apply(ukModify);
2471 >      FUpdateObject.Apply(ukModify,Buff);
2472    end
2473    else begin
2474 <    SetInternalSQLParams(Qry, Buff);
2474 >    SetInternalSQLParams(Qry.Params, Buff);
2475      Qry.ExecQuery;
2476    end;
2477 +  if Qry.FieldCount > 0 then {Has RETURNING Clause}
2478 +    UpdateRecordFromQuery(Qry.Current,Buff);
2479    PRecordData(Buff)^.rdUpdateStatus := usUnmodified;
2480    PRecordData(Buff)^.rdCachedUpdateStatus := cusUnmodified;
2481    SetModified(False);
# Line 1649 | Line 2487 | end;
2487   procedure TIBCustomDataSet.InternalRefreshRow;
2488   var
2489    Buff: PChar;
1652  SetCursor: Boolean;
2490    ofs: DWORD;
2491    Qry: TIBSQL;
2492   begin
2493 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
1657 <  if SetCursor then
1658 <    Screen.Cursor := crHourGlass;
2493 >  FBase.SetCursor;
2494    try
2495      Buff := GetActiveBuf;
2496      if CanRefresh then
# Line 1672 | Line 2507 | begin
2507          end
2508          else
2509            Qry := FQRefresh;
2510 <        SetInternalSQLParams(Qry, Buff);
2510 >        SetInternalSQLParams(Qry.Params, Buff);
2511          Qry.ExecQuery;
2512          try
2513 <          if (Qry.SQLType = SQLExecProcedure) or
1679 <             (Qry.Next <> nil) then
2513 >          if (Qry.SQLStatementType = SQLExecProcedure) or Qry.Next then
2514            begin
2515              ofs := PRecordData(Buff)^.rdSavedOffset;
2516              FetchCurrentRecordToBuffer(Qry,
# Line 1699 | Line 2533 | begin
2533      else
2534        IBError(ibxeCannotRefresh, [nil]);
2535    finally
2536 <    if SetCursor and (Screen.Cursor = crHourGlass) then
1703 <      Screen.Cursor := crDefault;
2536 >    FBase.RestoreCursor;
2537    end;
2538   end;
2539  
# Line 1770 | Line 2603 | begin
2603   end;
2604  
2605   procedure TIBCustomDataSet.InternalPrepare;
1773 var
1774  SetCursor: Boolean;
1775  DidActivate: Boolean;
2606   begin
2607    if FInternalPrepared then
2608      Exit;
2609 <  DidActivate := False;
1780 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
1781 <  if SetCursor then
1782 <    Screen.Cursor := crHourGlass;
2609 >  FBase.SetCursor;
2610    try
2611      ActivateConnection;
2612 <    DidActivate := ActivateTransaction;
2612 >    ActivateTransaction;
2613      FBase.CheckDatabase;
2614      FBase.CheckTransaction;
2615 +    if HasParser and (FParser.SQLText <> FQSelect.SQL.Text) then
2616 +    begin
2617 +      FQSelect.OnSQLChanged := nil; {Do not react to change}
2618 +      try
2619 +        FQSelect.SQL.Text := FParser.SQLText;
2620 +      finally
2621 +        FQSelect.OnSQLChanged := SQLChanged;
2622 +      end;
2623 +    end;
2624 + //   writeln( FQSelect.SQL.Text);
2625      if FQSelect.SQL.Text <> '' then
2626      begin
2627        if not FQSelect.Prepared then
2628        begin
2629 +        FQSelect.GenerateParamNames := FGenerateParamNames;
2630          FQSelect.ParamCheck := ParamCheck;
2631          FQSelect.Prepare;
2632        end;
2633 <      if (FQDelete.SQL.Text <> '') and (not FQDelete.Prepared) then
2633 >      FQDelete.GenerateParamNames := FGenerateParamNames;
2634 >      if (Trim(FQDelete.SQL.Text) <> '') and (not FQDelete.Prepared) then
2635          FQDelete.Prepare;
2636 <      if (FQInsert.SQL.Text <> '') and (not FQInsert.Prepared) then
2636 >      FQInsert.GenerateParamNames := FGenerateParamNames;
2637 >      if (Trim(FQInsert.SQL.Text) <> '') and (not FQInsert.Prepared) then
2638          FQInsert.Prepare;
2639 <      if (FQRefresh.SQL.Text <> '') and (not FQRefresh.Prepared) then
2639 >      FQRefresh.GenerateParamNames := FGenerateParamNames;
2640 >      if (Trim(FQRefresh.SQL.Text) <> '') and (not FQRefresh.Prepared) then
2641          FQRefresh.Prepare;
2642 <      if (FQModify.SQL.Text <> '') and (not FQModify.Prepared) then
2642 >      FQModify.GenerateParamNames := FGenerateParamNames;
2643 >      if (Trim(FQModify.SQL.Text) <> '') and (not FQModify.Prepared) then
2644          FQModify.Prepare;
2645        FInternalPrepared := True;
2646        InternalInitFieldDefs;
2647      end else
2648        IBError(ibxeEmptyQuery, [nil]);
2649    finally
2650 <    if DidActivate then
1809 <      DeactivateTransaction;
1810 <    if SetCursor and (Screen.Cursor = crHourGlass) then
1811 <      Screen.Cursor := crDefault;
2650 >    FBase.RestoreCursor;
2651    end;
2652   end;
2653  
# Line 1837 | Line 2676 | var
2676    begin
2677      CopyRecordBuffer(Buffer, OldBuffer);
2678      if BlobFieldCount > 0 then
2679 <      FillChar(PChar(OldBuffer)[FBlobCacheOffset], BlobFieldCount * SizeOf(TIBBlobStream),
2679 >      FillChar(PChar(OldBuffer)[FBlobCacheOffset],
2680 >               BlobFieldCount * SizeOf(TIBBlobStream) + ArrayFieldCount * SizeOf(IArray),
2681                 0);
2682    end;
2683  
# Line 1879 | Line 2719 | begin
2719    if (FBase.Database <> Value) then
2720    begin
2721      CheckDatasetClosed;
2722 +    InternalUnPrepare;
2723      FBase.Database := Value;
2724      FQDelete.Database := Value;
2725      FQInsert.Database := Value;
2726      FQRefresh.Database := Value;
2727      FQSelect.Database := Value;
2728      FQModify.Database := Value;
2729 +    FDatabaseInfo.Database := Value;
2730 +    FGeneratorField.Database := Value;
2731    end;
2732   end;
2733  
# Line 1906 | Line 2749 | begin
2749    end;
2750   end;
2751  
2752 < procedure TIBCustomDataSet.SetInternalSQLParams(Qry: TIBSQL; Buffer: Pointer);
2752 > procedure TIBCustomDataSet.SetInternalSQLParams(Params: ISQLParams; Buffer: Pointer);
2753   var
2754    i, j: Integer;
2755    cr, data: PChar;
2756 <  fn, st: string;
2756 >  fn: string;
2757 >  st: RawByteString;
2758    OldBuffer: Pointer;
2759    ts: TTimeStamp;
2760 +  Param: ISQLParam;
2761   begin
2762    if (Buffer = nil) then
2763      IBError(ibxeBufferNotSet, [nil]);
# Line 1920 | Line 2765 | begin
2765      InternalPrepare;
2766    OldBuffer := nil;
2767    try
2768 <    for i := 0 to Qry.Params.Count - 1 do
2768 >    for i := 0 to Params.GetCount - 1 do
2769      begin
2770 <      fn := Qry.Params[i].Name;
2770 >      Param := Params[i];
2771 >      fn := Param.Name;
2772        if (Pos('OLD_', fn) = 1) then {mbcs ok}
2773        begin
2774          fn := Copy(fn, 5, Length(fn));
# Line 1942 | Line 2788 | begin
2788               cr := Buffer;
2789        j := FQSelect.FieldIndex[fn] + 1;
2790        if (j > 0) then
2791 <        with PRecordData(cr)^ do
2791 >        with PRecordData(cr)^,rdFields[j], FFieldColumns^[j] do
2792          begin
2793 <          if Qry.Params[i].name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2793 >          if Param.name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2794            begin
2795 <            PIBDBKey(Qry.Params[i].AsPointer)^ := rdDBKey;
2795 >            PIBDBKey(Param.AsPointer)^ := rdDBKey;
2796              continue;
2797            end;
2798 <          if rdFields[j].fdIsNull then
2799 <            Qry.Params[i].IsNull := True
2798 >          if fdIsNull then
2799 >            Param.IsNull := True
2800            else begin
2801 <            Qry.Params[i].IsNull := False;
2802 <            data := cr + rdFields[j].fdDataOfs;
2803 <            case rdFields[j].fdDataType of
2801 >            Param.IsNull := False;
2802 >            data := cr + fdDataOfs;
2803 >            case fdDataType of
2804                SQL_TEXT, SQL_VARYING:
2805                begin
2806 <                SetString(st, data, rdFields[j].fdDataLength);
2807 <                Qry.Params[i].AsString := st;
2806 >                SetString(st, data, fdDataLength);
2807 >                SetCodePage(st,fdCodePage,false);
2808 >                Param.AsString := st;
2809                end;
2810              SQL_FLOAT, SQL_DOUBLE, SQL_D_FLOAT:
2811 <              Qry.Params[i].AsDouble := PDouble(data)^;
2811 >              Param.AsDouble := PDouble(data)^;
2812              SQL_SHORT, SQL_LONG:
2813              begin
2814 <              if rdFields[j].fdDataScale = 0 then
2815 <                Qry.Params[i].AsLong := PLong(data)^
2816 <              else if rdFields[j].fdDataScale >= (-4) then
2817 <                Qry.Params[i].AsCurrency := PCurrency(data)^
2814 >              if fdDataScale = 0 then
2815 >                Param.AsLong := PLong(data)^
2816 >              else
2817 >              if fdDataScale >= (-4) then
2818 >                Param.AsCurrency := PCurrency(data)^
2819                else
2820 <                Qry.Params[i].AsDouble := PDouble(data)^;
2820 >                Param.AsDouble := PDouble(data)^;
2821              end;
2822              SQL_INT64:
2823              begin
2824 <              if rdFields[j].fdDataScale = 0 then
2825 <                Qry.Params[i].AsInt64 := PInt64(data)^
2826 <              else if rdFields[j].fdDataScale >= (-4) then
2827 <                Qry.Params[i].AsCurrency := PCurrency(data)^
2824 >              if fdDataScale = 0 then
2825 >                Param.AsInt64 := PInt64(data)^
2826 >              else
2827 >              if fdDataScale >= (-4) then
2828 >                Param.AsCurrency := PCurrency(data)^
2829                else
2830 <                Qry.Params[i].AsDouble := PDouble(data)^;
2830 >                Param.AsDouble := PDouble(data)^;
2831              end;
2832              SQL_BLOB, SQL_ARRAY, SQL_QUAD:
2833 <              Qry.Params[i].AsQuad := PISC_QUAD(data)^;
2833 >              Param.AsQuad := PISC_QUAD(data)^;
2834              SQL_TYPE_DATE:
2835              begin
2836                ts.Date := PInt(data)^;
2837                ts.Time := 0;
2838 <              Qry.Params[i].AsDate :=
1990 <                TimeStampToDateTime(ts);
2838 >              Param.AsDate := TimeStampToDateTime(ts);
2839              end;
2840              SQL_TYPE_TIME:
2841              begin
2842                ts.Date := 0;
2843                ts.Time := PInt(data)^;
2844 <              Qry.Params[i].AsTime :=
1997 <                TimeStampToDateTime(ts);
2844 >              Param.AsTime := TimeStampToDateTime(ts);
2845              end;
2846              SQL_TIMESTAMP:
2847 <              Qry.Params[i].AsDateTime :=
2848 <                TimeStampToDateTime(
2849 <                  MSecsToTimeStamp(PDouble(data)^));
2847 >              Param.AsDateTime :=
2848 >                       TimeStampToDateTime(MSecsToTimeStamp(trunc(PDouble(data)^)));
2849 >            SQL_BOOLEAN:
2850 >              Param.AsBoolean := PWordBool(data)^;
2851            end;
2852          end;
2853        end;
# Line 2048 | Line 2896 | begin
2896      FQRefresh.Transaction := Value;
2897      FQSelect.Transaction := Value;
2898      FQModify.Transaction := Value;
2899 +    FGeneratorField.Transaction := Value;
2900    end;
2901   end;
2902  
# Line 2085 | Line 2934 | begin
2934    end;
2935   end;
2936  
2937 + procedure TIBCustomDataSet.RegisterIBLink(Sender: TIBControlLink);
2938 + begin
2939 +  if FIBLinks.IndexOf(Sender) = -1 then
2940 +    FIBLinks.Add(Sender);
2941 + end;
2942 +
2943  
2944   procedure TIBCustomDataSet.SQLChanging(Sender: TObject);
2945   begin
2946 <  if FOpen then
2947 <    InternalClose;
2946 >  Active := false;
2947 > {  if FOpen then
2948 >    InternalClose;}
2949    if FInternalPrepared then
2950      InternalUnPrepare;
2951 +  FieldDefs.Clear;
2952 +  FieldDefs.Updated := false;
2953 + end;
2954 +
2955 + procedure TIBCustomDataSet.SQLChanged(Sender: TObject);
2956 + begin
2957 +  FBaseSQLSelect.assign(FQSelect.SQL);
2958   end;
2959  
2960   { I can "undelete" uninserted records (make them "inserted" again).
# Line 2120 | Line 2983 | begin
2983    end;
2984   end;
2985  
2986 + procedure TIBCustomDataSet.UnRegisterIBLink(Sender: TIBControlLink);
2987 + begin
2988 +  FIBLinks.Remove(Sender);
2989 + end;
2990 +
2991   function TIBCustomDataSet.UpdateStatus: TUpdateStatus;
2992   begin
2993    if Active then
# Line 2136 | Line 3004 | begin
3004    Result := Assigned( FQSelect ) and FQSelect.EOF;
3005   end;
3006  
3007 + function TIBCustomDataSet.ParamByName(ParamName: String): ISQLParam;
3008 + begin
3009 +  ActivateConnection;
3010 +  ActivateTransaction;
3011 +  if not FInternalPrepared then
3012 +    InternalPrepare;
3013 +  Result := Params.ByName(ParamName);
3014 + end;
3015 +
3016 + {Beware: the parameter FCache is used as an identifier to determine which
3017 + cache is being operated on and is not referenced in the computation.
3018 + The result is an adjusted offset into the identified cache, either the
3019 + Buffer Cache or the old Buffer Cache.}
3020 +
3021   function TIBCustomDataSet.AdjustPosition(FCache: PChar; Offset: DWORD;
3022 <                                        Origin: Integer): Integer;
3022 >                                        Origin: Integer): DWORD;
3023   var
3024    OldCacheSize: Integer;
3025   begin
# Line 2174 | Line 3056 | procedure TIBCustomDataSet.ReadCache(FCa
3056                                      Buffer: PChar);
3057   var
3058    pCache: PChar;
3059 +  AdjustedOffset: DWORD;
3060    bOld: Boolean;
3061   begin
3062    bOld := (FCache = FOldBufferCache);
3063 <  pCache := PChar(AdjustPosition(FCache, Offset, Origin));
3063 >  AdjustedOffset := AdjustPosition(FCache, Offset, Origin);
3064    if not bOld then
3065 <    pCache := FBufferCache + Integer(pCache)
3065 >    pCache := FBufferCache + AdjustedOffset
3066    else
3067 <    pCache := FOldBufferCache + Integer(pCache);
3067 >    pCache := FOldBufferCache + AdjustedOffset;
3068    Move(pCache^, Buffer^, DWORD(FRecordBufferSize));
3069    AdjustPosition(FCache, FRecordBufferSize, FILE_CURRENT);
3070   end;
# Line 2211 | Line 3094 | procedure TIBCustomDataSet.WriteCache(FC
3094                                       Buffer: PChar);
3095   var
3096    pCache: PChar;
3097 +  AdjustedOffset: DWORD;
3098    bOld: Boolean;
3099    dwEnd: DWORD;
3100   begin
3101    bOld := (FCache = FOldBufferCache);
3102 <  pCache := PChar(AdjustPosition(FCache, Offset, Origin));
3102 >  AdjustedOffset := AdjustPosition(FCache, Offset, Origin);
3103    if not bOld then
3104 <    pCache := FBufferCache + Integer(pCache)
3104 >    pCache := FBufferCache + AdjustedOffset
3105    else
3106 <    pCache := FOldBufferCache + Integer(pCache);
3106 >    pCache := FOldBufferCache + AdjustedOffset;
3107    Move(Buffer^, pCache^, FRecordBufferSize);
3108    dwEnd := AdjustPosition(FCache, FRecordBufferSize, FILE_CURRENT);
3109    if not bOld then
# Line 2257 | Line 3141 | var
3141    Buff: PChar;
3142    bTr, bDB: Boolean;
3143   begin
3144 +  if (Field = nil) or (Field.DataSet <> self) then
3145 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3146    Buff := GetActiveBuf;
3147    if Buff = nil then
3148    begin
3149      fs := TIBBlobStream.Create;
3150      fs.Mode := bmReadWrite;
3151 +    fs.Database := Database;
3152 +    fs.Transaction := Transaction;
3153 +    fs.SetField(Field);
3154      FBlobStreamList.Add(Pointer(fs));
3155      result := TIBDSBlobStream.Create(Field, fs, Mode);
3156      exit;
# Line 2276 | Line 3165 | begin
3165      fs.Mode := bmReadWrite;
3166      fs.Database := Database;
3167      fs.Transaction := Transaction;
3168 +    fs.SetField(Field);
3169      fs.BlobID :=
3170 <      PISC_QUAD(@Buff[PRecordData(Buff)^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3170 >      PISC_QUAD(@Buff[FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3171      if (CachedUpdates) then
3172      begin
3173        bTr := not Transaction.InTransaction;
# Line 2298 | Line 3188 | begin
3188    result := TIBDSBlobStream.Create(Field, fs, Mode);
3189   end;
3190  
3191 + function TIBCustomDataSet.GetArray(Field: TIBArrayField): IArray;
3192 + var Buff: PChar;
3193 +    pda: PArrayDataArray;
3194 +    bTr, bDB: Boolean;
3195 + begin
3196 +  if (Field = nil) or (Field.DataSet <> self) then
3197 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3198 +  Buff := GetActiveBuf;
3199 +  if Buff = nil then
3200 +    Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3201 +                              Field.FRelationName,Field.FieldName)
3202 +  else
3203 +  begin
3204 +    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3205 +    if pda^[Field.FCacheOffset] = nil then
3206 +    begin
3207 +      AdjustRecordOnInsert(Buff);
3208 +      if Field.IsNull then
3209 +        Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3210 +                                Field.FRelationName,Field.FieldName)
3211 +      else
3212 +        Result := Database.Attachment.OpenArray(Transaction.TransactionIntf,
3213 +                            Field.FRelationName,Field.FieldName,Field.ArrayID);
3214 +      pda^[Field.FCacheOffset] := TIBArray.Create(Field,Result);
3215 +      FArrayList.Add(pda^[Field.FCacheOffset]);
3216 +      if (CachedUpdates) then
3217 +      begin
3218 +        bTr := not Transaction.InTransaction;
3219 +        bDB := not Database.Connected;
3220 +        if bDB then
3221 +          Database.Open;
3222 +        if bTr then
3223 +          Transaction.StartTransaction;
3224 +         pda^[Field.FCacheOffset].ArrayIntf.PreLoad;
3225 +        if bTr then
3226 +          Transaction.Commit;
3227 +        if bDB then
3228 +          Database.Close;
3229 +      end;
3230 +      WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3231 +    end
3232 +    else
3233 +      Result := pda^[Field.FCacheOffset].ArrayIntf;
3234 +  end;
3235 + end;
3236 +
3237 + procedure TIBCustomDataSet.SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
3238 + var Buff: PChar;
3239 +    pda: PArrayDataArray;
3240 + begin
3241 +  if (Field = nil) or (Field.DataSet <> self) then
3242 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3243 +  Buff := GetActiveBuf;
3244 +  if Buff <> nil then
3245 +  begin
3246 +    AdjustRecordOnInsert(Buff);
3247 +    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3248 +    pda^[Field.FCacheOffset].FArray := AnArray;
3249 +    WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3250 +  end;
3251 + end;
3252 +
3253   function TIBCustomDataSet.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer;
3254   const
3255    CMPLess = -1;
# Line 2330 | Line 3282 | begin
3282    if FCachedUpdates and
3283      (Buff^.rdCachedUpdateStatus in [cusUnmodified]) then
3284      SaveOldBuffer(PChar(Buff));
3285 <  inherited;
3285 >  inherited DoBeforeDelete;
3286 > end;
3287 >
3288 > procedure TIBCustomDataSet.DoAfterDelete;
3289 > begin
3290 >  inherited DoAfterDelete;
3291 >  FBase.DoAfterDelete(self);
3292 >  InternalAutoCommit;
3293   end;
3294  
3295   procedure TIBCustomDataSet.DoBeforeEdit;
# Line 2344 | Line 3303 | begin
3303    if FCachedUpdates and (Buff^.rdCachedUpdateStatus in [cusUnmodified, cusInserted]) then
3304      SaveOldBuffer(PChar(Buff));
3305    CopyRecordBuffer(GetActiveBuf, FOldBuffer);
3306 <  inherited;
3306 >  inherited DoBeforeEdit;
3307 > end;
3308 >
3309 > procedure TIBCustomDataSet.DoAfterEdit;
3310 > begin
3311 >  inherited DoAfterEdit;
3312 >  FBase.DoAfterEdit(self);
3313   end;
3314  
3315   procedure TIBCustomDataSet.DoBeforeInsert;
3316   begin
3317    if not CanInsert then
3318      IBError(ibxeCannotInsert, [nil]);
3319 <  inherited;
3319 >  inherited DoBeforeInsert;
3320 > end;
3321 >
3322 > procedure TIBCustomDataSet.DoAfterInsert;
3323 > begin
3324 >  if GeneratorField.ApplyOnEvent = gaeOnNewRecord then
3325 >    GeneratorField.Apply;
3326 >  inherited DoAfterInsert;
3327 >  FBase.DoAfterInsert(self);
3328 > end;
3329 >
3330 > procedure TIBCustomDataSet.DoBeforeClose;
3331 > begin
3332 >  inherited DoBeforeClose;
3333 >  if FInTransactionEnd and (FCloseAction = TARollback) then
3334 >     Exit;
3335 >  if State in [dsInsert,dsEdit] then
3336 >  begin
3337 >    if DataSetCloseAction = dcSaveChanges then
3338 >      Post;
3339 >      {Note this can fail with an exception e.g. due to
3340 >       database validation error. In which case the dataset remains open }
3341 >  end;
3342 >  if FCachedUpdates and FUpdatesPending and (DataSetCloseAction = dcSaveChanges) then
3343 >    ApplyUpdates;
3344 > end;
3345 >
3346 > procedure TIBCustomDataSet.DoBeforeOpen;
3347 > var i: integer;
3348 > begin
3349 >  if assigned(FParser) then
3350 >     FParser.Reset;
3351 >  for i := 0 to FIBLinks.Count - 1 do
3352 >    TIBControlLink(FIBLinks[i]).UpdateSQL(self);
3353 >  inherited DoBeforeOpen;
3354 >  for i := 0 to FIBLinks.Count - 1 do
3355 >    TIBControlLink(FIBLinks[i]).UpdateParams(self);
3356 > end;
3357 >
3358 > procedure TIBCustomDataSet.DoBeforePost;
3359 > begin
3360 >  inherited DoBeforePost;
3361 >  if (State = dsInsert) and
3362 >     (GeneratorField.ApplyOnEvent = gaeOnPostRecord) then
3363 >     GeneratorField.Apply
3364 > end;
3365 >
3366 > procedure TIBCustomDataSet.DoAfterPost;
3367 > begin
3368 >  inherited DoAfterPost;
3369 >  FBase.DoAfterPost(self);
3370 >  InternalAutoCommit;
3371   end;
3372  
3373   procedure TIBCustomDataSet.FetchAll;
3374   var
3375 <  SetCursor: Boolean;
2360 <  CurBookmark: string;
3375 >  CurBookmark: TBookmark;
3376   begin
3377 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
3378 <  if SetCursor then
2364 <    Screen.Cursor := crHourGlass;
2365 <  try
3377 >  FBase.SetCursor;
3378 > try
3379      if FQSelect.EOF or not FQSelect.Open then
3380        exit;
3381      DisableControls;
# Line 2374 | Line 3387 | begin
3387        EnableControls;
3388      end;
3389    finally
3390 <    if SetCursor and (Screen.Cursor = crHourGlass) then
2378 <      Screen.Cursor := crDefault;
3390 >    FBase.RestoreCursor;
3391    end;
3392   end;
3393  
# Line 2423 | Line 3435 | begin
3435      result := FDataLink.DataSource;
3436   end;
3437  
3438 + function TIBCustomDataSet.GetDBAliasName(FieldNo: integer): string;
3439 + begin
3440 +  Result := FAliasNameMap[FieldNo-1]
3441 + end;
3442 +
3443 + function TIBCustomDataSet.GetFieldDefFromAlias(aliasName: string): TFieldDef;
3444 + var
3445 +   i: integer;
3446 + begin
3447 +   Result := nil;
3448 +   for i := 0 to Length(FAliasNameMap) - 1 do
3449 +       if FAliasNameMap[i] = aliasName then
3450 +       begin
3451 +         Result := FieldDefs[i];
3452 +         Exit
3453 +       end;
3454 + end;
3455 +
3456   function TIBCustomDataSet.GetFieldClass(FieldType: TFieldType): TFieldClass;
3457   begin
3458    Result := DefaultFieldClasses[FieldType];
# Line 2441 | Line 3471 | begin
3471    result := False;
3472    Buff := GetActiveBuf;
3473    if (Buff = nil) or
3474 <     (not IsVisible(Buff)) then
3474 >     (not IsVisible(Buff)) or not assigned(Field.DataSet) then
3475      exit;
3476    { The intention here is to stuff the buffer with the data for the
3477     referenced field for the current record }
# Line 2453 | Line 3483 | begin
3483      if result and (Buffer <> nil) then
3484        Move(Buff[1], Buffer^, Field.DataSize);
3485    end
3486 <  else if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3486 >  else
3487 >  if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3488       (FMappedFieldPosition[Field.FieldNo - 1] <= CurrentRecord^.rdFieldCount) then
3489 +  with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]],
3490 +                         FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]] do
3491    begin
3492 <    result := not CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull;
3492 >    result := not fdIsNull;
3493      if result and (Buffer <> nil) then
2461      with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]] do
3494        begin
3495 <        Data := Buff + CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs;
3495 >        Data := Buff + fdDataOfs;
3496          if (fdDataType = SQL_VARYING) or (fdDataType = SQL_TEXT) then
3497          begin
3498 <          Move(Data^, Buffer^, fdDataLength);
3499 <          PChar(Buffer)[fdDataLength] := #0;
3498 >          if fdDataLength < Field.DataSize then
3499 >          begin
3500 >            Move(Data^, Buffer^, fdDataLength);
3501 >            PChar(Buffer)[fdDataLength] := #0;
3502 >          end
3503 >          else
3504 >            IBError(ibxeFieldSizeError,[Field.FieldName])
3505          end
3506          else
3507            Move(Data^, Buffer^, Field.DataSize);
# Line 2507 | Line 3544 | begin
3544          if not Accept and (GetMode = gmCurrent) then
3545            GetMode := gmPrior;
3546        except
3547 < //        Application.HandleException(Self);
3547 > //        FBase.HandleException(Self);
3548        end;
3549      end;
3550      RestoreState(SaveState);
# Line 2526 | Line 3563 | begin
3563          if FCurrentRecord < FRecordCount then
3564            ReadRecordCache(FCurrentRecord, Buffer, False)
3565          else begin
3566 <          while (not FQSelect.EOF) and
2530 <                (FQSelect.Next <> nil) and
3566 >          while (not FQSelect.EOF) and FQSelect.Next  and
3567                  (FCurrentRecord >= FRecordCount) do begin
3568              FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
3569              Inc(FRecordCount);
# Line 2601 | Line 3637 | begin
3637    result := FRecordBufferSize;
3638   end;
3639  
3640 + procedure TIBCustomDataSet.InternalAutoCommit;
3641 + begin
3642 +  with Transaction do
3643 +    if InTransaction and (FAutoCommit = acCommitRetaining) then
3644 +    begin
3645 +      if CachedUpdates then ApplyUpdates;
3646 +      CommitRetaining;
3647 +    end;
3648 + end;
3649 +
3650   procedure TIBCustomDataSet.InternalAddRecord(Buffer: Pointer; Append: Boolean);
3651   begin
3652    CheckEditState;
# Line 2628 | Line 3674 | procedure TIBCustomDataSet.InternalCance
3674   var
3675    Buff: PChar;
3676    CurRec: Integer;
3677 +  pda: PArrayDataArray;
3678 +  i: integer;
3679   begin
3680 <  inherited;
3680 >  inherited InternalCancel;
3681    Buff := GetActiveBuf;
3682 <  if Buff <> nil then begin
3682 >  if Buff <> nil then
3683 >  begin
3684 >    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3685 >    for i := 0 to ArrayFieldCount - 1 do
3686 >      pda^[i].ArrayIntf.CancelChanges;
3687      CurRec := FCurrentRecord;
3688      AdjustRecordOnInsert(Buff);
3689      if (State = dsEdit) then begin
# Line 2654 | Line 3706 | begin
3706      DeactivateTransaction;
3707    FQSelect.Close;
3708    ClearBlobCache;
3709 +  ClearArrayCache;
3710    FreeRecordBuffer(FModelBuffer);
3711    FreeRecordBuffer(FOldBuffer);
3712    FCurrentRecord := -1;
# Line 2669 | Line 3722 | begin
3722    FOBEnd := 0;
3723    FreeMem(FBufferCache);
3724    FBufferCache := nil;
3725 +  FreeMem(FFieldColumns);
3726 +  FFieldColumns := nil;
3727    FreeMem(FOldBufferCache);
3728    FOldBufferCache := nil;
3729    BindFields(False);
3730 +  ResetParser;
3731    if DefaultFields then DestroyFields;
3732   end;
3733  
3734   procedure TIBCustomDataSet.InternalDelete;
3735   var
3736    Buff: PChar;
2681  SetCursor: Boolean;
3737   begin
3738 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
2684 <  if SetCursor then
2685 <    Screen.Cursor := crHourGlass;
3738 >  FBase.SetCursor;
3739    try
3740      Buff := GetActiveBuf;
3741      if CanDelete then
# Line 2707 | Line 3760 | begin
3760      end else
3761        IBError(ibxeCannotDelete, [nil]);
3762    finally
3763 <    if SetCursor and (Screen.Cursor = crHourGlass) then
2711 <      Screen.Cursor := crDefault;
3763 >    FBase.RestoreCursor;
3764    end;
3765   end;
3766  
# Line 2724 | Line 3776 | end;
3776  
3777   procedure TIBCustomDataSet.InternalHandleException;
3778   begin
3779 <  Application.HandleException(Self)
3779 >  FBase.HandleException(Self)
3780   end;
3781  
3782   procedure TIBCustomDataSet.InternalInitFieldDefs;
3783 + begin
3784 +  if not InternalPrepared then
3785 +  begin
3786 +    InternalPrepare;
3787 +    exit;
3788 +  end;
3789 +   FieldDefsFromQuery(FQSelect);
3790 + end;
3791 +
3792 + procedure TIBCustomDataSet.FieldDefsFromQuery(SourceQuery: TIBSQL);
3793   const
3794    DefaultSQL = 'Select F.RDB$COMPUTED_BLR, ' + {do not localize}
3795                 'F.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME ' + {do not localize}
# Line 2736 | Line 3798 | const
3798                 'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
3799                 'and ((not F.RDB$COMPUTED_BLR is NULL) or ' + {do not localize}
3800                 '     (not F.RDB$DEFAULT_VALUE is NULL)) '; {do not localize}
3801 +
3802 +  DefaultSQLODS12 = 'Select F.RDB$COMPUTED_BLR, ' + {do not localize}
3803 +               'F.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME, R.RDB$IDENTITY_TYPE ' + {do not localize}
3804 +               'from RDB$RELATION_FIELDS R, RDB$FIELDS F ' + {do not localize}
3805 +               'where R.RDB$RELATION_NAME = :RELATION ' +  {do not localize}
3806 +               'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
3807 +               'and ((not F.RDB$COMPUTED_BLR is NULL) or ' + {do not localize}
3808 +               '     (not F.RDB$DEFAULT_VALUE is NULL) or ' + {do not localize}
3809 +               '     ( not R.RDB$IDENTITY_TYPE is NULL))' ; {do not localize}
3810 +
3811   var
3812    FieldType: TFieldType;
3813    FieldSize: Word;
3814 +  FieldDataSize: integer;
3815 +  charSetID: short;
3816 +  CharSetSize: integer;
3817 +  CharSetName: RawByteString;
3818 +  FieldCodePage: TSystemCodePage;
3819    FieldNullable : Boolean;
3820    i, FieldPosition, FieldPrecision: Integer;
3821 <  FieldAliasName: string;
3822 <  RelationName, FieldName: string;
3821 >  FieldAliasName, DBAliasName: string;
3822 >  aRelationName, FieldName: string;
3823    Query : TIBSQL;
3824    FieldIndex: Integer;
3825    FRelationNodes : TRelationNode;
3826 +  aArrayDimensions: integer;
3827 +  aArrayBounds: TArrayBounds;
3828 +  ArrayMetaData: IArrayMetaData;
3829  
3830    function Add_Node(Relation, Field : String) : TRelationNode;
3831    var
# Line 2768 | Line 3848 | var
3848        FField.FieldName := Query.Fields[2].AsString;
3849        FField.DEFAULT_VALUE := not Query.Fields[1].IsNull;
3850        FField.COMPUTED_BLR := not Query.Fields[0].IsNull;
3851 +      FField.IDENTITY_COLUMN := (Query.FieldCount > 3) and not Query.Fields[3].IsNull;
3852        FField.NextField := Result.FieldNodes;
3853        Result.FieldNodes := FField;
3854        Query.Next;
# Line 2821 | Line 3902 | var
3902          FField := Ffield.NextField;
3903    end;
3904  
3905 +  function Is_IDENTITY_COLUMN(Relation, Field : String) : Boolean;
3906 +  var
3907 +    FRelation : TRelationNode;
3908 +    FField : TFieldNode;
3909 +  begin
3910 +    FRelation := FRelationNodes;
3911 +    while Assigned(FRelation) and
3912 +         (FRelation.RelationName <> Relation) do
3913 +      FRelation := FRelation.NextRelation;
3914 +    if not Assigned(FRelation) then
3915 +      FRelation := Add_Node(Relation, Field);
3916 +    Result := false;
3917 +    FField := FRelation.FieldNodes;
3918 +    while Assigned(FField) do
3919 +      if FField.FieldName = Field then
3920 +      begin
3921 +        Result := Ffield.IDENTITY_COLUMN;
3922 +        Exit;
3923 +      end
3924 +      else
3925 +        FField := Ffield.NextField;
3926 +  end;
3927 +
3928    Procedure FreeNodes;
3929    var
3930      FRelation : TRelationNode;
# Line 2841 | Line 3945 | var
3945    end;
3946  
3947   begin
2844  if not InternalPrepared then
2845  begin
2846    InternalPrepare;
2847    exit;
2848  end;
3948    FRelationNodes := TRelationNode.Create;
3949    FNeedsRefresh := False;
3950 <  Database.InternalTransaction.StartTransaction;
3950 >  if not Database.InternalTransaction.InTransaction then
3951 >    Database.InternalTransaction.StartTransaction;
3952    Query := TIBSQL.Create(self);
3953    try
3954      Query.Database := DataBase;
# Line 2856 | Line 3956 | begin
3956      FieldDefs.BeginUpdate;
3957      FieldDefs.Clear;
3958      FieldIndex := 0;
3959 <    if (Length(FMappedFieldPosition) < FQSelect.Current.Count) then
3960 <      SetLength(FMappedFieldPosition, FQSelect.Current.Count);
3961 <    Query.SQL.Text := DefaultSQL;
3959 >    if (Length(FMappedFieldPosition) < SourceQuery.MetaData.Count) then
3960 >      SetLength(FMappedFieldPosition, SourceQuery.MetaData.Count);
3961 >    if FDatabaseInfo.ODSMajorVersion >= 12 then
3962 >      Query.SQL.Text := DefaultSQLODS12
3963 >    else
3964 >      Query.SQL.Text := DefaultSQL;
3965      Query.Prepare;
3966 <    for i := 0 to FQSelect.Current.Count - 1 do
3967 <      with FQSelect.Current[i].Data^ do
3966 >    SetLength(FAliasNameMap, SourceQuery.MetaData.Count);
3967 >    SetLength(FAliasNameList, SourceQuery.MetaData.Count);
3968 >    for i := 0 to SourceQuery.MetaData.GetCount - 1 do
3969 >      with SourceQuery.MetaData[i] do
3970        begin
3971          { Get the field name }
3972 <        SetString(FieldAliasName, aliasname, aliasname_length);
3973 <        SetString(RelationName, relname, relname_length);
3974 <        SetString(FieldName, sqlname, sqlname_length);
3972 >        FieldAliasName := GetName;
3973 >        DBAliasName := GetAliasname;
3974 >        aRelationName := getRelationName;
3975 >        FieldName := getSQLName;
3976 >        FAliasNameList[i] := DBAliasName;
3977          FieldSize := 0;
3978 +        FieldDataSize := GetSize;
3979          FieldPrecision := 0;
3980 <        FieldNullable := FQSelect.Current[i].IsNullable;
3981 <        case sqltype and not 1 of
3980 >        FieldNullable := IsNullable;
3981 >        CharSetSize := 0;
3982 >        CharSetName := '';
3983 >        FieldCodePage := CP_NONE;
3984 >        aArrayDimensions := 0;
3985 >        SetLength(aArrayBounds,0);
3986 >        case SQLType of
3987            { All VARCHAR's must be converted to strings before recording
3988             their values }
3989            SQL_VARYING, SQL_TEXT:
3990            begin
3991 <            FieldSize := sqllen;
3991 >            if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
3992 >              CharSetSize := 1;
3993 >            CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
3994 >            Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
3995 >            FieldSize := FieldDataSize div CharSetSize;
3996              FieldType := ftString;
3997            end;
3998            { All Doubles/Floats should be cast to doubles }
# Line 2883 | Line 4000 | begin
4000              FieldType := ftFloat;
4001            SQL_SHORT:
4002            begin
4003 <            if (sqlscale = 0) then
4003 >            if (getScale = 0) then
4004                FieldType := ftSmallInt
4005              else begin
4006                FieldType := ftBCD;
4007                FieldPrecision := 4;
4008 <              FieldSize := -sqlscale;
4008 >              FieldSize := -getScale;
4009              end;
4010            end;
4011            SQL_LONG:
4012            begin
4013 <            if (sqlscale = 0) then
4013 >            if (getScale = 0) then
4014                FieldType := ftInteger
4015 <            else if (sqlscale >= (-4)) then
4015 >            else if (getScale >= (-4)) then
4016              begin
4017                FieldType := ftBCD;
4018                FieldPrecision := 9;
4019 <              FieldSize := -sqlscale;
4019 >              FieldSize := -getScale;
4020              end
4021              else
4022 <              FieldType := ftFloat;
4022 >            if Database.SQLDialect = 1 then
4023 >              FieldType := ftFloat
4024 >            else
4025 >            if (FieldCount > i) and (Fields[i] is TFloatField) then
4026 >              FieldType := ftFloat
4027 >            else
4028 >            begin
4029 >              FieldType := ftFMTBCD;
4030 >              FieldPrecision := 9;
4031 >              FieldSize := -getScale;
4032              end;
4033 +          end;
4034 +
4035            SQL_INT64:
4036            begin
4037 <            if (sqlscale = 0) then
4037 >            if (getScale = 0) then
4038                FieldType := ftLargeInt
4039 <            else if (sqlscale >= (-4)) then
4039 >            else if (getScale >= (-4)) then
4040              begin
4041                FieldType := ftBCD;
4042                FieldPrecision := 18;
4043 <              FieldSize := -sqlscale;
4043 >              FieldSize := -getScale;
4044              end
4045              else
4046                FieldType := ftFloat;
4047 <            end;
4047 >          end;
4048            SQL_TIMESTAMP: FieldType := ftDateTime;
4049            SQL_TYPE_TIME: FieldType := ftTime;
4050            SQL_TYPE_DATE: FieldType := ftDate;
4051            SQL_BLOB:
4052            begin
4053              FieldSize := sizeof (TISC_QUAD);
4054 <            if (sqlsubtype = 1) then
4055 <              FieldType := ftmemo
4054 >            if (getSubtype = 1) then
4055 >            begin
4056 >              if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
4057 >                CharSetSize := 1;
4058 >              CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
4059 >              Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
4060 >              FieldType := ftMemo;
4061 >            end
4062              else
4063                FieldType := ftBlob;
4064            end;
4065            SQL_ARRAY:
4066            begin
4067              FieldSize := sizeof (TISC_QUAD);
4068 <            FieldType := ftUnknown;
4068 >            FieldType := ftArray;
4069 >            ArrayMetaData := GetArrayMetaData;
4070 >            if ArrayMetaData <> nil then
4071 >            begin
4072 >              aArrayDimensions := ArrayMetaData.GetDimensions;
4073 >              aArrayBounds := ArrayMetaData.GetBounds;
4074 >            end;
4075            end;
4076 +          SQL_BOOLEAN:
4077 +             FieldType:= ftBoolean;
4078            else
4079              FieldType := ftUnknown;
4080          end;
# Line 2941 | Line 4083 | begin
4083          begin
4084            FMappedFieldPosition[FieldIndex] := FieldPosition;
4085            Inc(FieldIndex);
4086 <          with FieldDefs.AddFieldDef do
4086 >          with TIBFieldDef.Create(FieldDefs,'',FieldType,0,False,FieldDefs.Count+1) do
4087            begin
4088 <            Name := string( FieldAliasName );
4089 <            FieldNo := FieldPosition;
2948 <            DataType := FieldType;
4088 >            Name := FieldAliasName;
4089 >            FAliasNameMap[FieldNo-1] := DBAliasName;
4090              Size := FieldSize;
4091 +            DataSize := FieldDataSize;
4092              Precision := FieldPrecision;
4093 <            Required := False;
4093 >            Required := not FieldNullable;
4094 >            RelationName := aRelationName;
4095              InternalCalcField := False;
4096 +            CharacterSetSize := CharSetSize;
4097 +            CharacterSetName := CharSetName;
4098 +            CodePage := FieldCodePage;
4099 +            ArrayDimensions := aArrayDimensions;
4100 +            ArrayBounds := aArrayBounds;
4101              if (FieldName <> '') and (RelationName <> '') then
4102              begin
4103 +              IdentityColumn := Is_IDENTITY_COLUMN(RelationName, FieldName);
4104                if Has_COMPUTED_BLR(RelationName, FieldName) then
4105                begin
4106                  Attributes := [faReadOnly];
# Line 2977 | Line 4126 | begin
4126      FreeNodes;
4127      Database.InternalTransaction.Commit;
4128      FieldDefs.EndUpdate;
4129 +    FieldDefs.Updated := true;
4130    end;
4131   end;
4132  
# Line 2994 | Line 4144 | begin
4144    else begin
4145      Buffer := AllocRecordBuffer;
4146      try
4147 <      while FQSelect.Next <> nil do
4147 >      while FQSelect.Next do
4148        begin
4149          FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
4150          Inc(FRecordCount);
# Line 3009 | Line 4159 | end;
4159   procedure TIBCustomDataSet.InternalSetParamsFromCursor;
4160   var
4161    i: Integer;
4162 <  cur_param: TIBXSQLVAR;
4162 >  cur_param: ISQLParam;
4163    cur_field: TField;
4164    s: TStream;
4165   begin
# Line 3017 | Line 4167 | begin
4167      IBError(ibxeEmptyQuery, [nil]);
4168    if not FInternalPrepared then
4169      InternalPrepare;
4170 <  if (SQLParams.Count > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
4170 >  if (SQLParams.GetCount > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
4171    begin
4172 <    for i := 0 to SQLParams.Count - 1 do
4172 >    for i := 0 to SQLParams.GetCount - 1 do
4173      begin
4174        cur_field := DataSource.DataSet.FindField(SQLParams[i].Name);
4175        cur_param := SQLParams[i];
# Line 3029 | Line 4179 | begin
4179          else case cur_field.DataType of
4180            ftString:
4181              cur_param.AsString := cur_field.AsString;
4182 <          ftBoolean, ftSmallint, ftWord:
4182 >          ftBoolean:
4183 >            cur_param.AsBoolean := cur_field.AsBoolean;
4184 >          ftSmallint, ftWord:
4185              cur_param.AsShort := cur_field.AsInteger;
4186            ftInteger:
4187              cur_param.AsLong := cur_field.AsInteger;
# Line 3051 | Line 4203 | begin
4203              try
4204                s := DataSource.DataSet.
4205                       CreateBlobStream(cur_field, bmRead);
4206 <              cur_param.LoadFromStream(s);
4206 >              cur_param.AsBlob := TIBDSBlobStream(s).FBlobStream.Blob;
4207              finally
4208                s.free;
4209              end;
4210            end;
4211 +          ftArray:
4212 +            cur_param.AsArray := TIBArrayField(cur_field).ArrayIntf;
4213            else
4214              IBError(ibxeNotSupported, [nil]);
4215          end;
# Line 3082 | Line 4236 | begin
4236   end;
4237  
4238   procedure TIBCustomDataSet.InternalOpen;
3085 var
3086  SetCursor: Boolean;
4239  
4240    function RecordDataLength(n: Integer): Long;
4241    begin
# Line 3091 | Line 4243 | var
4243    end;
4244  
4245   begin
4246 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
3095 <  if SetCursor then
3096 <    Screen.Cursor := crHourGlass;
4246 >  FBase.SetCursor;
4247    try
4248      ActivateConnection;
4249      ActivateTransaction;
# Line 3101 | Line 4251 | begin
4251        IBError(ibxeEmptyQuery, [nil]);
4252      if not FInternalPrepared then
4253        InternalPrepare;
4254 <   if FQSelect.SQLType = SQLSelect then
4254 >   if FQSelect.SQLStatementType = SQLSelect then
4255     begin
4256        if DefaultFields then
4257          CreateFields;
4258 +      FArrayFieldCount := 0;
4259        BindFields(True);
4260        FCurrentRecord := -1;
4261        FQSelect.ExecQuery;
# Line 3116 | Line 4267 | begin
4267          3. After the dummy fetch, FRecordSize will be appropriately
4268             adjusted to reflect the additional "weight" of the field
4269             data.
4270 <        4. Set up the FCalcFieldsOffset, FBlobCacheOffset and FRecordBufferSize.
4270 >        4. Set up the FCalcFieldsOffset, FBlobCacheOffset, FArrayCacheOffset and FRecordBufferSize.
4271          5. Now, with the BufferSize available, allocate memory for chunks of records
4272          6. Re-allocate the model buffer, accounting for the new
4273             FRecordBufferSize.
4274          7. Finally, calls to AllocRecordBuffer will work!.
4275         }
4276        {Step 1}
4277 <      FRecordSize := RecordDataLength(FQSelect.Current.Count);
4277 >      FRecordSize := RecordDataLength(FQSelect.FieldCount);
4278        {Step 2, 3}
4279 +      GetMem(FFieldColumns,sizeof(TFieldColumns) * (FQSelect.FieldCount));
4280        IBAlloc(FModelBuffer, 0, FRecordSize);
4281 <      FetchCurrentRecordToBuffer(FQSelect, -1, FModelBuffer);
4281 >      InitModelBuffer(FQSelect, FModelBuffer);
4282        {Step 4}
4283        FCalcFieldsOffset := FRecordSize;
4284        FBlobCacheOffset := FCalcFieldsOffset + CalcFieldsSize;
4285 <      FRecordBufferSize := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4285 >      FArrayCacheOffset := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4286 >      FRecordBufferSize := FArrayCacheOffset + (ArrayFieldCount * sizeof(IArray));
4287        {Step 5}
4288        if UniDirectional then
4289          FBufferChunkSize := FRecordBufferSize * UniCache
# Line 3146 | Line 4299 | begin
4299        FCacheSize := FBufferChunkSize;
4300        FOldCacheSize := FBufferChunkSize;
4301        {Step 6}
4302 <      IBAlloc(FModelBuffer, RecordDataLength(FQSelect.Current.Count),
4302 >      IBAlloc(FModelBuffer, RecordDataLength(FQSelect.FieldCount),
4303                               FRecordBufferSize);
4304        {Step 7}
4305        FOldBuffer := AllocRecordBuffer;
# Line 3154 | Line 4307 | begin
4307      else
4308        FQSelect.ExecQuery;
4309    finally
4310 <    if SetCursor and (Screen.Cursor = crHourGlass) then
3158 <      Screen.Cursor := crDefault;
4310 >    FBase.RestoreCursor;
4311    end;
4312   end;
4313  
# Line 3163 | Line 4315 | procedure TIBCustomDataSet.InternalPost;
4315   var
4316    Qry: TIBSQL;
4317    Buff: PChar;
3166  SetCursor: Boolean;
4318    bInserting: Boolean;
4319   begin
4320 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
3170 <  if SetCursor then
3171 <    Screen.Cursor := crHourGlass;
4320 >  FBase.SetCursor;
4321    try
4322      Buff := GetActiveBuf;
4323      CheckEditState;
# Line 3206 | Line 4355 | begin
4355      if bInserting then
4356        Inc(FRecordCount);
4357    finally
4358 <    if SetCursor and (Screen.Cursor = crHourGlass) then
3210 <      Screen.Cursor := crDefault;
4358 >    FBase.RestoreCursor;
4359    end;
4360   end;
4361  
4362   procedure TIBCustomDataSet.InternalRefresh;
4363   begin
4364 <  inherited;
4364 >  inherited InternalRefresh;
4365    InternalRefreshRow;
4366   end;
4367  
# Line 3227 | Line 4375 | begin
4375    result := FOpen;
4376   end;
4377  
4378 + procedure TIBCustomDataSet.Loaded;
4379 + begin
4380 +  if assigned(FQSelect) then
4381 +    FBaseSQLSelect.assign(FQSelect.SQL);
4382 +  inherited Loaded;
4383 + end;
4384 +
4385 + procedure TIBCustomDataSet.Post;
4386 + var CancelPost: boolean;
4387 + begin
4388 +  CancelPost := false;
4389 +  if assigned(FOnValidatePost) then
4390 +    OnValidatePost(self,CancelPost);
4391 +  if CancelPost then
4392 +    Cancel
4393 +  else
4394 +   inherited Post;
4395 + end;
4396 +
4397   function TIBCustomDataSet.Locate(const KeyFields: string; const KeyValues: Variant;
4398                                   Options: TLocateOptions): Boolean;
4399   var
4400 <  CurBookmark: string;
4400 >  CurBookmark: TBookmark;
4401   begin
4402    DisableControls;
4403    try
# Line 3248 | Line 4415 | function TIBCustomDataSet.Lookup(const K
4415                                   const ResultFields: string): Variant;
4416   var
4417    fl: TList;
4418 <  CurBookmark: string;
4418 >  CurBookmark: TBookmark;
4419   begin
4420    DisableControls;
4421    fl := TList.Create;
# Line 3301 | Line 4468 | end;
4468   procedure TIBCustomDataSet.InternalSetFieldData(Field: TField; Buffer: Pointer);
4469   var
4470    Buff, TmpBuff: PChar;
4471 +  MappedFieldPos: integer;
4472   begin
4473    Buff := GetActiveBuf;
4474    if Field.FieldNo < 0 then
# Line 3317 | Line 4485 | begin
4485      begin
4486        { If inserting, Adjust record position }
4487        AdjustRecordOnInsert(Buff);
4488 <      if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
4489 <         (FMappedFieldPosition[Field.FieldNo - 1] <= rdFieldCount) then
4488 >      MappedFieldPos := FMappedFieldPosition[Field.FieldNo - 1];
4489 >      if (MappedFieldPos > 0) and
4490 >         (MappedFieldPos <= rdFieldCount) then
4491 >      with rdFields[MappedFieldPos], FFieldColumns^[MappedFieldPos] do
4492        begin
4493          Field.Validate(Buffer);
4494          if (Buffer = nil) or
4495             (Field is TIBStringField) and (PChar(Buffer)[0] = #0) then
4496 <          rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull := True
4497 <        else begin
4498 <          Move(Buffer^, Buff[rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs],
4499 <                 rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataSize);
4500 <          if (rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataType = SQL_TEXT) or
4501 <             (rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataType = SQL_VARYING) then
4502 <            rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataLength := StrLen(PChar(Buffer));
3333 <          rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull := False;
4496 >          fdIsNull := True
4497 >        else
4498 >        begin
4499 >          Move(Buffer^, Buff[fdDataOfs],fdDataSize);
4500 >          if (fdDataType = SQL_TEXT) or (fdDataType = SQL_VARYING) then
4501 >            fdDataLength := StrLen(PChar(Buffer));
4502 >          fdIsNull := False;
4503            if rdUpdateStatus = usUnmodified then
4504            begin
4505              if CachedUpdates then
# Line 3354 | Line 4523 | begin
4523      end;
4524    end;
4525    if not (State in [dsCalcFields, dsFilter, dsNewValue]) then
4526 <      DataEvent(deFieldChange, Longint(Field));
4526 >      DataEvent(deFieldChange, PtrInt(Field));
4527   end;
4528  
4529   procedure TIBCustomDataSet.SetRecNo(Value: Integer);
# Line 3418 | Line 4587 | begin
4587   FillChar(Buffer[FRecordSize], CalcFieldsSize, 0);
4588   end;
4589  
4590 + procedure TIBCustomDataSet.ClearIBLinks;
4591 + var i: integer;
4592 + begin
4593 +  for i := FIBLinks.Count - 1 downto 0 do
4594 +    TIBControlLink(FIBLinks[i]).IBDataSet := nil;
4595 + end;
4596 +
4597  
4598   procedure TIBCustomDataSet.InternalUnPrepare;
4599   begin
4600    if FInternalPrepared then
4601    begin
4602      CheckDatasetClosed;
4603 +    if FDidActivate then
4604 +      DeactivateTransaction;
4605      FieldDefs.Clear;
4606 +    FieldDefs.Updated := false;
4607      FInternalPrepared := False;
4608 +    Setlength(FAliasNameList,0);
4609    end;
4610   end;
4611  
4612   procedure TIBCustomDataSet.InternalExecQuery;
4613   var
4614    DidActivate: Boolean;
3435  SetCursor: Boolean;
4615   begin
4616    DidActivate := False;
4617 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
3439 <  if SetCursor then
3440 <    Screen.Cursor := crHourGlass;
4617 >  FBase.SetCursor;
4618    try
4619      ActivateConnection;
4620      DidActivate := ActivateTransaction;
# Line 3445 | Line 4622 | begin
4622        IBError(ibxeEmptyQuery, [nil]);
4623      if not FInternalPrepared then
4624        InternalPrepare;
4625 <    if FQSelect.SQLType = SQLSelect then
4625 >    if FQSelect.SQLStatementType = SQLSelect then
4626      begin
4627        IBError(ibxeIsASelectStatement, [nil]);
4628      end
# Line 3454 | Line 4631 | begin
4631    finally
4632      if DidActivate then
4633        DeactivateTransaction;
4634 <    if SetCursor and (Screen.Cursor = crHourGlass) then
3458 <      Screen.Cursor := crDefault;
4634 >    FBase.RestoreCursor;
4635    end;
4636   end;
4637  
4638 < function TIBCustomDataSet.GetSelectStmtHandle: TISC_STMT_HANDLE;
4638 > function TIBCustomDataSet.GetSelectStmtIntf: IStatement;
4639 > begin
4640 >  Result := FQSelect.Statement;
4641 > end;
4642 >
4643 > function TIBCustomDataSet.GetParser: TSelectSQLParser;
4644 > begin
4645 >  if not assigned(FParser) then
4646 >    FParser := CreateParser;
4647 >  Result := FParser
4648 > end;
4649 >
4650 > procedure TIBCustomDataSet.ResetParser;
4651 > begin
4652 >  if assigned(FParser) then
4653 >  begin
4654 >    FParser.Free;
4655 >    FParser := nil;
4656 >    FQSelect.OnSQLChanged := nil; {Do not react to change}
4657 >    try
4658 >      FQSelect.SQL.Assign(FBaseSQLSelect);
4659 >    finally
4660 >      FQSelect.OnSQLChanged := SQLChanged;
4661 >    end;
4662 >  end;
4663 > end;
4664 >
4665 > function TIBCustomDataSet.HasParser: boolean;
4666 > begin
4667 >  Result := not (csDesigning in ComponentState) and (FParser <> nil)
4668 > end;
4669 >
4670 > procedure TIBCustomDataSet.SetGenerateParamNames(AValue: Boolean);
4671   begin
4672 <  Result := FQSelect.Handle;
4672 >  if FGenerateParamNames = AValue then Exit;
4673 >  FGenerateParamNames := AValue;
4674 >  Disconnect
4675   end;
4676  
4677   procedure TIBCustomDataSet.InitRecord(Buffer: PChar);
# Line 3635 | Line 4845 | begin
4845    Transaction.StartTransaction;
4846   end;
4847  
4848 < function TIBCustomDataSet.PSGetTableName: string;
4848 > function TIBCustomDataSet.PsGetTableName: string;
4849   begin
4850   //  if not FInternalPrepared then
4851   //    InternalPrepare;
# Line 3682 | Line 4892 | begin
4892    ActivateConnection;
4893    ActivateTransaction;
4894    InternalSetParamsFromCursor;
4895 <  Inherited;
4895 >  Inherited InternalOpen;
4896   end;
4897  
4898   procedure TIBDataSet.SetFiltered(Value: Boolean);
# Line 3710 | Line 4920 | end;
4920  
4921   function TIBCustomDataSet.GetFieldData(Field: TField;
4922    Buffer: Pointer): Boolean;
4923 + {$IFDEF TBCDFIELD_IS_BCD}
4924   var
4925    lTempCurr : System.Currency;
4926   begin
# Line 3720 | Line 4931 | begin
4931        CurrToBCD(lTempCurr, TBCD(Buffer^), 32, Field.Size);
4932    end
4933    else
4934 + {$ELSE}
4935 + begin
4936 + {$ENDIF}
4937      Result := InternalGetFieldData(Field, Buffer);
4938   end;
4939  
# Line 3733 | Line 4947 | begin
4947   end;
4948  
4949   procedure TIBCustomDataSet.SetFieldData(Field: TField; Buffer: Pointer);
4950 + {$IFDEF TDBDFIELD_IS_BCD}
4951   var
4952    lTempCurr : System.Currency;
4953   begin
4954 <  if Field.DataType = ftBCD then
4954 >  if (Field.DataType = ftBCD) and (Buffer <> nil) then
4955    begin
4956      BCDToCurr(TBCD(Buffer^), lTempCurr);
4957      InternalSetFieldData(Field, @lTempCurr);
4958    end
4959    else
4960 + {$ELSE}
4961 + begin
4962 + {$ENDIF}
4963      InternalSetFieldData(Field, Buffer);
4964   end;
4965  
# Line 3765 | Line 4983 | end;
4983   destructor TIBDataSetUpdateObject.Destroy;
4984   begin
4985    FRefreshSQL.Free;
4986 <  inherited destroy;
4986 >  inherited Destroy;
4987   end;
4988  
4989 < procedure TIBDataSetUpdateObject.SetRefreshSQL(Value: TStrings);
4989 > procedure TIBDataSetUpdateObject.SetRefreshSQL(value: TStrings);
4990   begin
4991    FRefreshSQL.Assign(Value);
4992   end;
4993  
4994 + procedure TIBDataSetUpdateObject.InternalSetParams(Params: ISQLParams;
4995 +  buff: PChar);
4996 + begin
4997 +  if not Assigned(DataSet) then Exit;
4998 +  DataSet.SetInternalSQLParams(Params, buff);
4999 + end;
5000 +
5001 + procedure TIBDataSetUpdateObject.InternalSetParams(Query: TIBSQL; buff: PChar);
5002 + begin
5003 +  InternalSetParams(Query.Params,buff);
5004 + end;
5005 +
5006 + procedure TIBDataSetUpdateObject.UpdateRecordFromQuery(QryResults: IResults;
5007 +  Buffer: PChar);
5008 + begin
5009 +  if not Assigned(DataSet) then Exit;
5010 +  DataSet.UpdateRecordFromQuery(QryResults, Buffer);
5011 + end;
5012 +
5013 + function TIBDSBlobStream.GetSize: Int64;
5014 + begin
5015 +  Result := FBlobStream.BlobSize;
5016 + end;
5017 +
5018   { TIBDSBlobStream }
5019   constructor TIBDSBlobStream.Create(AField: TField; ABlobStream: TIBBlobStream;
5020                                      Mode: TBlobStreamMode);
# Line 3781 | Line 5023 | begin
5023    FBlobStream := ABlobStream;
5024    FBlobStream.Seek(0, soFromBeginning);
5025    if (Mode = bmWrite) then
5026 +  begin
5027      FBlobStream.Truncate;
5028 +    TIBCustomDataSet(FField.DataSet).RecordModified(True);
5029 +    TBlobField(FField).Modified := true;
5030 +    FHasWritten := true;
5031 +  end;
5032 + end;
5033 +
5034 + destructor TIBDSBlobStream.Destroy;
5035 + begin
5036 +  if FHasWritten then
5037 +     TIBCustomDataSet(FField.DataSet).DataEvent(deFieldChange, PtrInt(FField));
5038 +  inherited Destroy;
5039   end;
5040  
5041   function TIBDSBlobStream.Read(var Buffer; Count: Longint): Longint;
# Line 3804 | Line 5058 | begin
5058    if not (FField.DataSet.State in [dsEdit, dsInsert]) then
5059      IBError(ibxeNotEditing, [nil]);
5060    TIBCustomDataSet(FField.DataSet).RecordModified(True);
5061 +  TBlobField(FField).Modified := true;
5062    result := FBlobStream.Write(Buffer, Count);
5063 <  TIBCustomDataSet(FField.DataSet).DataEvent(deFieldChange, Longint(FField));
5063 >  FHasWritten := true;
5064 > {  TIBCustomDataSet(FField.DataSet).DataEvent(deFieldChange, PtrInt(FField));
5065 >  Removed as this caused a seek to beginning of the blob stream thus corrupting
5066 >  the blob stream. Moved to the destructor i.e. called after blob written}
5067 > end;
5068 >
5069 > { TIBGenerator }
5070 >
5071 > procedure TIBGenerator.SetIncrement(const AValue: integer);
5072 > begin
5073 >  if FIncrement = AValue then Exit;
5074 >  if AValue < 0 then
5075 >    IBError(ibxeNegativeGenerator,[]);
5076 >  FIncrement := AValue;
5077 >  SetQuerySQL;
5078 > end;
5079 >
5080 > procedure TIBGenerator.SetTransaction(AValue: TIBTransaction);
5081 > begin
5082 >  FQuery.Transaction := AValue;
5083 > end;
5084 >
5085 > procedure TIBGenerator.SetQuerySQL;
5086 > begin
5087 >  FQuery.SQL.Text := Format('Select Gen_ID(%s,%d) From RDB$Database',[FGeneratorName,Increment]);
5088 > end;
5089 >
5090 > function TIBGenerator.GetDatabase: TIBDatabase;
5091 > begin
5092 >  Result := FQuery.Database;
5093 > end;
5094 >
5095 > function TIBGenerator.GetTransaction: TIBTransaction;
5096 > begin
5097 >  Result := FQuery.Transaction;
5098 > end;
5099 >
5100 > procedure TIBGenerator.SetDatabase(AValue: TIBDatabase);
5101 > begin
5102 >  FQuery.Database := AValue;
5103 > end;
5104 >
5105 > procedure TIBGenerator.SetGeneratorName(AValue: string);
5106 > begin
5107 >  if FGeneratorName = AValue then Exit;
5108 >  FGeneratorName := AValue;
5109 >  SetQuerySQL;
5110   end;
5111  
5112 + function TIBGenerator.GetNextValue: integer;
5113 + begin
5114 +  with FQuery do
5115 +  begin
5116 +    Transaction.Active := true;
5117 +    ExecQuery;
5118 +    try
5119 +      Result := Fields[0].AsInteger
5120 +    finally
5121 +      Close
5122 +    end;
5123 +  end;
5124 + end;
5125 +
5126 + constructor TIBGenerator.Create(Owner: TIBCustomDataSet);
5127 + begin
5128 +  FOwner := Owner;
5129 +  FIncrement := 1;
5130 +  FQuery := TIBSQL.Create(nil);
5131 + end;
5132 +
5133 + destructor TIBGenerator.Destroy;
5134 + begin
5135 +  if assigned(FQuery) then FQuery.Free;
5136 +  inherited Destroy;
5137 + end;
5138 +
5139 +
5140 + procedure TIBGenerator.Apply;
5141 + begin
5142 +  if assigned(Database) and assigned(Transaction) and
5143 +       (FGeneratorName <> '') and (FFieldName <> '') and Owner.FieldByName(FFieldName).IsNull then
5144 +    Owner.FieldByName(FFieldName).AsInteger := GetNextValue;
5145 + end;
5146 +
5147 +
5148   end.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines