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

Comparing ibx/trunk/runtime/IBCustomDataSet.pas (file contents):
Revision 7 by tony, Sun Aug 5 18:28:19 2012 UTC vs.
Revision 105 by tony, Thu Jan 18 14:37:32 2018 UTC

# Line 27 | Line 27
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                                                 }
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}
# Line 47 | Line 52 | uses
52   {$ELSE}
53    unix,
54   {$ENDIF}
55 <  SysUtils, Classes, Forms, Controls, IBDatabase,
56 <  IBExternals, IB, IBHeader,  IBSQL, Db,
52 <  IBUtils, IBBlob;
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 70 | Line 74 | type
74      procedure SetDataSet(ADataSet: TIBCustomDataSet); virtual; abstract;
75      procedure Apply(UpdateKind: TUpdateKind; buff: PChar); virtual; abstract;
76      function GetSQL(UpdateKind: TUpdateKind): TStrings; virtual; abstract;
77 <    procedure InternalSetParams(Query: TIBSQL; buff: PChar);
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 81 | Line 87 | type
87  
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 103 | 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;
# Line 115 | 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 135 | 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 143 | 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 171 | Line 315 | type
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(ADatabase: TIBDatabase; ATransaction: TIBTransaction): integer;
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 FGeneratorName;
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;
205    FIBLoaded: Boolean;
385      FBase: TIBBase;
386      FBlobCacheOffset: Integer;
387      FBlobStreamList: TList;
388 +    FArrayList: TList;
389      FBufferChunks: Integer;
390      FBufferCache,
391      FOldBufferCache: PChar;
# Line 223 | Line 403 | type
403      FDeletedRecords: Long;
404      FModelBuffer,
405      FOldBuffer: PChar;
406 +    FOnValidatePost: TOnValidatePost;
407      FOpen: Boolean;
408      FInternalPrepared: Boolean;
409      FQDelete,
# Line 230 | 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 250 | 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 263 | 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;
276    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;
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); 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;
305    procedure SQLChanging(Sender: TObject); virtual;
502      function AdjustPosition(FCache: PChar; Offset: DWORD;
503                              Origin: Integer): DWORD;
504      procedure ReadCache(FCache: PChar; Offset: DWORD; Origin: Integer;
# Line 321 | 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); virtual;
524      procedure InternalBatchOutput(OutputObject: TIBBatchOutput); virtual;
# Line 330 | Line 528 | type
528      procedure InternalRefreshRow; virtual;
529      procedure InternalSetParamsFromCursor; virtual;
530      procedure CheckNotUniDirectional;
531 +    procedure SQLChanging(Sender: TObject); virtual;
532 +    procedure SQLChanged(Sender: TObject); virtual;
533  
534 < (*    { IProviderSupport }
534 >    { IProviderSupport }
535      procedure PSEndTransaction(Commit: Boolean); override;
536      function PSExecuteStatement(const ASQL: string; AParams: TParams;
537        ResultSet: Pointer = nil): Integer; override;
# Line 344 | Line 544 | type
544      procedure PSStartTransaction; override;
545      procedure PSReset; override;
546      function PSUpdateRecord(UpdateKind: TUpdateKind; Delta: TDataSet): Boolean; override;
547 < *)
547 >
548      { TDataSet support }
549      procedure InternalInsert; override;
550      procedure InitRecord(Buffer: PChar); override;
# Line 353 | 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;
# Line 385 | Line 593 | type
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 397 | 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;
# Line 420 | 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 433 | 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 440 | 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;*)
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 <    function ParamByName(ParamName: String): TIBXSQLVAR;
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;
# Line 507 | 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 532 | 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 543 | Line 774 | type
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 581 | 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 615 | 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 623 | Line 886 | DefaultFieldClasses: array[TFieldType] o
886      TBlobField,         { ftTypedBinary }
887      nil,                { ftCursor }
888      TStringField,       { ftFixedChar }
889 <    TWideStringField,    { ftWideString }
890 <    TLargeIntField,     { ftLargeInt }
889 >    nil,    { ftWideString }
890 >    TIBLargeIntField,     { ftLargeInt }
891      nil,          { ftADT }
892 <    nil,        { ftArray }
892 >    TIBArrayField,        { ftArray }
893      nil,    { ftReference }
894      nil,     { ftDataSet }
895      TBlobField,         { ftOraBlob }
# Line 638 | Line 901 | DefaultFieldClasses: array[TFieldType] o
901      TDateTimeField,    {ftTimestamp}
902      TIBBCDField,       {ftFMTBcd}
903      nil,  {ftFixedWideChar}
904 <    TWideMemoField);   {ftWideMemo}
904 >    nil);   {ftWideMemo}
905   (*
906      TADTField,          { ftADT }
907      TArrayField,        { ftArray }
# Line 655 | Line 918 | DefaultFieldClasses: array[TFieldType] o
918  
919   implementation
920  
921 < uses IBIntf, Variants, FmtBCD;
921 > uses Variants, FmtBCD, LazUTF8, FBMessages, IBQuery;
922  
923   const FILE_BEGIN = 0;
924        FILE_CURRENT = 1;
# Line 668 | 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 679 | Line 943 | type
943    end;
944  
945  
946 < { TIBStringField}
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 TIBStringField.Create(AOwner: TComponent);
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 + 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 +  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 706 | 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 725 | 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 738 | Line 1312 | begin
1312    end;
1313   end;
1314  
1315 +
1316   { TIBBCDField }
1317  
1318   constructor TIBBCDField.Create(AOwner: TComponent);
# Line 747 | 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 831 | Line 1413 | end;
1413   constructor TIBCustomDataSet.Create(AOwner: TComponent);
1414   begin
1415    inherited Create(AOwner);
834  FIBLoaded := False;
835  CheckIBLoaded;
836  FIBLoaded := True;
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);
# Line 853 | 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 873 | 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    if Active then Active := false;
1468 <  if FIBLoaded then
1469 <  begin
1470 <    if assigned(FGeneratorField) then FGeneratorField.Free;
1471 <    FDataLink.Free;
1472 <    FBase.Free;
1473 <    ClearBlobCache;
1474 <    FBlobStreamList.Free;
1475 <    FreeMem(FBufferCache);
1476 <    FBufferCache := nil;
1477 <    FreeMem(FOldBufferCache);
1478 <    FOldBufferCache := nil;
1479 <    FCacheSize := 0;
1480 <    FOldCacheSize := 0;
1481 <    FMappedFieldPosition := nil;
1482 <  end;
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  
# Line 915 | 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 934 | Line 1523 | end;
1523  
1524   procedure TIBCustomDataSet.ApplyUpdates;
1525   var
937  {$IF FPC_FULLVERSION > 20600 }
1526    CurBookmark: TBookmark;
939  {$ELSE}
940  CurBookmark: string;
941  {$ENDIF}
1527    Buffer: PRecordData;
1528    CurUpdateTypes: TIBUpdateRecordTypes;
1529    UpdateAction: TIBUpdateAction;
# Line 1136 | 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 1148 | Line 1754 | end;
1754   function TIBCustomDataSet.ActivateTransaction: Boolean;
1755   begin
1756    Result := False;
1757 <  if not Assigned(Transaction) then
1152 <    IBError(ibxeTransactionNotAssigned, [nil]);
1153 <  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 1196 | 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 1273 | 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 1282 | 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 1299 | 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 1313 | 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 1329 | 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
1337 <  p: PRecordData;
1338 <  pbd: PBlobDataArray;
1339 <  i, j: Integer;
1340 <  LocalData: Pointer;
1341 <  LocalDate, LocalDouble: Double;
1342 <  LocalInt: Integer;
1343 <  LocalInt64: Int64;
1344 <  LocalCurrency: Currency;
1345 <  FieldsLoaded: Integer;
1346 <  temp: TIBXSQLVAR;
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);
1349  { Make sure blob cache is empty }
1350  pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
1351  if RecordNumber > -1 then
1352    for i := 0 to BlobFieldCount - 1 do
1353      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 >  ColData: ISQLData;
2083 > begin
2084 >  LocalData := nil;
2085 >  with PRecordData(Buffer)^.rdFields[FieldIndex], FFieldColumns^[FieldIndex] do
2086 >  begin
2087 >    QryResults.GetData(ColumnIndex,fdIsNull,fdDataLength,LocalData);
2088 >    if not fdIsNull then
2089      begin
2090 <      rdFields[j].fdDataType :=
2091 <        Qry.Current[i].Data^.sqltype and (not 1);
1389 <      rdFields[j].fdDataScale :=
1390 <        Qry.Current[i].Data^.sqlscale;
1391 <      rdFields[j].fdNullable :=
1392 <        (Qry.Current[i].Data^.sqltype and 1 = 1);
1393 <      rdFields[j].fdIsNull :=
1394 <        (rdFields[j].fdNullable and (Qry.Current[i].Data^.sqlind^ = -1));
1395 <      LocalData := Qry.Current[i].Data^.sqldata;
1396 <      case rdFields[j].fdDataType of
2090 >      ColData := QryResults[ColumnIndex];
2091 >      case fdDataType of  {Get Formatted data for column types that need formatting}
2092          SQL_TIMESTAMP:
2093          begin
2094 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2095 <          if RecordNumber >= 0 then
1401 <            LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(Qry.Current[i].AsDateTime));
1402 <          LocalData := PChar(@LocalDate);
2094 >          LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(ColData.AsDateTime));
2095 >          LocalData := PByte(@LocalDate);
2096          end;
2097          SQL_TYPE_DATE:
2098          begin
2099 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2100 <          if RecordNumber >= 0 then
1408 <            LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Date;
1409 <          LocalData := PChar(@LocalInt);
2099 >          LocalInt := DateTimeToTimeStamp(ColData.AsDateTime).Date;
2100 >          LocalData := PByte(@LocalInt);
2101          end;
2102          SQL_TYPE_TIME:
2103          begin
2104 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2105 <          if RecordNumber >= 0 then
1415 <            LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Time;
1416 <          LocalData := PChar(@LocalInt);
2104 >          LocalInt := DateTimeToTimeStamp(ColData.AsDateTime).Time;
2105 >          LocalData := PByte(@LocalInt);
2106          end;
2107          SQL_SHORT, SQL_LONG:
2108          begin
2109 <          if (rdFields[j].fdDataScale = 0) then
2109 >          if (fdDataScale = 0) then
2110            begin
2111 <            rdFields[j].fdDataSize := SizeOf(Integer);
2112 <            if RecordNumber >= 0 then
1424 <              LocalInt := Qry.Current[i].AsLong;
1425 <            LocalData := PChar(@LocalInt);
2111 >            LocalInt := ColData.AsLong;
2112 >            LocalData := PByte(@LocalInt);
2113            end
2114 <          else if (rdFields[j].fdDataScale >= (-4)) then
2115 <               begin
2116 <                 rdFields[j].fdDataSize := SizeOf(Currency);
2117 <                 if RecordNumber >= 0 then
2118 <                   LocalCurrency := Qry.Current[i].AsCurrency;
2119 <                 LocalData := PChar(@LocalCurrency);
2120 <               end
2121 <               else begin
2122 <                 rdFields[j].fdDataSize := SizeOf(Double);
2123 <                 if RecordNumber >= 0 then
2124 <                   LocalDouble := Qry.Current[i].AsDouble;
1438 <                LocalData := PChar(@LocalDouble);
1439 <              end;
2114 >          else
2115 >          if (fdDataScale >= (-4)) then
2116 >          begin
2117 >            LocalCurrency := ColData.AsCurrency;
2118 >            LocalData := PByte(@LocalCurrency);
2119 >          end
2120 >          else
2121 >          begin
2122 >           LocalDouble := ColData.AsDouble;
2123 >           LocalData := PByte(@LocalDouble);
2124 >          end;
2125          end;
2126          SQL_INT64:
2127          begin
2128 <          if (rdFields[j].fdDataScale = 0) then
2128 >          if (fdDataScale = 0) then
2129            begin
2130 <            rdFields[j].fdDataSize := SizeOf(Int64);
2131 <            if RecordNumber >= 0 then
1447 <              LocalInt64 := Qry.Current[i].AsInt64;
1448 <            LocalData := PChar(@LocalInt64);
2130 >            LocalInt64 := ColData.AsInt64;
2131 >            LocalData := PByte(@LocalInt64);
2132            end
2133 <          else if (rdFields[j].fdDataScale >= (-4)) then
2134 <               begin
1452 <                 rdFields[j].fdDataSize := SizeOf(Currency);
1453 <                 if RecordNumber >= 0 then
1454 <                   LocalCurrency := Qry.Current[i].AsCurrency;
1455 <                   LocalData := PChar(@LocalCurrency);
1456 <               end
1457 <               else begin
1458 <                  rdFields[j].fdDataSize := SizeOf(Double);
1459 <                  if RecordNumber >= 0 then
1460 <                    LocalDouble := Qry.Current[i].AsDouble;
1461 <                  LocalData := PChar(@LocalDouble);
1462 <               end
1463 <        end;
1464 <        SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
1465 <        begin
1466 <          rdFields[j].fdDataSize := SizeOf(Double);
1467 <          if RecordNumber >= 0 then
1468 <            LocalDouble := Qry.Current[i].AsDouble;
1469 <          LocalData := PChar(@LocalDouble);
1470 <        end;
1471 <        SQL_VARYING:
1472 <        begin
1473 <          rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
1474 <          rdFields[j].fdDataLength := isc_vax_integer(Qry.Current[i].Data^.sqldata, 2);
1475 <          if RecordNumber >= 0 then
2133 >          else
2134 >          if (fdDataScale >= (-4)) then
2135            begin
2136 <            if (rdFields[j].fdDataLength = 0) then
2137 <              LocalData := nil
2136 >            LocalCurrency := ColData.AsCurrency;
2137 >            LocalData := PByte(@LocalCurrency);
2138 >            end
2139              else
2140              begin
2141 <              temp :=  Qry.Current[i];
2142 <              LocalData := @temp.Data^.sqldata[2];
2143 < (*              LocalData := @Qry.Current[i].Data^.sqldata[2];*)
1484 <            end;
1485 <          end;
2141 >              LocalDouble := ColData.AsDouble;
2142 >              LocalData := PByte(@LocalDouble);
2143 >            end
2144          end;
2145 <        else { SQL_TEXT, SQL_BLOB, SQL_ARRAY, SQL_QUAD }
2145 >        SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2146          begin
2147 <          rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
2148 <          if (rdFields[j].fdDataType = SQL_TEXT) then
1491 <            rdFields[j].fdDataLength := rdFields[j].fdDataSize;
2147 >          LocalDouble := ColData.AsDouble;
2148 >          LocalData := PByte(@LocalDouble);
2149          end;
2150 <      end;
1494 <      if RecordNumber < 0 then
1495 <      begin
1496 <        rdFields[j].fdIsNull := True;
1497 <        rdFields[j].fdDataOfs := FRecordSize;
1498 <        Inc(FRecordSize, rdFields[j].fdDataSize);
1499 <      end
1500 <      else begin
1501 <        if rdFields[j].fdDataType = SQL_VARYING then
2150 >        SQL_BOOLEAN:
2151          begin
2152 <          if LocalData <> nil then
2153 <            Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataLength)
2154 <        end
1506 <        else
1507 <          Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataSize)
2152 >          LocalBool := ColData.AsBoolean;
2153 >          LocalData := PByte(@LocalBool);
2154 >        end;
2155        end;
2156 +
2157 +      if fdDataType = SQL_VARYING then
2158 +        Move(LocalData^, Buffer[fdDataOfs], fdDataLength)
2159 +      else
2160 +        Move(LocalData^, Buffer[fdDataOfs], fdDataSize)
2161 +    end
2162 +    else {Null column}
2163 +    if fdDataType = SQL_VARYING then
2164 +      FillChar(Buffer[fdDataOfs],fdDataLength,0)
2165 +    else
2166 +      FillChar(Buffer[fdDataOfs],fdDataSize,0);
2167 +  end;
2168 + end;
2169 +
2170 + { Read the record from FQSelect.Current into the record buffer
2171 +  Then write the buffer to in memory cache }
2172 + procedure TIBCustomDataSet.FetchCurrentRecordToBuffer(Qry: TIBSQL;
2173 +  RecordNumber: Integer; Buffer: PChar);
2174 + var
2175 +  pbd: PBlobDataArray;
2176 +  pda: PArrayDataArray;
2177 +  i, j: Integer;
2178 +  FieldsLoaded: Integer;
2179 +  p: PRecordData;
2180 + begin
2181 +  if RecordNumber = -1 then
2182 +  begin
2183 +    InitModelBuffer(Qry,Buffer);
2184 +    Exit;
2185 +  end;
2186 +  p := PRecordData(Buffer);
2187 +  { Make sure blob cache is empty }
2188 +  pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
2189 +  pda := PArrayDataArray(Buffer + FArrayCacheOffset);
2190 +  for i := 0 to BlobFieldCount - 1 do
2191 +    pbd^[i] := nil;
2192 +  for i := 0 to ArrayFieldCount - 1 do
2193 +    pda^[i] := nil;
2194 +
2195 +  { Get record information }
2196 +  p^.rdBookmarkFlag := bfCurrent;
2197 +  p^.rdFieldCount := Qry.FieldCount;
2198 +  p^.rdRecordNumber := RecordNumber;
2199 +  p^.rdUpdateStatus := usUnmodified;
2200 +  p^.rdCachedUpdateStatus := cusUnmodified;
2201 +  p^.rdSavedOffset := $FFFFFFFF;
2202 +
2203 +  { Load up the fields }
2204 +  FieldsLoaded := FQSelect.MetaData.Count;
2205 +  j := 1;
2206 +  for i := 0 to Qry.FieldCount - 1 do
2207 +  begin
2208 +    if (Qry = FQSelect) then
2209 +      j := i + 1
2210 +    else
2211 +    begin
2212 +      if FieldsLoaded = 0 then
2213 +        break;
2214 +      j := FQSelect.FieldIndex[Qry[i].Name] + 1;
2215 +      if j < 1 then
2216 +        continue
2217 +      else
2218 +        Dec(FieldsLoaded);
2219      end;
2220 +    with FQSelect.MetaData[j - 1] do
2221 +      if GetAliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
2222 +      begin
2223 +        if (GetSize <= 8) then
2224 +          p^.rdDBKey := PIBDBKEY(Qry[i].AsPointer)^;
2225 +        continue;
2226 +      end;
2227 +    if j > 0 then
2228 +      ColumnDataToBuffer(Qry.Current,i,j,Buffer);
2229    end;
2230 <  WriteRecordCache(RecordNumber, PChar(p));
2230 >  WriteRecordCache(RecordNumber, Buffer);
2231   end;
2232  
2233   function TIBCustomDataSet.GetActiveBuf: PChar;
# Line 1553 | Line 2272 | begin
2272    result := FBase.Database;
2273   end;
2274  
1556 function TIBCustomDataSet.GetDBHandle: PISC_DB_HANDLE;
1557 begin
1558  result := FBase.DBHandle;
1559 end;
1560
2275   function TIBCustomDataSet.GetDeleteSQL: TStrings;
2276   begin
2277    result := FQDelete.SQL;
# Line 1568 | Line 2282 | begin
2282    result := FQInsert.SQL;
2283   end;
2284  
2285 < function TIBCustomDataSet.GetSQLParams: TIBXSQLDA;
2285 > function TIBCustomDataSet.GetSQLParams: ISQLParams;
2286   begin
2287    if not FInternalPrepared then
2288      InternalPrepare;
# Line 1585 | Line 2299 | begin
2299    result := FQSelect.SQL;
2300   end;
2301  
2302 < function TIBCustomDataSet.GetStatementType: TIBSQLTypes;
2302 > function TIBCustomDataSet.GetStatementType: TIBSQLStatementTypes;
2303   begin
2304 <  result := FQSelect.SQLType;
2304 >  result := FQSelect.SQLStatementType;
2305   end;
2306  
2307   function TIBCustomDataSet.GetModifySQL: TStrings;
# Line 1600 | Line 2314 | begin
2314    result := FBase.Transaction;
2315   end;
2316  
1603 function TIBCustomDataSet.GetTRHandle: PISC_TR_HANDLE;
1604 begin
1605  result := FBase.TRHandle;
1606 end;
1607
2317   procedure TIBCustomDataSet.InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer);
2318   begin
2319    if (Assigned(FUpdateObject) and (FUpdateObject.GetSQL(ukDelete).Text <> '')) then
2320      FUpdateObject.Apply(ukDelete,Buff)
2321    else
2322    begin
2323 <    SetInternalSQLParams(FQDelete, Buff);
2323 >    SetInternalSQLParams(FQDelete.Params, Buff);
2324      FQDelete.ExecQuery;
2325    end;
2326    with PRecordData(Buff)^ do
# Line 1626 | Line 2335 | function TIBCustomDataSet.InternalLocate
2335    const KeyValues: Variant; Options: TLocateOptions): Boolean;
2336   var
2337    keyFieldList: TList;
1629  {$IF FPC_FULLVERSION > 20600 }
2338    CurBookmark: TBookmark;
1631  {$ELSE}
1632  CurBookmark: string;
1633  {$ENDIF}
2339    fieldValue: Variant;
2340    lookupValues: array of variant;
2341    i, fieldCount: Integer;
# Line 1712 | Line 2417 | end;
2417  
2418   procedure TIBCustomDataSet.InternalPostRecord(Qry: TIBSQL; Buff: Pointer);
2419   var
2420 <  i, j, k: Integer;
2420 >  i, j, k, arr: Integer;
2421    pbd: PBlobDataArray;
2422 +  pda: PArrayDataArray;
2423   begin
2424    pbd := PBlobDataArray(PChar(Buff) + FBlobCacheOffset);
2425 <  j := 0;
2425 >  pda := PArrayDataArray(PChar(Buff) + FArrayCacheOffset);
2426 >  j := 0; arr := 0;
2427    for i := 0 to FieldCount - 1 do
2428      if Fields[i].IsBlob then
2429      begin
# Line 1725 | Line 2432 | begin
2432        begin
2433          pbd^[j].Finalize;
2434          PISC_QUAD(
2435 <          PChar(Buff) + PRecordData(Buff)^.rdFields[k].fdDataOfs)^ :=
2435 >          PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=
2436            pbd^[j].BlobID;
2437          PRecordData(Buff)^.rdFields[k].fdIsNull := pbd^[j].Size = 0;
2438 +      end
2439 +      else
2440 +      begin
2441 +        PRecordData(Buff)^.rdFields[k].fdIsNull := true;
2442 +        with PISC_QUAD(PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ do
2443 +        begin
2444 +          gds_quad_high := 0;
2445 +          gds_quad_low := 0;
2446 +        end;
2447        end;
2448        Inc(j);
2449 +    end
2450 +    else
2451 +    if Fields[i] is TIBArrayField then
2452 +    begin
2453 +      if pda^[arr] <> nil then
2454 +      begin
2455 +        k := FMappedFieldPosition[Fields[i].FieldNo -1];
2456 +        PISC_QUAD(
2457 +          PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=  pda^[arr].ArrayIntf.GetArrayID;
2458 +        PRecordData(Buff)^.rdFields[k].fdIsNull := pda^[arr].ArrayIntf.IsEmpty;
2459 +      end;
2460 +      Inc(arr);
2461      end;
2462    if Assigned(FUpdateObject) then
2463    begin
# Line 1741 | Line 2469 | begin
2469        FUpdateObject.Apply(ukModify,Buff);
2470    end
2471    else begin
2472 <    SetInternalSQLParams(Qry, Buff);
2472 >    SetInternalSQLParams(Qry.Params, Buff);
2473      Qry.ExecQuery;
2474    end;
2475 +  if Qry.FieldCount > 0 then {Has RETURNING Clause}
2476 +    UpdateRecordFromQuery(Qry.Current,Buff);
2477    PRecordData(Buff)^.rdUpdateStatus := usUnmodified;
2478    PRecordData(Buff)^.rdCachedUpdateStatus := cusUnmodified;
2479    SetModified(False);
# Line 1755 | Line 2485 | end;
2485   procedure TIBCustomDataSet.InternalRefreshRow;
2486   var
2487    Buff: PChar;
1758  SetCursor: Boolean;
2488    ofs: DWORD;
2489    Qry: TIBSQL;
2490   begin
2491 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
1763 <  if SetCursor then
1764 <    Screen.Cursor := crHourGlass;
2491 >  FBase.SetCursor;
2492    try
2493      Buff := GetActiveBuf;
2494      if CanRefresh then
# Line 1778 | Line 2505 | begin
2505          end
2506          else
2507            Qry := FQRefresh;
2508 <        SetInternalSQLParams(Qry, Buff);
2508 >        SetInternalSQLParams(Qry.Params, Buff);
2509          Qry.ExecQuery;
2510          try
2511 <          if (Qry.SQLType = SQLExecProcedure) or
1785 <             (Qry.Next <> nil) then
2511 >          if (Qry.SQLStatementType = SQLExecProcedure) or Qry.Next then
2512            begin
2513              ofs := PRecordData(Buff)^.rdSavedOffset;
2514              FetchCurrentRecordToBuffer(Qry,
# Line 1805 | Line 2531 | begin
2531      else
2532        IBError(ibxeCannotRefresh, [nil]);
2533    finally
2534 <    if SetCursor and (Screen.Cursor = crHourGlass) then
1809 <      Screen.Cursor := crDefault;
2534 >    FBase.RestoreCursor;
2535    end;
2536   end;
2537  
# Line 1876 | Line 2601 | begin
2601   end;
2602  
2603   procedure TIBCustomDataSet.InternalPrepare;
1879 var
1880  SetCursor: Boolean;
1881  DidActivate: Boolean;
2604   begin
2605    if FInternalPrepared then
2606      Exit;
2607 <  DidActivate := False;
1886 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
1887 <  if SetCursor then
1888 <    Screen.Cursor := crHourGlass;
2607 >  FBase.SetCursor;
2608    try
2609      ActivateConnection;
2610 <    DidActivate := ActivateTransaction;
2610 >    ActivateTransaction;
2611      FBase.CheckDatabase;
2612      FBase.CheckTransaction;
2613 +    if HasParser and (FParser.SQLText <> FQSelect.SQL.Text) then
2614 +    begin
2615 +      FQSelect.OnSQLChanged := nil; {Do not react to change}
2616 +      try
2617 +        FQSelect.SQL.Text := FParser.SQLText;
2618 +      finally
2619 +        FQSelect.OnSQLChanged := SQLChanged;
2620 +      end;
2621 +    end;
2622 + //   writeln( FQSelect.SQL.Text);
2623      if FQSelect.SQL.Text <> '' then
2624      begin
2625        if not FQSelect.Prepared then
2626        begin
2627 +        FQSelect.GenerateParamNames := FGenerateParamNames;
2628          FQSelect.ParamCheck := ParamCheck;
2629          FQSelect.Prepare;
2630        end;
2631 +      FQDelete.GenerateParamNames := FGenerateParamNames;
2632        if (Trim(FQDelete.SQL.Text) <> '') and (not FQDelete.Prepared) then
2633          FQDelete.Prepare;
2634 +      FQInsert.GenerateParamNames := FGenerateParamNames;
2635        if (Trim(FQInsert.SQL.Text) <> '') and (not FQInsert.Prepared) then
2636          FQInsert.Prepare;
2637 +      FQRefresh.GenerateParamNames := FGenerateParamNames;
2638        if (Trim(FQRefresh.SQL.Text) <> '') and (not FQRefresh.Prepared) then
2639          FQRefresh.Prepare;
2640 +      FQModify.GenerateParamNames := FGenerateParamNames;
2641        if (Trim(FQModify.SQL.Text) <> '') and (not FQModify.Prepared) then
2642          FQModify.Prepare;
2643        FInternalPrepared := True;
# Line 1911 | Line 2645 | begin
2645      end else
2646        IBError(ibxeEmptyQuery, [nil]);
2647    finally
2648 <    if DidActivate then
1915 <      DeactivateTransaction;
1916 <    if SetCursor and (Screen.Cursor = crHourGlass) then
1917 <      Screen.Cursor := crDefault;
2648 >    FBase.RestoreCursor;
2649    end;
2650   end;
2651  
# Line 1943 | Line 2674 | var
2674    begin
2675      CopyRecordBuffer(Buffer, OldBuffer);
2676      if BlobFieldCount > 0 then
2677 <      FillChar(PChar(OldBuffer)[FBlobCacheOffset], BlobFieldCount * SizeOf(TIBBlobStream),
2677 >      FillChar(PChar(OldBuffer)[FBlobCacheOffset],
2678 >               BlobFieldCount * SizeOf(TIBBlobStream) + ArrayFieldCount * SizeOf(IArray),
2679                 0);
2680    end;
2681  
# Line 1985 | Line 2717 | begin
2717    if (FBase.Database <> Value) then
2718    begin
2719      CheckDatasetClosed;
2720 +    InternalUnPrepare;
2721      FBase.Database := Value;
2722      FQDelete.Database := Value;
2723      FQInsert.Database := Value;
2724      FQRefresh.Database := Value;
2725      FQSelect.Database := Value;
2726      FQModify.Database := Value;
2727 +    FDatabaseInfo.Database := Value;
2728 +    FGeneratorField.Database := Value;
2729    end;
2730   end;
2731  
# Line 2012 | Line 2747 | begin
2747    end;
2748   end;
2749  
2750 < procedure TIBCustomDataSet.SetInternalSQLParams(Qry: TIBSQL; Buffer: Pointer);
2750 > procedure TIBCustomDataSet.SetInternalSQLParams(Params: ISQLParams; Buffer: Pointer);
2751   var
2752    i, j: Integer;
2753    cr, data: PChar;
2754 <  fn, st: string;
2754 >  fn: string;
2755 >  st: RawByteString;
2756    OldBuffer: Pointer;
2757    ts: TTimeStamp;
2758 +  Param: ISQLParam;
2759   begin
2760    if (Buffer = nil) then
2761      IBError(ibxeBufferNotSet, [nil]);
# Line 2026 | Line 2763 | begin
2763      InternalPrepare;
2764    OldBuffer := nil;
2765    try
2766 <    for i := 0 to Qry.Params.Count - 1 do
2766 >    for i := 0 to Params.GetCount - 1 do
2767      begin
2768 <      fn := Qry.Params[i].Name;
2768 >      Param := Params[i];
2769 >      fn := Param.Name;
2770        if (Pos('OLD_', fn) = 1) then {mbcs ok}
2771        begin
2772          fn := Copy(fn, 5, Length(fn));
# Line 2048 | Line 2786 | begin
2786               cr := Buffer;
2787        j := FQSelect.FieldIndex[fn] + 1;
2788        if (j > 0) then
2789 <        with PRecordData(cr)^ do
2789 >        with PRecordData(cr)^,rdFields[j], FFieldColumns^[j] do
2790          begin
2791 <          if Qry.Params[i].name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2791 >          if Param.name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2792            begin
2793 <            PIBDBKey(Qry.Params[i].AsPointer)^ := rdDBKey;
2793 >            PIBDBKey(Param.AsPointer)^ := rdDBKey;
2794              continue;
2795            end;
2796 <          if rdFields[j].fdIsNull then
2797 <            Qry.Params[i].IsNull := True
2796 >          if fdIsNull then
2797 >            Param.IsNull := True
2798            else begin
2799 <            Qry.Params[i].IsNull := False;
2800 <            data := cr + rdFields[j].fdDataOfs;
2801 <            case rdFields[j].fdDataType of
2799 >            Param.IsNull := False;
2800 >            data := cr + fdDataOfs;
2801 >            case fdDataType of
2802                SQL_TEXT, SQL_VARYING:
2803                begin
2804 <                SetString(st, data, rdFields[j].fdDataLength);
2805 <                Qry.Params[i].AsString := st;
2804 >                SetString(st, data, fdDataLength);
2805 >                SetCodePage(st,fdCodePage,false);
2806 >                Param.AsString := st;
2807                end;
2808              SQL_FLOAT, SQL_DOUBLE, SQL_D_FLOAT:
2809 <              Qry.Params[i].AsDouble := PDouble(data)^;
2809 >              Param.AsDouble := PDouble(data)^;
2810              SQL_SHORT, SQL_LONG:
2811              begin
2812 <              if rdFields[j].fdDataScale = 0 then
2813 <                Qry.Params[i].AsLong := PLong(data)^
2075 <              else if rdFields[j].fdDataScale >= (-4) then
2076 <                Qry.Params[i].AsCurrency := PCurrency(data)^
2812 >              if fdDataScale = 0 then
2813 >                Param.AsLong := PLong(data)^
2814                else
2815 <                Qry.Params[i].AsDouble := PDouble(data)^;
2815 >              if fdDataScale >= (-4) then
2816 >                Param.AsCurrency := PCurrency(data)^
2817 >              else
2818 >                Param.AsDouble := PDouble(data)^;
2819              end;
2820              SQL_INT64:
2821              begin
2822 <              if rdFields[j].fdDataScale = 0 then
2823 <                Qry.Params[i].AsInt64 := PInt64(data)^
2824 <              else if rdFields[j].fdDataScale >= (-4) then
2825 <                Qry.Params[i].AsCurrency := PCurrency(data)^
2822 >              if fdDataScale = 0 then
2823 >                Param.AsInt64 := PInt64(data)^
2824 >              else
2825 >              if fdDataScale >= (-4) then
2826 >                Param.AsCurrency := PCurrency(data)^
2827                else
2828 <                Qry.Params[i].AsDouble := PDouble(data)^;
2828 >                Param.AsDouble := PDouble(data)^;
2829              end;
2830              SQL_BLOB, SQL_ARRAY, SQL_QUAD:
2831 <              Qry.Params[i].AsQuad := PISC_QUAD(data)^;
2831 >              Param.AsQuad := PISC_QUAD(data)^;
2832              SQL_TYPE_DATE:
2833              begin
2834                ts.Date := PInt(data)^;
2835                ts.Time := 0;
2836 <              Qry.Params[i].AsDate :=
2096 <                TimeStampToDateTime(ts);
2836 >              Param.AsDate := TimeStampToDateTime(ts);
2837              end;
2838              SQL_TYPE_TIME:
2839              begin
2840                ts.Date := 0;
2841                ts.Time := PInt(data)^;
2842 <              Qry.Params[i].AsTime :=
2103 <                TimeStampToDateTime(ts);
2842 >              Param.AsTime := TimeStampToDateTime(ts);
2843              end;
2844              SQL_TIMESTAMP:
2845 <              Qry.Params[i].AsDateTime :=
2845 >              Param.AsDateTime :=
2846                         TimeStampToDateTime(MSecsToTimeStamp(trunc(PDouble(data)^)));
2847 +            SQL_BOOLEAN:
2848 +              Param.AsBoolean := PWordBool(data)^;
2849            end;
2850          end;
2851        end;
# Line 2153 | Line 2894 | begin
2894      FQRefresh.Transaction := Value;
2895      FQSelect.Transaction := Value;
2896      FQModify.Transaction := Value;
2897 +    FGeneratorField.Transaction := Value;
2898    end;
2899   end;
2900  
# Line 2190 | Line 2932 | begin
2932    end;
2933   end;
2934  
2935 + procedure TIBCustomDataSet.RegisterIBLink(Sender: TIBControlLink);
2936 + begin
2937 +  if FIBLinks.IndexOf(Sender) = -1 then
2938 +    FIBLinks.Add(Sender);
2939 + end;
2940 +
2941  
2942   procedure TIBCustomDataSet.SQLChanging(Sender: TObject);
2943   begin
2944 <  if FOpen then
2945 <    InternalClose;
2944 >  Active := false;
2945 > {  if FOpen then
2946 >    InternalClose;}
2947    if FInternalPrepared then
2948      InternalUnPrepare;
2949 +  FieldDefs.Clear;
2950 +  FieldDefs.Updated := false;
2951 + end;
2952 +
2953 + procedure TIBCustomDataSet.SQLChanged(Sender: TObject);
2954 + begin
2955 +  FBaseSQLSelect.assign(FQSelect.SQL);
2956   end;
2957  
2958   { I can "undelete" uninserted records (make them "inserted" again).
# Line 2225 | Line 2981 | begin
2981    end;
2982   end;
2983  
2984 + procedure TIBCustomDataSet.UnRegisterIBLink(Sender: TIBControlLink);
2985 + begin
2986 +  FIBLinks.Remove(Sender);
2987 + end;
2988 +
2989   function TIBCustomDataSet.UpdateStatus: TUpdateStatus;
2990   begin
2991    if Active then
# Line 2241 | Line 3002 | begin
3002    Result := Assigned( FQSelect ) and FQSelect.EOF;
3003   end;
3004  
3005 < function TIBCustomDataSet.ParamByName(ParamName: String): TIBXSQLVAR;
3005 > function TIBCustomDataSet.ParamByName(ParamName: String): ISQLParam;
3006   begin
3007    ActivateConnection;
3008    ActivateTransaction;
# Line 2378 | Line 3139 | var
3139    Buff: PChar;
3140    bTr, bDB: Boolean;
3141   begin
3142 +  if (Field = nil) or (Field.DataSet <> self) then
3143 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3144    Buff := GetActiveBuf;
3145    if Buff = nil then
3146    begin
3147      fs := TIBBlobStream.Create;
3148      fs.Mode := bmReadWrite;
3149 +    fs.Database := Database;
3150 +    fs.Transaction := Transaction;
3151 +    fs.SetField(Field);
3152      FBlobStreamList.Add(Pointer(fs));
3153      result := TIBDSBlobStream.Create(Field, fs, Mode);
3154      exit;
# Line 2397 | Line 3163 | begin
3163      fs.Mode := bmReadWrite;
3164      fs.Database := Database;
3165      fs.Transaction := Transaction;
3166 +    fs.SetField(Field);
3167      fs.BlobID :=
3168 <      PISC_QUAD(@Buff[PRecordData(Buff)^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3168 >      PISC_QUAD(@Buff[FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3169      if (CachedUpdates) then
3170      begin
3171        bTr := not Transaction.InTransaction;
# Line 2419 | Line 3186 | begin
3186    result := TIBDSBlobStream.Create(Field, fs, Mode);
3187   end;
3188  
3189 + function TIBCustomDataSet.GetArray(Field: TIBArrayField): IArray;
3190 + var Buff: PChar;
3191 +    pda: PArrayDataArray;
3192 +    bTr, bDB: Boolean;
3193 + begin
3194 +  if (Field = nil) or (Field.DataSet <> self) then
3195 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3196 +  Buff := GetActiveBuf;
3197 +  if Buff = nil then
3198 +    Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3199 +                              Field.FRelationName,Field.FieldName)
3200 +  else
3201 +  begin
3202 +    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3203 +    if pda^[Field.FCacheOffset] = nil then
3204 +    begin
3205 +      AdjustRecordOnInsert(Buff);
3206 +      if Field.IsNull then
3207 +        Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3208 +                                Field.FRelationName,Field.FieldName)
3209 +      else
3210 +        Result := Database.Attachment.OpenArray(Transaction.TransactionIntf,
3211 +                            Field.FRelationName,Field.FieldName,Field.ArrayID);
3212 +      pda^[Field.FCacheOffset] := TIBArray.Create(Field,Result);
3213 +      FArrayList.Add(pda^[Field.FCacheOffset]);
3214 +      if (CachedUpdates) then
3215 +      begin
3216 +        bTr := not Transaction.InTransaction;
3217 +        bDB := not Database.Connected;
3218 +        if bDB then
3219 +          Database.Open;
3220 +        if bTr then
3221 +          Transaction.StartTransaction;
3222 +         pda^[Field.FCacheOffset].ArrayIntf.PreLoad;
3223 +        if bTr then
3224 +          Transaction.Commit;
3225 +        if bDB then
3226 +          Database.Close;
3227 +      end;
3228 +      WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3229 +    end
3230 +    else
3231 +      Result := pda^[Field.FCacheOffset].ArrayIntf;
3232 +  end;
3233 + end;
3234 +
3235 + procedure TIBCustomDataSet.SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
3236 + var Buff: PChar;
3237 +    pda: PArrayDataArray;
3238 + begin
3239 +  if (Field = nil) or (Field.DataSet <> self) then
3240 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3241 +  Buff := GetActiveBuf;
3242 +  if Buff <> nil then
3243 +  begin
3244 +    AdjustRecordOnInsert(Buff);
3245 +    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3246 +    pda^[Field.FCacheOffset].FArray := AnArray;
3247 +    WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3248 +  end;
3249 + end;
3250 +
3251   function TIBCustomDataSet.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer;
3252   const
3253    CMPLess = -1;
# Line 2454 | Line 3283 | begin
3283    inherited DoBeforeDelete;
3284   end;
3285  
3286 + procedure TIBCustomDataSet.DoAfterDelete;
3287 + begin
3288 +  inherited DoAfterDelete;
3289 +  FBase.DoAfterDelete(self);
3290 +  InternalAutoCommit;
3291 + end;
3292 +
3293   procedure TIBCustomDataSet.DoBeforeEdit;
3294   var
3295    Buff: PRecordData;
# Line 2468 | Line 3304 | begin
3304    inherited DoBeforeEdit;
3305   end;
3306  
3307 + procedure TIBCustomDataSet.DoAfterEdit;
3308 + begin
3309 +  inherited DoAfterEdit;
3310 +  FBase.DoAfterEdit(self);
3311 + end;
3312 +
3313   procedure TIBCustomDataSet.DoBeforeInsert;
3314   begin
3315    if not CanInsert then
# Line 2480 | Line 3322 | begin
3322    if GeneratorField.ApplyOnEvent = gaeOnNewRecord then
3323      GeneratorField.Apply;
3324    inherited DoAfterInsert;
3325 +  FBase.DoAfterInsert(self);
3326 + end;
3327 +
3328 + procedure TIBCustomDataSet.DoBeforeClose;
3329 + begin
3330 +  inherited DoBeforeClose;
3331 +  if FInTransactionEnd and (FCloseAction = TARollback) then
3332 +     Exit;
3333 +  if State in [dsInsert,dsEdit] then
3334 +  begin
3335 +    if DataSetCloseAction = dcSaveChanges then
3336 +      Post;
3337 +      {Note this can fail with an exception e.g. due to
3338 +       database validation error. In which case the dataset remains open }
3339 +  end;
3340 +  if FCachedUpdates and FUpdatesPending and (DataSetCloseAction = dcSaveChanges) then
3341 +    ApplyUpdates;
3342 + end;
3343 +
3344 + procedure TIBCustomDataSet.DoBeforeOpen;
3345 + var i: integer;
3346 + begin
3347 +  if assigned(FParser) then
3348 +     FParser.Reset;
3349 +  for i := 0 to FIBLinks.Count - 1 do
3350 +    TIBControlLink(FIBLinks[i]).UpdateSQL(self);
3351 +  inherited DoBeforeOpen;
3352 +  for i := 0 to FIBLinks.Count - 1 do
3353 +    TIBControlLink(FIBLinks[i]).UpdateParams(self);
3354   end;
3355  
3356   procedure TIBCustomDataSet.DoBeforePost;
# Line 2490 | Line 3361 | begin
3361       GeneratorField.Apply
3362   end;
3363  
3364 + procedure TIBCustomDataSet.DoAfterPost;
3365 + begin
3366 +  inherited DoAfterPost;
3367 +  FBase.DoAfterPost(self);
3368 +  InternalAutoCommit;
3369 + end;
3370 +
3371   procedure TIBCustomDataSet.FetchAll;
3372   var
2495  SetCursor: Boolean;
2496  {$IF FPC_FULLVERSION > 20600 }
3373    CurBookmark: TBookmark;
3374 <  {$ELSE}
3375 <  CurBookmark: string;
3376 <  {$ENDIF}
2501 < begin
2502 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
2503 <  if SetCursor then
2504 <    Screen.Cursor := crHourGlass;
2505 <  try
3374 > begin
3375 >  FBase.SetCursor;
3376 > try
3377      if FQSelect.EOF or not FQSelect.Open then
3378        exit;
3379      DisableControls;
# Line 2514 | Line 3385 | begin
3385        EnableControls;
3386      end;
3387    finally
3388 <    if SetCursor and (Screen.Cursor = crHourGlass) then
2518 <      Screen.Cursor := crDefault;
3388 >    FBase.RestoreCursor;
3389    end;
3390   end;
3391  
# Line 2563 | Line 3433 | begin
3433      result := FDataLink.DataSource;
3434   end;
3435  
3436 + function TIBCustomDataSet.GetDBAliasName(FieldNo: integer): string;
3437 + begin
3438 +  Result := FAliasNameMap[FieldNo-1]
3439 + end;
3440 +
3441 + function TIBCustomDataSet.GetFieldDefFromAlias(aliasName: string): TFieldDef;
3442 + var
3443 +   i: integer;
3444 + begin
3445 +   Result := nil;
3446 +   for i := 0 to Length(FAliasNameMap) - 1 do
3447 +       if FAliasNameMap[i] = aliasName then
3448 +       begin
3449 +         Result := FieldDefs[i];
3450 +         Exit
3451 +       end;
3452 + end;
3453 +
3454   function TIBCustomDataSet.GetFieldClass(FieldType: TFieldType): TFieldClass;
3455   begin
3456    Result := DefaultFieldClasses[FieldType];
# Line 2593 | Line 3481 | begin
3481      if result and (Buffer <> nil) then
3482        Move(Buff[1], Buffer^, Field.DataSize);
3483    end
3484 <  else if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3484 >  else
3485 >  if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3486       (FMappedFieldPosition[Field.FieldNo - 1] <= CurrentRecord^.rdFieldCount) then
3487 +  with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]],
3488 +                         FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]] do
3489    begin
3490 <    result := not CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull;
3490 >    result := not fdIsNull;
3491      if result and (Buffer <> nil) then
2601      with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]] do
3492        begin
3493 <        Data := Buff + CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs;
3493 >        Data := Buff + fdDataOfs;
3494          if (fdDataType = SQL_VARYING) or (fdDataType = SQL_TEXT) then
3495          begin
3496 <          if fdDataLength <= Field.Size then
3496 >          if fdDataLength < Field.DataSize then
3497            begin
3498              Move(Data^, Buffer^, fdDataLength);
3499              PChar(Buffer)[fdDataLength] := #0;
# Line 2652 | Line 3542 | begin
3542          if not Accept and (GetMode = gmCurrent) then
3543            GetMode := gmPrior;
3544        except
3545 < //        Application.HandleException(Self);
3545 > //        FBase.HandleException(Self);
3546        end;
3547      end;
3548      RestoreState(SaveState);
# Line 2671 | Line 3561 | begin
3561          if FCurrentRecord < FRecordCount then
3562            ReadRecordCache(FCurrentRecord, Buffer, False)
3563          else begin
3564 <          while (not FQSelect.EOF) and
2675 <                (FQSelect.Next <> nil) and
3564 >          while (not FQSelect.EOF) and FQSelect.Next  and
3565                  (FCurrentRecord >= FRecordCount) do begin
3566              FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
3567              Inc(FRecordCount);
# Line 2746 | Line 3635 | begin
3635    result := FRecordBufferSize;
3636   end;
3637  
3638 + procedure TIBCustomDataSet.InternalAutoCommit;
3639 + begin
3640 +  with Transaction do
3641 +    if InTransaction and (FAutoCommit = acCommitRetaining) then
3642 +    begin
3643 +      if CachedUpdates then ApplyUpdates;
3644 +      CommitRetaining;
3645 +    end;
3646 + end;
3647 +
3648   procedure TIBCustomDataSet.InternalAddRecord(Buffer: Pointer; Append: Boolean);
3649   begin
3650    CheckEditState;
# Line 2773 | Line 3672 | procedure TIBCustomDataSet.InternalCance
3672   var
3673    Buff: PChar;
3674    CurRec: Integer;
3675 +  pda: PArrayDataArray;
3676 +  i: integer;
3677   begin
3678    inherited InternalCancel;
3679    Buff := GetActiveBuf;
3680 <  if Buff <> nil then begin
3680 >  if Buff <> nil then
3681 >  begin
3682 >    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3683 >    for i := 0 to ArrayFieldCount - 1 do
3684 >      pda^[i].ArrayIntf.CancelChanges;
3685      CurRec := FCurrentRecord;
3686      AdjustRecordOnInsert(Buff);
3687      if (State = dsEdit) then begin
# Line 2799 | Line 3704 | begin
3704      DeactivateTransaction;
3705    FQSelect.Close;
3706    ClearBlobCache;
3707 +  ClearArrayCache;
3708    FreeRecordBuffer(FModelBuffer);
3709    FreeRecordBuffer(FOldBuffer);
3710    FCurrentRecord := -1;
# Line 2814 | Line 3720 | begin
3720    FOBEnd := 0;
3721    FreeMem(FBufferCache);
3722    FBufferCache := nil;
3723 +  FreeMem(FFieldColumns);
3724 +  FFieldColumns := nil;
3725    FreeMem(FOldBufferCache);
3726    FOldBufferCache := nil;
3727    BindFields(False);
3728 +  ResetParser;
3729    if DefaultFields then DestroyFields;
3730   end;
3731  
3732   procedure TIBCustomDataSet.InternalDelete;
3733   var
3734    Buff: PChar;
2826  SetCursor: Boolean;
3735   begin
3736 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
2829 <  if SetCursor then
2830 <    Screen.Cursor := crHourGlass;
3736 >  FBase.SetCursor;
3737    try
3738      Buff := GetActiveBuf;
3739      if CanDelete then
# Line 2852 | Line 3758 | begin
3758      end else
3759        IBError(ibxeCannotDelete, [nil]);
3760    finally
3761 <    if SetCursor and (Screen.Cursor = crHourGlass) then
2856 <      Screen.Cursor := crDefault;
3761 >    FBase.RestoreCursor;
3762    end;
3763   end;
3764  
# Line 2869 | Line 3774 | end;
3774  
3775   procedure TIBCustomDataSet.InternalHandleException;
3776   begin
3777 <  Application.HandleException(Self)
3777 >  FBase.HandleException(Self)
3778   end;
3779  
3780   procedure TIBCustomDataSet.InternalInitFieldDefs;
3781 + begin
3782 +  if not InternalPrepared then
3783 +  begin
3784 +    InternalPrepare;
3785 +    exit;
3786 +  end;
3787 +   FieldDefsFromQuery(FQSelect);
3788 + end;
3789 +
3790 + procedure TIBCustomDataSet.FieldDefsFromQuery(SourceQuery: TIBSQL);
3791   const
3792    DefaultSQL = 'Select F.RDB$COMPUTED_BLR, ' + {do not localize}
3793                 'F.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME ' + {do not localize}
# Line 2881 | Line 3796 | const
3796                 'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
3797                 'and ((not F.RDB$COMPUTED_BLR is NULL) or ' + {do not localize}
3798                 '     (not F.RDB$DEFAULT_VALUE is NULL)) '; {do not localize}
3799 +
3800 +  DefaultSQLODS12 = 'Select F.RDB$COMPUTED_BLR, ' + {do not localize}
3801 +               'F.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME, R.RDB$IDENTITY_TYPE ' + {do not localize}
3802 +               'from RDB$RELATION_FIELDS R, RDB$FIELDS F ' + {do not localize}
3803 +               'where R.RDB$RELATION_NAME = :RELATION ' +  {do not localize}
3804 +               'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
3805 +               'and ((not F.RDB$COMPUTED_BLR is NULL) or ' + {do not localize}
3806 +               '     (not F.RDB$DEFAULT_VALUE is NULL) or ' + {do not localize}
3807 +               '     ( not R.RDB$IDENTITY_TYPE is NULL))' ; {do not localize}
3808 +
3809   var
3810    FieldType: TFieldType;
3811    FieldSize: Word;
3812 +  FieldDataSize: integer;
3813 +  charSetID: short;
3814 +  CharSetSize: integer;
3815 +  CharSetName: RawByteString;
3816 +  FieldCodePage: TSystemCodePage;
3817    FieldNullable : Boolean;
3818    i, FieldPosition, FieldPrecision: Integer;
3819 <  FieldAliasName: string;
3820 <  RelationName, FieldName: string;
3819 >  FieldAliasName, DBAliasName: string;
3820 >  aRelationName, FieldName: string;
3821    Query : TIBSQL;
3822    FieldIndex: Integer;
3823    FRelationNodes : TRelationNode;
3824 +  aArrayDimensions: integer;
3825 +  aArrayBounds: TArrayBounds;
3826 +  ArrayMetaData: IArrayMetaData;
3827  
3828    function Add_Node(Relation, Field : String) : TRelationNode;
3829    var
# Line 2913 | Line 3846 | var
3846        FField.FieldName := Query.Fields[2].AsString;
3847        FField.DEFAULT_VALUE := not Query.Fields[1].IsNull;
3848        FField.COMPUTED_BLR := not Query.Fields[0].IsNull;
3849 +      FField.IDENTITY_COLUMN := (Query.FieldCount > 3) and not Query.Fields[3].IsNull;
3850        FField.NextField := Result.FieldNodes;
3851        Result.FieldNodes := FField;
3852        Query.Next;
# Line 2966 | Line 3900 | var
3900          FField := Ffield.NextField;
3901    end;
3902  
3903 +  function Is_IDENTITY_COLUMN(Relation, Field : String) : Boolean;
3904 +  var
3905 +    FRelation : TRelationNode;
3906 +    FField : TFieldNode;
3907 +  begin
3908 +    FRelation := FRelationNodes;
3909 +    while Assigned(FRelation) and
3910 +         (FRelation.RelationName <> Relation) do
3911 +      FRelation := FRelation.NextRelation;
3912 +    if not Assigned(FRelation) then
3913 +      FRelation := Add_Node(Relation, Field);
3914 +    Result := false;
3915 +    FField := FRelation.FieldNodes;
3916 +    while Assigned(FField) do
3917 +      if FField.FieldName = Field then
3918 +      begin
3919 +        Result := Ffield.IDENTITY_COLUMN;
3920 +        Exit;
3921 +      end
3922 +      else
3923 +        FField := Ffield.NextField;
3924 +  end;
3925 +
3926    Procedure FreeNodes;
3927    var
3928      FRelation : TRelationNode;
# Line 2986 | Line 3943 | var
3943    end;
3944  
3945   begin
2989  if not InternalPrepared then
2990  begin
2991    InternalPrepare;
2992    exit;
2993  end;
3946    FRelationNodes := TRelationNode.Create;
3947    FNeedsRefresh := False;
3948 <  Database.InternalTransaction.StartTransaction;
3948 >  if not Database.InternalTransaction.InTransaction then
3949 >    Database.InternalTransaction.StartTransaction;
3950    Query := TIBSQL.Create(self);
3951    try
3952      Query.Database := DataBase;
# Line 3001 | Line 3954 | begin
3954      FieldDefs.BeginUpdate;
3955      FieldDefs.Clear;
3956      FieldIndex := 0;
3957 <    if (Length(FMappedFieldPosition) < FQSelect.Current.Count) then
3958 <      SetLength(FMappedFieldPosition, FQSelect.Current.Count);
3959 <    Query.SQL.Text := DefaultSQL;
3957 >    if (Length(FMappedFieldPosition) < SourceQuery.MetaData.Count) then
3958 >      SetLength(FMappedFieldPosition, SourceQuery.MetaData.Count);
3959 >    if FDatabaseInfo.ODSMajorVersion >= 12 then
3960 >      Query.SQL.Text := DefaultSQLODS12
3961 >    else
3962 >      Query.SQL.Text := DefaultSQL;
3963      Query.Prepare;
3964 <    for i := 0 to FQSelect.Current.Count - 1 do
3965 <      with FQSelect.Current[i].Data^ do
3964 >    SetLength(FAliasNameMap, SourceQuery.MetaData.Count);
3965 >    SetLength(FAliasNameList, SourceQuery.MetaData.Count);
3966 >    for i := 0 to SourceQuery.MetaData.GetCount - 1 do
3967 >      with SourceQuery.MetaData[i] do
3968        begin
3969          { Get the field name }
3970 <        SetString(FieldAliasName, aliasname, aliasname_length);
3971 <        SetString(RelationName, relname, relname_length);
3972 <        SetString(FieldName, sqlname, sqlname_length);
3970 >        FieldAliasName := GetName;
3971 >        DBAliasName := GetAliasname;
3972 >        aRelationName := getRelationName;
3973 >        FieldName := getSQLName;
3974 >        FAliasNameList[i] := DBAliasName;
3975          FieldSize := 0;
3976 +        FieldDataSize := GetSize;
3977          FieldPrecision := 0;
3978 <        FieldNullable := FQSelect.Current[i].IsNullable;
3979 <        case sqltype and not 1 of
3978 >        FieldNullable := IsNullable;
3979 >        CharSetSize := 0;
3980 >        CharSetName := '';
3981 >        FieldCodePage := CP_NONE;
3982 >        aArrayDimensions := 0;
3983 >        SetLength(aArrayBounds,0);
3984 >        case SQLType of
3985            { All VARCHAR's must be converted to strings before recording
3986             their values }
3987            SQL_VARYING, SQL_TEXT:
3988            begin
3989 <            FieldSize := sqllen;
3989 >            if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
3990 >              CharSetSize := 1;
3991 >            CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
3992 >            Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
3993 >            FieldSize := FieldDataSize div CharSetSize;
3994              FieldType := ftString;
3995            end;
3996            { All Doubles/Floats should be cast to doubles }
# Line 3028 | Line 3998 | begin
3998              FieldType := ftFloat;
3999            SQL_SHORT:
4000            begin
4001 <            if (sqlscale = 0) then
4001 >            if (getScale = 0) then
4002                FieldType := ftSmallInt
4003              else begin
4004                FieldType := ftBCD;
4005                FieldPrecision := 4;
4006 <              FieldSize := -sqlscale;
4006 >              FieldSize := -getScale;
4007              end;
4008            end;
4009            SQL_LONG:
4010            begin
4011 <            if (sqlscale = 0) then
4011 >            if (getScale = 0) then
4012                FieldType := ftInteger
4013 <            else if (sqlscale >= (-4)) then
4013 >            else if (getScale >= (-4)) then
4014              begin
4015                FieldType := ftBCD;
4016                FieldPrecision := 9;
4017 <              FieldSize := -sqlscale;
4017 >              FieldSize := -getScale;
4018              end
4019              else
4020              if Database.SQLDialect = 1 then
# Line 3056 | Line 4026 | begin
4026              begin
4027                FieldType := ftFMTBCD;
4028                FieldPrecision := 9;
4029 <              FieldSize := -sqlscale;
4029 >              FieldSize := -getScale;
4030              end;
4031            end;
4032  
4033            SQL_INT64:
4034            begin
4035 <            if (sqlscale = 0) then
4035 >            if (getScale = 0) then
4036                FieldType := ftLargeInt
4037 <            else if (sqlscale >= (-4)) then
4037 >            else if (getScale >= (-4)) then
4038              begin
4039                FieldType := ftBCD;
4040                FieldPrecision := 18;
4041 <              FieldSize := -sqlscale;
4041 >              FieldSize := -getScale;
4042              end
4043              else
4044 <              FieldType := ftFloat
4044 >              FieldType := ftFloat;
4045            end;
4046            SQL_TIMESTAMP: FieldType := ftDateTime;
4047            SQL_TYPE_TIME: FieldType := ftTime;
# Line 3079 | Line 4049 | begin
4049            SQL_BLOB:
4050            begin
4051              FieldSize := sizeof (TISC_QUAD);
4052 <            if (sqlsubtype = 1) then
4053 <              FieldType := ftmemo
4052 >            if (getSubtype = 1) then
4053 >            begin
4054 >              if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
4055 >                CharSetSize := 1;
4056 >              CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
4057 >              Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
4058 >              FieldType := ftMemo;
4059 >            end
4060              else
4061                FieldType := ftBlob;
4062            end;
4063            SQL_ARRAY:
4064            begin
4065              FieldSize := sizeof (TISC_QUAD);
4066 <            FieldType := ftUnknown;
4066 >            FieldType := ftArray;
4067 >            ArrayMetaData := GetArrayMetaData;
4068 >            if ArrayMetaData <> nil then
4069 >            begin
4070 >              aArrayDimensions := ArrayMetaData.GetDimensions;
4071 >              aArrayBounds := ArrayMetaData.GetBounds;
4072 >            end;
4073            end;
4074 +          SQL_BOOLEAN:
4075 +             FieldType:= ftBoolean;
4076            else
4077              FieldType := ftUnknown;
4078          end;
# Line 3097 | Line 4081 | begin
4081          begin
4082            FMappedFieldPosition[FieldIndex] := FieldPosition;
4083            Inc(FieldIndex);
4084 <          with FieldDefs.AddFieldDef do
4084 >          with TIBFieldDef.Create(FieldDefs,'',FieldType,0,False,FieldDefs.Count+1) do
4085            begin
4086              Name := FieldAliasName;
4087 < (*           FieldNo := FieldPosition;*)
3104 <            DataType := FieldType;
4087 >            FAliasNameMap[FieldNo-1] := DBAliasName;
4088              Size := FieldSize;
4089 +            DataSize := FieldDataSize;
4090              Precision := FieldPrecision;
4091              Required := not FieldNullable;
4092 +            RelationName := aRelationName;
4093              InternalCalcField := False;
4094 +            CharacterSetSize := CharSetSize;
4095 +            CharacterSetName := CharSetName;
4096 +            CodePage := FieldCodePage;
4097 +            ArrayDimensions := aArrayDimensions;
4098 +            ArrayBounds := aArrayBounds;
4099              if (FieldName <> '') and (RelationName <> '') then
4100              begin
4101 +              IdentityColumn := Is_IDENTITY_COLUMN(RelationName, FieldName);
4102                if Has_COMPUTED_BLR(RelationName, FieldName) then
4103                begin
4104                  Attributes := [faReadOnly];
# Line 3133 | Line 4124 | begin
4124      FreeNodes;
4125      Database.InternalTransaction.Commit;
4126      FieldDefs.EndUpdate;
4127 +    FieldDefs.Updated := true;
4128    end;
4129   end;
4130  
# Line 3150 | Line 4142 | begin
4142    else begin
4143      Buffer := AllocRecordBuffer;
4144      try
4145 <      while FQSelect.Next <> nil do
4145 >      while FQSelect.Next do
4146        begin
4147          FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
4148          Inc(FRecordCount);
# Line 3165 | Line 4157 | end;
4157   procedure TIBCustomDataSet.InternalSetParamsFromCursor;
4158   var
4159    i: Integer;
4160 <  cur_param: TIBXSQLVAR;
4160 >  cur_param: ISQLParam;
4161    cur_field: TField;
4162    s: TStream;
4163   begin
# Line 3173 | Line 4165 | begin
4165      IBError(ibxeEmptyQuery, [nil]);
4166    if not FInternalPrepared then
4167      InternalPrepare;
4168 <  if (SQLParams.Count > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
4168 >  if (SQLParams.GetCount > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
4169    begin
4170 <    for i := 0 to SQLParams.Count - 1 do
4170 >    for i := 0 to SQLParams.GetCount - 1 do
4171      begin
4172        cur_field := DataSource.DataSet.FindField(SQLParams[i].Name);
4173        cur_param := SQLParams[i];
# Line 3185 | Line 4177 | begin
4177          else case cur_field.DataType of
4178            ftString:
4179              cur_param.AsString := cur_field.AsString;
4180 <          ftBoolean, ftSmallint, ftWord:
4180 >          ftBoolean:
4181 >            cur_param.AsBoolean := cur_field.AsBoolean;
4182 >          ftSmallint, ftWord:
4183              cur_param.AsShort := cur_field.AsInteger;
4184            ftInteger:
4185              cur_param.AsLong := cur_field.AsInteger;
# Line 3207 | Line 4201 | begin
4201              try
4202                s := DataSource.DataSet.
4203                       CreateBlobStream(cur_field, bmRead);
4204 <              cur_param.LoadFromStream(s);
4204 >              cur_param.AsBlob := TIBDSBlobStream(s).FBlobStream.Blob;
4205              finally
4206                s.free;
4207              end;
4208            end;
4209 +          ftArray:
4210 +            cur_param.AsArray := TIBArrayField(cur_field).ArrayIntf;
4211            else
4212              IBError(ibxeNotSupported, [nil]);
4213          end;
# Line 3238 | Line 4234 | begin
4234   end;
4235  
4236   procedure TIBCustomDataSet.InternalOpen;
3241 var
3242  SetCursor: Boolean;
4237  
4238    function RecordDataLength(n: Integer): Long;
4239    begin
# Line 3247 | Line 4241 | var
4241    end;
4242  
4243   begin
4244 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
3251 <  if SetCursor then
3252 <    Screen.Cursor := crHourGlass;
4244 >  FBase.SetCursor;
4245    try
4246      ActivateConnection;
4247      ActivateTransaction;
# Line 3257 | Line 4249 | begin
4249        IBError(ibxeEmptyQuery, [nil]);
4250      if not FInternalPrepared then
4251        InternalPrepare;
4252 <   if FQSelect.SQLType = SQLSelect then
4252 >   if FQSelect.SQLStatementType = SQLSelect then
4253     begin
4254        if DefaultFields then
4255          CreateFields;
4256 +      FArrayFieldCount := 0;
4257        BindFields(True);
4258        FCurrentRecord := -1;
4259        FQSelect.ExecQuery;
# Line 3272 | Line 4265 | begin
4265          3. After the dummy fetch, FRecordSize will be appropriately
4266             adjusted to reflect the additional "weight" of the field
4267             data.
4268 <        4. Set up the FCalcFieldsOffset, FBlobCacheOffset and FRecordBufferSize.
4268 >        4. Set up the FCalcFieldsOffset, FBlobCacheOffset, FArrayCacheOffset and FRecordBufferSize.
4269          5. Now, with the BufferSize available, allocate memory for chunks of records
4270          6. Re-allocate the model buffer, accounting for the new
4271             FRecordBufferSize.
4272          7. Finally, calls to AllocRecordBuffer will work!.
4273         }
4274        {Step 1}
4275 <      FRecordSize := RecordDataLength(FQSelect.Current.Count);
4275 >      FRecordSize := RecordDataLength(FQSelect.FieldCount);
4276        {Step 2, 3}
4277 +      GetMem(FFieldColumns,sizeof(TFieldColumns) * (FQSelect.FieldCount));
4278        IBAlloc(FModelBuffer, 0, FRecordSize);
4279 <      FetchCurrentRecordToBuffer(FQSelect, -1, FModelBuffer);
4279 >      InitModelBuffer(FQSelect, FModelBuffer);
4280        {Step 4}
4281        FCalcFieldsOffset := FRecordSize;
4282        FBlobCacheOffset := FCalcFieldsOffset + CalcFieldsSize;
4283 <      FRecordBufferSize := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4283 >      FArrayCacheOffset := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4284 >      FRecordBufferSize := FArrayCacheOffset + (ArrayFieldCount * sizeof(IArray));
4285        {Step 5}
4286        if UniDirectional then
4287          FBufferChunkSize := FRecordBufferSize * UniCache
# Line 3302 | Line 4297 | begin
4297        FCacheSize := FBufferChunkSize;
4298        FOldCacheSize := FBufferChunkSize;
4299        {Step 6}
4300 <      IBAlloc(FModelBuffer, RecordDataLength(FQSelect.Current.Count),
4300 >      IBAlloc(FModelBuffer, RecordDataLength(FQSelect.FieldCount),
4301                               FRecordBufferSize);
4302        {Step 7}
4303        FOldBuffer := AllocRecordBuffer;
# Line 3310 | Line 4305 | begin
4305      else
4306        FQSelect.ExecQuery;
4307    finally
4308 <    if SetCursor and (Screen.Cursor = crHourGlass) then
3314 <      Screen.Cursor := crDefault;
4308 >    FBase.RestoreCursor;
4309    end;
4310   end;
4311  
# Line 3319 | Line 4313 | procedure TIBCustomDataSet.InternalPost;
4313   var
4314    Qry: TIBSQL;
4315    Buff: PChar;
3322  SetCursor: Boolean;
4316    bInserting: Boolean;
4317   begin
4318 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
3326 <  if SetCursor then
3327 <    Screen.Cursor := crHourGlass;
4318 >  FBase.SetCursor;
4319    try
4320      Buff := GetActiveBuf;
4321      CheckEditState;
# Line 3362 | Line 4353 | begin
4353      if bInserting then
4354        Inc(FRecordCount);
4355    finally
4356 <    if SetCursor and (Screen.Cursor = crHourGlass) then
3366 <      Screen.Cursor := crDefault;
4356 >    FBase.RestoreCursor;
4357    end;
4358   end;
4359  
# Line 3383 | Line 4373 | begin
4373    result := FOpen;
4374   end;
4375  
4376 + procedure TIBCustomDataSet.Loaded;
4377 + begin
4378 +  if assigned(FQSelect) then
4379 +    FBaseSQLSelect.assign(FQSelect.SQL);
4380 +  inherited Loaded;
4381 + end;
4382 +
4383 + procedure TIBCustomDataSet.Post;
4384 + var CancelPost: boolean;
4385 + begin
4386 +  CancelPost := false;
4387 +  if assigned(FOnValidatePost) then
4388 +    OnValidatePost(self,CancelPost);
4389 +  if CancelPost then
4390 +    Cancel
4391 +  else
4392 +   inherited Post;
4393 + end;
4394 +
4395   function TIBCustomDataSet.Locate(const KeyFields: string; const KeyValues: Variant;
4396                                   Options: TLocateOptions): Boolean;
4397   var
3389  {$IF FPC_FULLVERSION > 20600 }
4398    CurBookmark: TBookmark;
3391  {$ELSE}
3392  CurBookmark: string;
3393  {$ENDIF}
4399   begin
4400    DisableControls;
4401    try
# Line 3408 | Line 4413 | function TIBCustomDataSet.Lookup(const K
4413                                   const ResultFields: string): Variant;
4414   var
4415    fl: TList;
3411  {$IF FPC_FULLVERSION > 20600 }
4416    CurBookmark: TBookmark;
3413  {$ELSE}
3414  CurBookmark: string;
3415  {$ENDIF}
4417   begin
4418    DisableControls;
4419    fl := TList.Create;
# Line 3465 | Line 4466 | end;
4466   procedure TIBCustomDataSet.InternalSetFieldData(Field: TField; Buffer: Pointer);
4467   var
4468    Buff, TmpBuff: PChar;
4469 +  MappedFieldPos: integer;
4470   begin
4471    Buff := GetActiveBuf;
4472    if Field.FieldNo < 0 then
# Line 3481 | Line 4483 | begin
4483      begin
4484        { If inserting, Adjust record position }
4485        AdjustRecordOnInsert(Buff);
4486 <      if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
4487 <         (FMappedFieldPosition[Field.FieldNo - 1] <= rdFieldCount) then
4486 >      MappedFieldPos := FMappedFieldPosition[Field.FieldNo - 1];
4487 >      if (MappedFieldPos > 0) and
4488 >         (MappedFieldPos <= rdFieldCount) then
4489 >      with rdFields[MappedFieldPos], FFieldColumns^[MappedFieldPos] do
4490        begin
4491          Field.Validate(Buffer);
4492          if (Buffer = nil) or
4493             (Field is TIBStringField) and (PChar(Buffer)[0] = #0) then
4494 <          rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull := True
4495 <        else begin
4496 <          Move(Buffer^, Buff[rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs],
4497 <                 rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataSize);
4498 <          if (rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataType = SQL_TEXT) or
4499 <             (rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataType = SQL_VARYING) then
4500 <            rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataLength := StrLen(PChar(Buffer));
3497 <          rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull := False;
4494 >          fdIsNull := True
4495 >        else
4496 >        begin
4497 >          Move(Buffer^, Buff[fdDataOfs],fdDataSize);
4498 >          if (fdDataType = SQL_TEXT) or (fdDataType = SQL_VARYING) then
4499 >            fdDataLength := StrLen(PChar(Buffer));
4500 >          fdIsNull := False;
4501            if rdUpdateStatus = usUnmodified then
4502            begin
4503              if CachedUpdates then
# Line 3582 | Line 4585 | begin
4585   FillChar(Buffer[FRecordSize], CalcFieldsSize, 0);
4586   end;
4587  
4588 + procedure TIBCustomDataSet.ClearIBLinks;
4589 + var i: integer;
4590 + begin
4591 +  for i := FIBLinks.Count - 1 downto 0 do
4592 +    TIBControlLink(FIBLinks[i]).IBDataSet := nil;
4593 + end;
4594 +
4595  
4596   procedure TIBCustomDataSet.InternalUnPrepare;
4597   begin
4598    if FInternalPrepared then
4599    begin
4600      CheckDatasetClosed;
4601 +    if FDidActivate then
4602 +      DeactivateTransaction;
4603      FieldDefs.Clear;
4604 +    FieldDefs.Updated := false;
4605      FInternalPrepared := False;
4606 +    Setlength(FAliasNameList,0);
4607    end;
4608   end;
4609  
4610   procedure TIBCustomDataSet.InternalExecQuery;
4611   var
4612    DidActivate: Boolean;
3599  SetCursor: Boolean;
4613   begin
4614    DidActivate := False;
4615 <  SetCursor := (GetCurrentThreadID = MainThreadID) and (Screen.Cursor = crDefault);
3603 <  if SetCursor then
3604 <    Screen.Cursor := crHourGlass;
4615 >  FBase.SetCursor;
4616    try
4617      ActivateConnection;
4618      DidActivate := ActivateTransaction;
# Line 3609 | Line 4620 | begin
4620        IBError(ibxeEmptyQuery, [nil]);
4621      if not FInternalPrepared then
4622        InternalPrepare;
4623 <    if FQSelect.SQLType = SQLSelect then
4623 >    if FQSelect.SQLStatementType = SQLSelect then
4624      begin
4625        IBError(ibxeIsASelectStatement, [nil]);
4626      end
# Line 3618 | Line 4629 | begin
4629    finally
4630      if DidActivate then
4631        DeactivateTransaction;
4632 <    if SetCursor and (Screen.Cursor = crHourGlass) then
4633 <      Screen.Cursor := crDefault;
4632 >    FBase.RestoreCursor;
4633 >  end;
4634 > end;
4635 >
4636 > function TIBCustomDataSet.GetSelectStmtIntf: IStatement;
4637 > begin
4638 >  Result := FQSelect.Statement;
4639 > end;
4640 >
4641 > function TIBCustomDataSet.GetParser: TSelectSQLParser;
4642 > begin
4643 >  if not assigned(FParser) then
4644 >    FParser := CreateParser;
4645 >  Result := FParser
4646 > end;
4647 >
4648 > procedure TIBCustomDataSet.ResetParser;
4649 > begin
4650 >  if assigned(FParser) then
4651 >  begin
4652 >    FParser.Free;
4653 >    FParser := nil;
4654 >    FQSelect.OnSQLChanged := nil; {Do not react to change}
4655 >    try
4656 >      FQSelect.SQL.Assign(FBaseSQLSelect);
4657 >    finally
4658 >      FQSelect.OnSQLChanged := SQLChanged;
4659 >    end;
4660    end;
4661   end;
4662  
4663 < function TIBCustomDataSet.GetSelectStmtHandle: TISC_STMT_HANDLE;
4663 > function TIBCustomDataSet.HasParser: boolean;
4664   begin
4665 <  Result := FQSelect.Handle;
4665 >  Result := not (csDesigning in ComponentState) and (FParser <> nil)
4666 > end;
4667 >
4668 > procedure TIBCustomDataSet.SetGenerateParamNames(AValue: Boolean);
4669 > begin
4670 >  if FGenerateParamNames = AValue then Exit;
4671 >  FGenerateParamNames := AValue;
4672 >  Disconnect
4673   end;
4674  
4675   procedure TIBCustomDataSet.InitRecord(Buffer: PChar);
# Line 3646 | Line 4690 | end;
4690  
4691   { TIBDataSet IProviderSupport }
4692  
4693 < (*procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4693 > procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4694   begin
4695    if Commit then
4696      Transaction.Commit else
# Line 3799 | Line 4843 | begin
4843    Transaction.StartTransaction;
4844   end;
4845  
4846 < function TIBCustomDataSet.PSGetTableName: string;
4846 > function TIBCustomDataSet.PsGetTableName: string;
4847   begin
4848   //  if not FInternalPrepared then
4849   //    InternalPrepare;
# Line 3809 | Line 4853 | begin
4853    if not FQSelect.Prepared then
4854      FQSelect.Prepare;
4855    Result := FQSelect.UniqueRelationName;
4856 < end;*)
4856 > end;
4857  
4858   procedure TIBDataSet.BatchInput(InputObject: TIBBatchInput);
4859   begin
# Line 3940 | Line 4984 | begin
4984    inherited Destroy;
4985   end;
4986  
4987 < procedure TIBDataSetUpdateObject.SetRefreshSQL(Value: TStrings);
4987 > procedure TIBDataSetUpdateObject.SetRefreshSQL(value: TStrings);
4988   begin
4989    FRefreshSQL.Assign(Value);
4990   end;
4991  
4992 + procedure TIBDataSetUpdateObject.InternalSetParams(Params: ISQLParams;
4993 +  buff: PChar);
4994 + begin
4995 +  if not Assigned(DataSet) then Exit;
4996 +  DataSet.SetInternalSQLParams(Params, buff);
4997 + end;
4998 +
4999   procedure TIBDataSetUpdateObject.InternalSetParams(Query: TIBSQL; buff: PChar);
5000   begin
5001 +  InternalSetParams(Query.Params,buff);
5002 + end;
5003 +
5004 + procedure TIBDataSetUpdateObject.UpdateRecordFromQuery(QryResults: IResults;
5005 +  Buffer: PChar);
5006 + begin
5007    if not Assigned(DataSet) then Exit;
5008 <  DataSet.SetInternalSQLParams(Query, buff);
5008 >  DataSet.UpdateRecordFromQuery(QryResults, Buffer);
5009 > end;
5010 >
5011 > function TIBDSBlobStream.GetSize: Int64;
5012 > begin
5013 >  Result := FBlobStream.BlobSize;
5014   end;
5015  
5016   { TIBDSBlobStream }
# Line 3959 | Line 5021 | begin
5021    FBlobStream := ABlobStream;
5022    FBlobStream.Seek(0, soFromBeginning);
5023    if (Mode = bmWrite) then
5024 +  begin
5025      FBlobStream.Truncate;
5026 +    TIBCustomDataSet(FField.DataSet).RecordModified(True);
5027 +    TBlobField(FField).Modified := true;
5028 +    FHasWritten := true;
5029 +  end;
5030 + end;
5031 +
5032 + destructor TIBDSBlobStream.Destroy;
5033 + begin
5034 +  if FHasWritten then
5035 +     TIBCustomDataSet(FField.DataSet).DataEvent(deFieldChange, PtrInt(FField));
5036 +  inherited Destroy;
5037   end;
5038  
5039   function TIBDSBlobStream.Read(var Buffer; Count: Longint): Longint;
# Line 3984 | Line 5058 | begin
5058    TIBCustomDataSet(FField.DataSet).RecordModified(True);
5059    TBlobField(FField).Modified := true;
5060    result := FBlobStream.Write(Buffer, Count);
5061 <  TIBCustomDataSet(FField.DataSet).DataEvent(deFieldChange, PtrInt(FField));
5061 >  FHasWritten := true;
5062 > {  TIBCustomDataSet(FField.DataSet).DataEvent(deFieldChange, PtrInt(FField));
5063 >  Removed as this caused a seek to beginning of the blob stream thus corrupting
5064 >  the blob stream. Moved to the destructor i.e. called after blob written}
5065   end;
5066  
5067   { TIBGenerator }
5068  
5069   procedure TIBGenerator.SetIncrement(const AValue: integer);
5070   begin
5071 +  if FIncrement = AValue then Exit;
5072    if AValue < 0 then
5073 <     raise Exception.Create('A Generator Increment cannot be negative');
5074 <  FIncrement := AValue
5073 >    IBError(ibxeNegativeGenerator,[]);
5074 >  FIncrement := AValue;
5075 >  SetQuerySQL;
5076   end;
5077  
5078 < function TIBGenerator.GetNextValue(ADatabase: TIBDatabase;
4000 <  ATransaction: TIBTransaction): integer;
5078 > procedure TIBGenerator.SetTransaction(AValue: TIBTransaction);
5079   begin
5080 <  with TIBSQL.Create(nil) do
5081 <  try
5082 <    Database := ADatabase;
5083 <    Transaction := ATransaction;
5084 <    if not assigned(Database) then
5085 <       IBError(ibxeCannotSetDatabase,[]);
5086 <    if not assigned(Transaction) then
5087 <       IBError(ibxeCannotSetTransaction,[]);
5088 <    with Transaction do
5089 <      if not InTransaction then StartTransaction;
5090 <    SQL.Text := Format('Select Gen_ID(%s,%d) as ID From RDB$Database',[FGeneratorName,Increment]);
5091 <    Prepare;
5080 >  FQuery.Transaction := AValue;
5081 > end;
5082 >
5083 > procedure TIBGenerator.SetQuerySQL;
5084 > begin
5085 >  FQuery.SQL.Text := Format('Select Gen_ID(%s,%d) From RDB$Database',[FGeneratorName,Increment]);
5086 > end;
5087 >
5088 > function TIBGenerator.GetDatabase: TIBDatabase;
5089 > begin
5090 >  Result := FQuery.Database;
5091 > end;
5092 >
5093 > function TIBGenerator.GetTransaction: TIBTransaction;
5094 > begin
5095 >  Result := FQuery.Transaction;
5096 > end;
5097 >
5098 > procedure TIBGenerator.SetDatabase(AValue: TIBDatabase);
5099 > begin
5100 >  FQuery.Database := AValue;
5101 > end;
5102 >
5103 > procedure TIBGenerator.SetGeneratorName(AValue: string);
5104 > begin
5105 >  if FGeneratorName = AValue then Exit;
5106 >  FGeneratorName := AValue;
5107 >  SetQuerySQL;
5108 > end;
5109 >
5110 > function TIBGenerator.GetNextValue: integer;
5111 > begin
5112 >  with FQuery do
5113 >  begin
5114 >    Transaction.Active := true;
5115      ExecQuery;
5116      try
5117 <      Result := FieldByName('ID').AsInteger
5117 >      Result := Fields[0].AsInteger
5118      finally
5119        Close
5120      end;
4020  finally
4021    Free
5121    end;
5122   end;
5123  
# Line 4026 | Line 5125 | constructor TIBGenerator.Create(Owner: T
5125   begin
5126    FOwner := Owner;
5127    FIncrement := 1;
5128 +  FQuery := TIBSQL.Create(nil);
5129 + end;
5130 +
5131 + destructor TIBGenerator.Destroy;
5132 + begin
5133 +  if assigned(FQuery) then FQuery.Free;
5134 +  inherited Destroy;
5135   end;
5136  
5137  
5138   procedure TIBGenerator.Apply;
5139   begin
5140 <  if (FGeneratorName <> '') and (FFieldName <> '')  then
5141 <    Owner.FieldByName(FFieldName).AsInteger := GetNextValue(Owner.Database,Owner.Transaction);
5140 >  if assigned(Database) and assigned(Transaction) and
5141 >       (FGeneratorName <> '') and (FFieldName <> '') and Owner.FieldByName(FFieldName).IsNull then
5142 >    Owner.FieldByName(FFieldName).AsInteger := GetNextValue;
5143   end;
5144  
5145 +
5146   end.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines