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 37 by tony, Mon Feb 15 14:44:25 2016 UTC vs.
Revision 108 by tony, Thu Jan 18 14:37:46 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 - 2015                                                }
30 > {    Associates Ltd 2011 - 2015                                          }
31   {                                                                        }
32   {************************************************************************}
33  
# Line 35 | Line 35 | 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 49 | Line 52 | uses
52   {$ELSE}
53    unix,
54   {$ENDIF}
55 <  SysUtils, Classes, IBDatabase, IBExternals, IB, IBHeader,  IBSQL, Db,
56 <  IBUtils, IBBlob, IBSQLParser;
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 71 | 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 82 | 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 104 | 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 116 | 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: string;
182 >    FCharacterSetName: RawByteString;
183      FCharacterSetSize: integer;
184 +    FAutoFieldSize: boolean;
185 +    FCodePage: TSystemCodePage;
186 +    FDataSize: integer;
187    protected
188 <    function GetDefaultWidth: Longint; override;
188 >    procedure Bind(Binding: Boolean); override;
189 >    function GetDataSize: Integer; override;
190    public
191      constructor Create(aOwner: TComponent); override;
192      class procedure CheckTypeSize(Value: Integer); override;
# Line 131 | Line 194 | type
194      function GetAsVariant: Variant; override;
195      function GetValue(var Value: string): Boolean;
196      procedure SetAsString(const Value: string); override;
197 <    property CharacterSetName: string read FCharacterSetName write FCharacterSetName;
135 <    property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
136 <  end;
137 <
138 <  { TIBWideStringField }
139 <
140 <  TIBWideStringField = class(TWideStringField)
141 <  private
142 <    FCharacterSetName: string;
143 <    FCharacterSetSize: integer;
144 <  public
145 <    property CharacterSetName: string read FCharacterSetName write FCharacterSetName;
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 154 | 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 162 | 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: string;
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: string read FCharacterSetName write FCharacterSetName;
282 >     property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
283       property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
284 <  published
284 >   published
285       property DisplayTextAsClassName: boolean read FDisplayTextAsClassName
286                                              write FDisplayTextAsClassName;
189   end;
190
191   { TIBWideMemoField }
192
193   TIBWideMemoField = class(TWideMemoField)
287     private
288 <     FCharacterSetName: string;
289 <     FCharacterSetSize: integer;
197 <     FDisplayTextAsClassName: boolean;
198 <     function GetTruncatedText: string;
199 <   protected
200 <     function GetDefaultWidth: Longint; override;
201 <     procedure GetText(var AText: string; ADisplayText: Boolean); override;
288 >     FCodePage: TSystemCodePage;
289 >     FFCodePage: TSystemCodePage;
290     public
291 <     constructor Create(AOwner: TComponent); override;
204 <     property CharacterSetName: string read FCharacterSetName write FCharacterSetName;
205 <     property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
206 <   published
207 <      property DisplayTextAsClassName: boolean read FDisplayTextAsClassName
208 <                                             write FDisplayTextAsClassName;
291 >     property CodePage: TSystemCodePage read FFCodePage write FFCodePage;
292     end;
293  
294    TIBDataLink = class(TDetailDataLink)
# Line 232 | 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;
# Line 263 | Line 356 | type
356    TIBAutoCommit = (acDisabled, acCommitRetaining);
357  
358    { TIBCustomDataSet }
359 +
360    TIBUpdateAction = (uaFail, uaAbort, uaSkip, uaRetry, uaApply, uaApplied);
361  
362    TIBUpdateErrorEvent = procedure(DataSet: TDataSet; E: EDatabaseError;
# Line 279 | Line 373 | type
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;
288    FIBLoaded: Boolean;
385      FBase: TIBBase;
386      FBlobCacheOffset: Integer;
387      FBlobStreamList: TList;
388 +    FArrayList: TList;
389      FBufferChunks: Integer;
390      FBufferCache,
391      FOldBufferCache: PChar;
# Line 314 | Line 411 | type
411      FQRefresh,
412      FQSelect,
413      FQModify: TIBSQL;
414 +    FDatabaseInfo: TIBDatabaseInfo;
415      FRecordBufferSize: Integer;
416      FRecordCount: Integer;
417      FRecordSize: Integer;
# Line 342 | Line 440 | type
440      FCloseAction: TTransactionAction;
441      FInTransactionEnd: boolean;
442      FIBLinks: TList;
443 <    function GetSelectStmtHandle: TISC_STMT_HANDLE;
443 >    FFieldColumns: PFieldColumns;
444 >    FBufferUpdatedOnQryReturn: boolean;
445 >    procedure ColumnDataToBuffer(QryResults: IResults; ColumnIndex,
446 >      FieldIndex: integer; Buffer: PChar);
447 >    procedure InitModelBuffer(Qry: TIBSQL; Buffer: PChar);
448 >    function GetSelectStmtIntf: IStatement;
449      procedure SetUpdateMode(const Value: TUpdateMode);
450      procedure SetUpdateObject(Value: TIBDataSetUpdateObject);
451  
# Line 354 | Line 457 | type
457      function CanRefresh: Boolean;
458      procedure CheckEditState;
459      procedure ClearBlobCache;
460 +    procedure ClearArrayCache;
461      procedure ClearIBLinks;
462      procedure CopyRecordBuffer(Source, Dest: Pointer);
463      procedure DoBeforeDatabaseDisconnect(Sender: TObject);
# Line 365 | Line 469 | type
469      procedure FetchCurrentRecordToBuffer(Qry: TIBSQL; RecordNumber: Integer;
470                                           Buffer: PChar);
471      function GetDatabase: TIBDatabase;
368    function GetDBHandle: PISC_DB_HANDLE;
472      function GetDeleteSQL: TStrings;
473      function GetInsertSQL: TStrings;
474 <    function GetSQLParams: TIBXSQLDA;
474 >    function GetSQLParams: ISQLParams;
475      function GetRefreshSQL: TStrings;
476      function GetSelectSQL: TStrings;
477 <    function GetStatementType: TIBSQLTypes;
477 >    function GetStatementType: TIBSQLStatementTypes;
478      function GetModifySQL: TStrings;
479      function GetTransaction: TIBTransaction;
377    function GetTRHandle: PISC_TR_HANDLE;
480      function GetParser: TSelectSQLParser;
481      procedure InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer); virtual;
482      function InternalLocate(const KeyFields: string; const KeyValues: Variant;
# Line 389 | Line 491 | type
491      procedure SetDatabase(Value: TIBDatabase);
492      procedure SetDeleteSQL(Value: TStrings);
493      procedure SetInsertSQL(Value: TStrings);
494 <    procedure SetInternalSQLParams(Qry: TIBSQL; Buffer: Pointer);
494 >    procedure SetInternalSQLParams(Params: ISQLParams; Buffer: Pointer);
495      procedure SetRefreshSQL(Value: TStrings);
496      procedure SetSelectSQL(Value: TStrings);
497      procedure SetModifySQL(Value: TStrings);
498      procedure SetTransaction(Value: TIBTransaction);
499      procedure SetUpdateRecordTypes(Value: TIBUpdateRecordTypes);
500      procedure SetUniDirectional(Value: Boolean);
501 +    procedure UpdateRecordFromQuery(QryResults: IResults; Buffer: PChar);
502      procedure RefreshParams;
503      function AdjustPosition(FCache: PChar; Offset: DWORD;
504                              Origin: Integer): DWORD;
# Line 429 | Line 532 | type
532      procedure SQLChanging(Sender: TObject); virtual;
533      procedure SQLChanged(Sender: TObject); virtual;
534  
535 < (*    { IProviderSupport }
535 >    { IProviderSupport }
536      procedure PSEndTransaction(Commit: Boolean); override;
537      function PSExecuteStatement(const ASQL: string; AParams: TParams;
538        ResultSet: Pointer = nil): Integer; override;
# Line 442 | Line 545 | type
545      procedure PSStartTransaction; override;
546      procedure PSReset; override;
547      function PSUpdateRecord(UpdateKind: TUpdateKind; Delta: TDataSet): Boolean; override;
548 < *)
548 >
549      { TDataSet support }
550      procedure InternalInsert; override;
551      procedure InitRecord(Buffer: PChar); override;
# Line 506 | Line 609 | type
609    protected
610      {Likely to be made public by descendant classes}
611      property AutoCommit: TIBAutoCommit read FAutoCommit write FAutoCommit default acDisabled;
612 <    property SQLParams: TIBXSQLDA read GetSQLParams;
613 <    property Params: TIBXSQLDA read GetSQLParams;
612 >    property SQLParams: ISQLParams read GetSQLParams;
613 >    property Params: ISQLParams read GetSQLParams;
614      property InternalPrepared: Boolean read FInternalPrepared;
615      property QDelete: TIBSQL read FQDelete;
616      property QInsert: TIBSQL read FQInsert;
617      property QRefresh: TIBSQL read FQRefresh;
618      property QSelect: TIBSQL read FQSelect;
619      property QModify: TIBSQL read FQModify;
620 <    property StatementType: TIBSQLTypes read GetStatementType;
621 <    property SelectStmtHandle: TISC_STMT_HANDLE read GetSelectStmtHandle;
620 >    property StatementType: TIBSQLStatementTypes read GetStatementType;
621 >    property SelectStmtHandle: IStatement read GetSelectStmtIntf;
622  
623      {Likely to be made published by descendant classes}
624      property BufferChunks: Integer read FBufferChunks write SetBufferChunks;
# Line 566 | Line 669 | type
669      function BookmarkValid(Bookmark: TBookmark): Boolean; override;
670      function CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer; override;
671      function CreateBlobStream(Field: TField; Mode: TBlobStreamMode): TStream; override;
672 +    function GetArray(Field: TIBArrayField): IArray;
673 +    procedure SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
674      function GetCurrentRecord(Buffer: PChar): Boolean; override;
675      function GetFieldData(Field : TField; Buffer : Pointer) : Boolean; overload; override;
676      function GetFieldData(FieldNo: Integer; Buffer: Pointer): Boolean; overload; (*override;*)
# Line 579 | Line 684 | type
684      function UpdateStatus: TUpdateStatus; override;
685      function IsSequenced: Boolean; override;
686      procedure Post; override;
687 <    function ParamByName(ParamName: String): TIBXSQLVAR;
688 <    property DBHandle: PISC_DB_HANDLE read GetDBHandle;
689 <    property TRHandle: PISC_TR_HANDLE read GetTRHandle;
687 >    function ParamByName(ParamName: String): ISQLParam;
688 >    property ArrayFieldCount: integer read FArrayFieldCount;
689 >    property DatabaseInfo: TIBDatabaseInfo read FDatabaseInfo;
690      property UpdateObject: TIBDataSetUpdateObject read FUpdateObject write SetUpdateObject;
691      property UpdatesPending: Boolean read FUpdatesPending;
692      property UpdateRecordTypes: TIBUpdateRecordTypes read FUpdateRecordTypes
# Line 590 | Line 695 | type
695                 read FDataSetCloseAction write FDataSetCloseAction;
696  
697    published
698 +    property AllowAutoActivateTransaction: Boolean read FAllowAutoActivateTransaction
699 +                 write FAllowAutoActivateTransaction;
700      property Database: TIBDatabase read GetDatabase write SetDatabase;
701      property Transaction: TIBTransaction read GetTransaction
702                                            write SetTransaction;
# Line 719 | Line 826 | type
826    protected
827      FField: TField;
828      FBlobStream: TIBBlobStream;
829 +    function  GetSize: Int64; override;
830    public
831      constructor Create(AField: TField; ABlobStream: TIBBlobStream;
832                         Mode: TBlobStreamMode);
# Line 729 | Line 837 | type
837      function Write(const Buffer; Count: Longint): Longint; override;
838    end;
839  
840 +  {Extended Field Def for character set info}
841 +
842 +  { TIBFieldDef }
843 +
844 +  TIBFieldDef = class(TFieldDef)
845 +  private
846 +    FArrayBounds: TArrayBounds;
847 +    FArrayDimensions: integer;
848 +    FCharacterSetName: RawByteString;
849 +    FCharacterSetSize: integer;
850 +    FCodePage: TSystemCodePage;
851 +    FIdentityColumn: boolean;
852 +    FRelationName: string;
853 +    FDataSize: integer;
854 +  published
855 +    property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
856 +    property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
857 +    property CodePage: TSystemCodePage read FCodePage write FCodePage;
858 +    property DataSize: integer read FDataSize write FDataSize;
859 +    property RelationName: string read FRelationName write FRelationName;
860 +    property ArrayDimensions: integer read FArrayDimensions write FArrayDimensions;
861 +    property ArrayBounds: TArrayBounds read FArrayBounds write FArrayBounds;
862 +    property IdentityColumn: boolean read FIdentityColumn write FIdentityColumn default false;
863 +  end;
864 +
865   const
866   DefaultFieldClasses: array[TFieldType] of TFieldClass = (
867      nil,                { ftUnknown }
868      TIBStringField,     { ftString }
869 <    TSmallintField,     { ftSmallint }
870 <    TIntegerField,      { ftInteger }
869 >    TIBSmallintField,   { ftSmallint }
870 >    TIBIntegerField,      { ftInteger }
871      TWordField,         { ftWord }
872      TBooleanField,      { ftBoolean }
873      TFloatField,        { ftFloat }
# Line 755 | Line 888 | DefaultFieldClasses: array[TFieldType] o
888      TBlobField,         { ftTypedBinary }
889      nil,                { ftCursor }
890      TStringField,       { ftFixedChar }
891 <    TIBWideStringField,    { ftWideString }
892 <    TLargeIntField,     { ftLargeInt }
891 >    nil,    { ftWideString }
892 >    TIBLargeIntField,     { ftLargeInt }
893      nil,          { ftADT }
894 <    nil,        { ftArray }
894 >    TIBArrayField,        { ftArray }
895      nil,    { ftReference }
896      nil,     { ftDataSet }
897      TBlobField,         { ftOraBlob }
# Line 770 | Line 903 | DefaultFieldClasses: array[TFieldType] o
903      TDateTimeField,    {ftTimestamp}
904      TIBBCDField,       {ftFMTBcd}
905      nil,  {ftFixedWideChar}
906 <    TIBWideMemoField);   {ftWideMemo}
906 >    nil);   {ftWideMemo}
907   (*
908      TADTField,          { ftADT }
909      TArrayField,        { ftArray }
# Line 787 | Line 920 | DefaultFieldClasses: array[TFieldType] o
920  
921   implementation
922  
923 < uses IBIntf, Variants, FmtBCD, LazUTF8;
923 > uses Variants, FmtBCD, LazUTF8, FBMessages, IBQuery;
924  
925   const FILE_BEGIN = 0;
926        FILE_CURRENT = 1;
# Line 800 | Line 933 | type
933      FieldName : String;
934      COMPUTED_BLR : Boolean;
935      DEFAULT_VALUE : boolean;
936 +    IDENTITY_COLUMN : boolean;
937      NextField : TFieldNode;
938    end;
939  
# Line 810 | Line 944 | type
944      NextRelation : TRelationNode;
945    end;
946  
813  {Extended Field Def for character set info}
814
815  { TIBFieldDef }
816
817  TIBFieldDef = class(TFieldDef)
818  private
819    FCharacterSetName: string;
820    FCharacterSetSize: integer;
821  published
822    property CharacterSetName: string read FCharacterSetName write FCharacterSetName;
823    property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
824  end;
825
947  
948    {  Copied from LCLProc in order to avoid LCL dependency
949  
# Line 865 | Line 986 | type
986      Result := str;
987    end;
988  
989 < { TIBWideMemoField }
989 > { TIBLargeIntField }
990  
991 < function TIBWideMemoField.GetTruncatedText: string;
991 > procedure TIBLargeIntField.Bind(Binding: Boolean);
992   begin
993 <  Result := GetAsString;
993 >  inherited Bind(Binding);
994 >  if Binding and (FieldDef <> nil) then
995 >     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
996 > end;
997  
998 <  if Result <> '' then
999 <    if DisplayWidth = 0 then
1000 <      Result := TextToSingleLine(Result)
1001 <    else
1002 <    if Length(Result) > DisplayWidth then {Show truncation with elipses}
1003 <      Result := TextToSingleLine(system.copy(Result,1,DisplayWidth-3)) + '...';
998 > { TIBIntegerField }
999 >
1000 > procedure TIBIntegerField.Bind(Binding: Boolean);
1001 > begin
1002 >  inherited Bind(Binding);
1003 >  if Binding and (FieldDef <> nil) then
1004 >     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
1005   end;
1006  
1007 < function TIBWideMemoField.GetDefaultWidth: Longint;
1007 > { TIBSmallintField }
1008 >
1009 > procedure TIBSmallintField.Bind(Binding: Boolean);
1010   begin
1011 <  Result := 128;
1011 >  inherited Bind(Binding);
1012 >  if Binding and (FieldDef <> nil) then
1013 >     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
1014   end;
1015  
1016 < procedure TIBWideMemoField.GetText(var AText: string; ADisplayText: Boolean);
1016 > { TIBArray }
1017 >
1018 > procedure TIBArray.EventHandler(Sender: IArray; Reason: TArrayEventReason);
1019   begin
1020 <  if ADisplayText then
1020 >  case Reason of
1021 >  arChanging:
1022 >    if FRecNo <> FField.Dataset.RecNo then
1023 >      IBError(ibxeNotCurrentArray,[nil]);
1024 >
1025 >  arChanged:
1026 >    FField.DataChanged;
1027 >  end;
1028 > end;
1029 >
1030 > constructor TIBArray.Create(aField: TIBArrayField; anArray: IArray);
1031 > begin
1032 >  inherited Create;
1033 >  FField := aField;
1034 >  FArray := anArray;
1035 >  FRecNo := FField.Dataset.RecNo;
1036 >  FArray.AddEventHandler(EventHandler);
1037 > end;
1038 >
1039 > destructor TIBArray.Destroy;
1040 > begin
1041 >  FArray.RemoveEventHandler(EventHandler);
1042 >  inherited Destroy;
1043 > end;
1044 >
1045 > { TIBArrayField }
1046 >
1047 > function TIBArrayField.GetArrayIntf: IArray;
1048 > begin
1049 >  Result := TIBCustomDataSet(DataSet).GetArray(self);
1050 > end;
1051 >
1052 > function TIBArrayField.GetArrayID: TISC_QUAD;
1053 > begin
1054 >  GetData(@Result);
1055 > end;
1056 >
1057 > procedure TIBArrayField.SetArrayIntf(AValue: IArray);
1058 > begin
1059 >  TIBCustomDataSet(DataSet).SetArrayIntf(AValue,self);
1060 >  DataChanged;
1061 > end;
1062 >
1063 > class procedure TIBArrayField.CheckTypeSize(AValue: Longint);
1064 > begin
1065 >  //Ignore
1066 > end;
1067 >
1068 > function TIBArrayField.GetAsString: string;
1069 > begin
1070 >  Result := '(Array)';
1071 > end;
1072 >
1073 > function TIBArrayField.GetDataSize: Integer;
1074 > begin
1075 >  Result := sizeof(TISC_QUAD);
1076 > end;
1077 >
1078 > procedure TIBArrayField.Bind(Binding: Boolean);
1079 > begin
1080 >  inherited Bind(Binding);
1081 >  if Binding then
1082    begin
1083 <    if not DisplayTextAsClassName then
1084 <      AText := GetTruncatedText
1085 <    else
1086 <      inherited GetText(AText, ADisplayText);
1087 <  end
1088 <  else
1089 <    AText := GetAsString;
1083 >    FCacheOffset := TIBCustomDataSet(DataSet).ArrayFieldCount;
1084 >    Inc(TIBCustomDataSet(DataSet).FArrayFieldCount);
1085 >    if FieldDef <> nil then
1086 >    begin
1087 >      FRelationName := TIBFieldDef(FieldDef).FRelationName;
1088 >      FArrayDimensions := TIBFieldDef(FieldDef).ArrayDimensions;
1089 >      FArrayBounds :=  TIBFieldDef(FieldDef).ArrayBounds;
1090 >    end;
1091 >  end;
1092   end;
1093  
1094 < constructor TIBWideMemoField.Create(AOwner: TComponent);
1094 > constructor TIBArrayField.Create(AOwner: TComponent);
1095   begin
1096    inherited Create(AOwner);
1097 <  BlobType := ftWideMemo;
1097 >  SetDataType(ftArray);
1098 > end;
1099 >
1100 > function TIBArrayField.CreateArray: IArray;
1101 > begin
1102 > with DataSet as TIBCustomDataSet do
1103 >  Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,FRelationName,FieldName);
1104   end;
1105  
1106   { TIBMemoField }
# Line 922 | Line 1122 | begin
1122         {2: case 2 ignored. This should be handled by TIBWideMemo}
1123  
1124         3, {Assume UNICODE_FSS is really UTF8}
1125 <       4: {Include GB18030 - assuming UTF8 routine work for this codeset}
1125 >       4: {Include GB18030 - assuming UTF8 routines work for this codeset}
1126           if DisplayWidth = 0 then
1127             Result := ValidUTF8String(TextToSingleLine(Result))
1128           else
# Line 932 | Line 1132 | begin
1132     end
1133   end;
1134  
1135 + procedure TIBMemoField.Bind(Binding: Boolean);
1136 + var IBFieldDef: TIBFieldDef;
1137 + begin
1138 +  inherited Bind(Binding);
1139 +  if Binding and (FieldDef <> nil) then
1140 +  begin
1141 +    IBFieldDef := FieldDef as TIBFieldDef;
1142 +    CharacterSetSize := IBFieldDef.CharacterSetSize;
1143 +    CharacterSetName := IBFieldDef.CharacterSetName;
1144 +    CodePage := IBFieldDef.CodePage;
1145 +  end;
1146 + end;
1147 +
1148 + function TIBMemoField.GetAsString: string;
1149 + var s: RawByteString;
1150 + begin
1151 +  s := inherited GetAsString;
1152 +  SetCodePage(s,CodePage,false);
1153 +  if (CodePage <> CP_NONE) and (CodePage <> CP_UTF8) then
1154 +    SetCodePage(s,CP_UTF8,true);  {LCL only accepts UTF8}
1155 +  Result := s;
1156 + end;
1157 +
1158   function TIBMemoField.GetDefaultWidth: Longint;
1159   begin
1160    if DisplayTextAsClassName then
# Line 944 | Line 1167 | procedure TIBMemoField.GetText(var AText
1167   begin
1168    if ADisplayText then
1169    begin
1170 <    if not DisplayTextAsClassName then
1170 >    if not DisplayTextAsClassName and (CharacterSetName <> '') then
1171        AText := GetTruncatedText
1172      else
1173        inherited GetText(AText, ADisplayText);
# Line 953 | Line 1176 | begin
1176      AText := GetAsString;
1177   end;
1178  
1179 + procedure TIBMemoField.SetAsString(const AValue: string);
1180 + var s: RawByteString;
1181 + begin
1182 +  s := AValue;
1183 +  if StringCodePage(s) <> CodePage then
1184 +    SetCodePage(s,CodePage,CodePage<>CP_NONE);
1185 +  inherited SetAsString(s);
1186 + end;
1187 +
1188   constructor TIBMemoField.Create(AOwner: TComponent);
1189   begin
1190    inherited Create(AOwner);
1191    BlobType := ftMemo;
1192 +  FCodePage := CP_NONE;
1193   end;
1194  
1195   { TIBControlLink }
# Line 990 | Line 1223 | end;
1223  
1224   { TIBStringField}
1225  
1226 < function TIBStringField.GetDefaultWidth: Longint;
1226 > procedure TIBStringField.Bind(Binding: Boolean);
1227 > var IBFieldDef: TIBFieldDef;
1228 > begin
1229 >  inherited Bind(Binding);
1230 >  if Binding and (FieldDef <> nil) then
1231 >  begin
1232 >    IBFieldDef := FieldDef as TIBFieldDef;
1233 >    CharacterSetSize := IBFieldDef.CharacterSetSize;
1234 >    CharacterSetName := IBFieldDef.CharacterSetName;
1235 >    FDataSize := IBFieldDef.DataSize + 1;
1236 >    if AutoFieldSize then
1237 >      Size := IBFieldDef.Size;
1238 >    CodePage := IBFieldDef.CodePage;
1239 >  end;
1240 > end;
1241 >
1242 > function TIBStringField.GetDataSize: Integer;
1243   begin
1244 <  Result := Size div CharacterSetSize;
1244 >  Result := FDataSize;
1245   end;
1246  
1247   constructor TIBStringField.Create(aOwner: TComponent);
1248   begin
1249    inherited Create(aOwner);
1250    FCharacterSetSize := 1;
1251 +  FCodePage := CP_NONE;
1252 +  FAutoFieldSize := true;
1253   end;
1254  
1255   class procedure TIBStringField.CheckTypeSize(Value: Integer);
# Line 1021 | Line 1272 | end;
1272   function TIBStringField.GetValue(var Value: string): Boolean;
1273   var
1274    Buffer: PChar;
1275 +  s: RawByteString;
1276   begin
1277    Buffer := nil;
1278 <  IBAlloc(Buffer, 0, Size + 1);
1278 >  IBAlloc(Buffer, 0, DataSize);
1279    try
1280      Result := GetData(Buffer);
1281      if Result then
1282      begin
1283 <      Value := string(Buffer);
1283 >      s := strpas(Buffer);
1284 >      SetCodePage(s,CodePage,false);
1285 >      if (CodePage <> CP_NONE) and (CodePage <> CP_UTF8) then
1286 >        SetCodePage(s,CP_UTF8,true);  {LCL only accepts UTF8}
1287 >      Value := s;
1288 > //      writeln(FieldName,': ', StringCodePage(Value),', ',Value);
1289        if Transliterate and (Value <> '') then
1290          DataSet.Translate(PChar(Value), PChar(Value), False);
1291      end
# Line 1040 | Line 1297 | end;
1297   procedure TIBStringField.SetAsString(const Value: string);
1298   var
1299    Buffer: PChar;
1300 +  s: RawByteString;
1301   begin
1302    Buffer := nil;
1303 <  IBAlloc(Buffer, 0, Size + 1);
1303 >  IBAlloc(Buffer, 0, DataSize);
1304    try
1305 <    StrLCopy(Buffer, PChar(Value), Size);
1305 >    s := Value;
1306 >    if StringCodePage(s) <> CodePage then
1307 >      SetCodePage(s,CodePage,CodePage<>CP_NONE);
1308 >    StrLCopy(Buffer, PChar(s), DataSize-1);
1309      if Transliterate then
1310        DataSet.Translate(Buffer, Buffer, True);
1311      SetData(Buffer);
# Line 1063 | Line 1324 | begin
1324    Size := 8;
1325   end;
1326  
1327 + procedure TIBBCDField.Bind(Binding: Boolean);
1328 + begin
1329 +  inherited Bind(Binding);
1330 +  if Binding and (FieldDef <> nil) then
1331 +     FIdentityColumn := (FieldDef as TIBFieldDef).IdentityColumn;
1332 + end;
1333 +
1334   class procedure TIBBCDField.CheckTypeSize(Value: Integer);
1335   begin
1336   { No need to check as the base type is currency, not BCD }
# Line 1147 | Line 1415 | end;
1415   constructor TIBCustomDataSet.Create(AOwner: TComponent);
1416   begin
1417    inherited Create(AOwner);
1150  FIBLoaded := False;
1151  CheckIBLoaded;
1152  FIBLoaded := True;
1418    FBase := TIBBase.Create(Self);
1419 +  FDatabaseInfo := TIBDatabaseInfo.Create(self);
1420    FIBLinks := TList.Create;
1421    FCurrentRecord := -1;
1422    FDeletedRecords := 0;
1423    FUniDirectional := False;
1424    FBufferChunks := BufferCacheSize;
1425    FBlobStreamList := TList.Create;
1426 +  FArrayList := TList.Create;
1427    FGeneratorField := TIBGenerator.Create(self);
1428    FDataLink := TIBDataLink.Create(Self);
1429    FQDelete := TIBSQL.Create(Self);
# Line 1200 | Line 1467 | end;
1467   destructor TIBCustomDataSet.Destroy;
1468   begin
1469    if Active then Active := false;
1470 <  if FIBLoaded then
1471 <  begin
1472 <    if assigned(FGeneratorField) then FGeneratorField.Free;
1473 <    FDataLink.Free;
1474 <    FBase.Free;
1475 <    ClearBlobCache;
1476 <    ClearIBLinks;
1477 <    FIBLinks.Free;
1478 <    FBlobStreamList.Free;
1479 <    FreeMem(FBufferCache);
1480 <    FBufferCache := nil;
1481 <    FreeMem(FOldBufferCache);
1482 <    FOldBufferCache := nil;
1483 <    FCacheSize := 0;
1484 <    FOldCacheSize := 0;
1218 <    FMappedFieldPosition := nil;
1219 <  end;
1470 >  if assigned(FGeneratorField) then FGeneratorField.Free;
1471 >  FDataLink.Free;
1472 >  FBase.Free;
1473 >  ClearBlobCache;
1474 >  ClearIBLinks;
1475 >  FIBLinks.Free;
1476 >  FBlobStreamList.Free;
1477 >  FArrayList.Free;
1478 >  FreeMem(FBufferCache);
1479 >  FBufferCache := nil;
1480 >  FreeMem(FOldBufferCache);
1481 >  FOldBufferCache := nil;
1482 >  FCacheSize := 0;
1483 >  FOldCacheSize := 0;
1484 >  FMappedFieldPosition := nil;
1485    if assigned(FBaseSQLSelect) then FBaseSQLSelect.Free;
1486    if assigned(FParser) then FParser.Free;
1487    inherited Destroy;
# Line 1241 | Line 1506 | begin
1506        Inc(FCurrentRecord);
1507        if (FCurrentRecord = FRecordCount) then
1508        begin
1509 <        if (not FQSelect.EOF) and (FQSelect.Next <> nil) then
1509 >        if (not FQSelect.EOF) and FQSelect.Next  then
1510          begin
1511            FetchCurrentRecordToBuffer(FQSelect, FCurrentRecord, Buffer);
1512            Inc(FRecordCount);
# Line 1260 | Line 1525 | end;
1525  
1526   procedure TIBCustomDataSet.ApplyUpdates;
1527   var
1263  {$IF FPC_FULLVERSION >= 20700 }
1528    CurBookmark: TBookmark;
1265  {$ELSE}
1266  CurBookmark: string;
1267  {$ENDIF}
1529    Buffer: PRecordData;
1530    CurUpdateTypes: TIBUpdateRecordTypes;
1531    UpdateAction: TIBUpdateAction;
# Line 1495 | Line 1756 | end;
1756   function TIBCustomDataSet.ActivateTransaction: Boolean;
1757   begin
1758    Result := False;
1759 <  if not Assigned(Transaction) then
1499 <    IBError(ibxeTransactionNotAssigned, [nil]);
1500 <  if not Transaction.Active then
1759 >  if AllowAutoActivateTransaction or (csDesigning in ComponentState) then
1760    begin
1761 <    Result := True;
1762 <    Transaction.StartTransaction;
1763 <    FDidActivate := True;
1761 >    if not Assigned(Transaction) then
1762 >      IBError(ibxeTransactionNotAssigned, [nil]);
1763 >    if not Transaction.Active then
1764 >    begin
1765 >      Result := True;
1766 >      Transaction.StartTransaction;
1767 >      FDidActivate := True;
1768 >    end;
1769    end;
1770   end;
1771  
# Line 1626 | Line 1890 | begin
1890    FBlobStreamList.Pack;
1891   end;
1892  
1893 + procedure TIBCustomDataSet.ClearArrayCache;
1894 + var
1895 +  i: Integer;
1896 + begin
1897 +  for i := 0 to FArrayList.Count - 1 do
1898 +  begin
1899 +    TIBArray(FArrayList[i]).Free;
1900 +    FArrayList[i] := nil;
1901 +  end;
1902 +  FArrayList.Pack;
1903 + end;
1904 +
1905   procedure TIBCustomDataSet.CopyRecordBuffer(Source, Dest: Pointer);
1906   begin
1907    Move(Source^, Dest^, FRecordBufferSize);
# Line 1635 | Line 1911 | procedure TIBCustomDataSet.DoBeforeDatab
1911   begin
1912    if Active then
1913      Active := False;
1914 <  FInternalPrepared := False;
1914 >  InternalUnPrepare;
1915    if Assigned(FBeforeDatabaseDisconnect) then
1916      FBeforeDatabaseDisconnect(Sender);
1917   end;
# Line 1673 | Line 1949 | begin
1949      FQModify.FreeHandle;
1950    if FQRefresh <> nil then
1951      FQRefresh.FreeHandle;
1952 +  InternalUnPrepare;
1953    if Assigned(FBeforeTransactionEnd) then
1954      FBeforeTransactionEnd(Sender);
1955   end;
# Line 1689 | Line 1966 | begin
1966      FTransactionFree(Sender);
1967   end;
1968  
1969 < { Read the record from FQSelect.Current into the record buffer
1970 <  Then write the buffer to in memory cache }
1971 < procedure TIBCustomDataSet.FetchCurrentRecordToBuffer(Qry: TIBSQL;
1972 <  RecordNumber: Integer; Buffer: PChar);
1973 < var
1697 <  p: PRecordData;
1698 <  pbd: PBlobDataArray;
1699 <  i, j: Integer;
1700 <  LocalData: Pointer;
1701 <  LocalDate, LocalDouble: Double;
1702 <  LocalInt: Integer;
1703 <  LocalBool: wordBool;
1704 <  LocalInt64: Int64;
1705 <  LocalCurrency: Currency;
1706 <  FieldsLoaded: Integer;
1707 <  temp: TIBXSQLVAR;
1969 > procedure TIBCustomDataSet.InitModelBuffer(Qry: TIBSQL; Buffer: PChar);
1970 > var i, j: Integer;
1971 >    FieldsLoaded: integer;
1972 >    p: PRecordData;
1973 >    colMetadata: IColumnMetaData;
1974   begin
1975    p := PRecordData(Buffer);
1710  { Make sure blob cache is empty }
1711  pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
1712  if RecordNumber > -1 then
1713    for i := 0 to BlobFieldCount - 1 do
1714      pbd^[i] := nil;
1976    { Get record information }
1977    p^.rdBookmarkFlag := bfCurrent;
1978 <  p^.rdFieldCount := Qry.Current.Count;
1979 <  p^.rdRecordNumber := RecordNumber;
1978 >  p^.rdFieldCount := Qry.FieldCount;
1979 >  p^.rdRecordNumber := -1;
1980    p^.rdUpdateStatus := usUnmodified;
1981    p^.rdCachedUpdateStatus := cusUnmodified;
1982    p^.rdSavedOffset := $FFFFFFFF;
1983  
1984    { Load up the fields }
1985 <  FieldsLoaded := FQSelect.Current.Count;
1985 >  FieldsLoaded := FQSelect.MetaData.Count;
1986    j := 1;
1987 <  for i := 0 to Qry.Current.Count - 1 do
1987 >  for i := 0 to Qry.MetaData.Count - 1 do
1988    begin
1989      if (Qry = FQSelect) then
1990        j := i + 1
1991 <    else begin
1991 >    else
1992 >    begin
1993        if FieldsLoaded = 0 then
1994          break;
1995 <      j := FQSelect.FieldIndex[Qry.Current[i].Name] + 1;
1995 >      j := FQSelect.FieldIndex[Qry[i].Name] + 1;
1996        if j < 1 then
1997          continue
1998        else
1999          Dec(FieldsLoaded);
2000      end;
2001 <    with FQSelect.Current[j - 1].Data^ do
1740 <      if aliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
1741 <      begin
1742 <        if sqllen <= 8 then
1743 <          p^.rdDBKey := PIBDBKEY(Qry.Current[i].AsPointer)^;
1744 <        continue;
1745 <      end;
1746 <    if j > 0 then with p^ do
2001 >    if j > 0 then
2002      begin
2003 <      rdFields[j].fdDataType :=
2004 <        Qry.Current[i].Data^.sqltype and (not 1);
2005 <      rdFields[j].fdDataScale :=
2006 <        Qry.Current[i].Data^.sqlscale;
2007 <      rdFields[j].fdNullable :=
2008 <        (Qry.Current[i].Data^.sqltype and 1 = 1);
2009 <      rdFields[j].fdIsNull :=
2010 <        (rdFields[j].fdNullable and (Qry.Current[i].Data^.sqlind^ = -1));
2011 <      LocalData := Qry.Current[i].Data^.sqldata;
2012 <      case rdFields[j].fdDataType of
2013 <        SQL_TIMESTAMP:
2003 >      colMetadata := Qry.MetaData[i];
2004 >      with p^.rdFields[j], FFieldColumns^[j] do
2005 >      begin
2006 >        fdDataType := colMetadata.GetSQLType;
2007 >        if fdDataType = SQL_BLOB then
2008 >          fdDataScale := 0
2009 >        else
2010 >          fdDataScale := colMetadata.getScale;
2011 >        fdNullable := colMetadata.getIsNullable;
2012 >        fdIsNull := true;
2013 >        fdDataSize := colMetadata.GetSize;
2014 >        fdDataLength := 0;
2015 >        fdCodePage := CP_NONE;
2016 >
2017 >        case fdDataType of
2018 >        SQL_TIMESTAMP,
2019 >        SQL_TYPE_DATE,
2020 >        SQL_TYPE_TIME:
2021 >          fdDataSize := SizeOf(TDateTime);
2022 >        SQL_SHORT, SQL_LONG:
2023          begin
2024 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2025 <          if RecordNumber >= 0 then
2026 <            LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(Qry.Current[i].AsDateTime));
2027 <          LocalData := PChar(@LocalDate);
2024 >          if (fdDataScale = 0) then
2025 >            fdDataSize := SizeOf(Integer)
2026 >          else
2027 >          if (fdDataScale >= (-4)) then
2028 >            fdDataSize := SizeOf(Currency)
2029 >          else
2030 >            fdDataSize := SizeOf(Double);
2031          end;
2032 <        SQL_TYPE_DATE:
2032 >        SQL_INT64:
2033          begin
2034 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2035 <          if RecordNumber >= 0 then
2036 <            LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Date;
2037 <          LocalData := PChar(@LocalInt);
2034 >          if (fdDataScale = 0) then
2035 >            fdDataSize := SizeOf(Int64)
2036 >          else
2037 >          if (fdDataScale >= (-4)) then
2038 >            fdDataSize := SizeOf(Currency)
2039 >          else
2040 >            fdDataSize := SizeOf(Double);
2041          end;
2042 <        SQL_TYPE_TIME:
2042 >        SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2043 >          fdDataSize := SizeOf(Double);
2044 >        SQL_BOOLEAN:
2045 >          fdDataSize := SizeOf(wordBool);
2046 >        SQL_VARYING,
2047 >        SQL_TEXT,
2048 >        SQL_BLOB:
2049 >          fdCodePage := Qry.Metadata[i].getCodePage;
2050 >        end;
2051 >        fdDataOfs := FRecordSize;
2052 >        Inc(FRecordSize, fdDataSize);
2053 >      end;
2054 >    end;
2055 >  end;
2056 > end;
2057 >
2058 > {Update Buffer Fields from Query Results}
2059 >
2060 > procedure TIBCustomDataSet.UpdateRecordFromQuery(QryResults: IResults;
2061 >  Buffer: PChar);
2062 > var i, j: integer;
2063 > begin
2064 >  for i := 0 to QryResults.Count - 1 do
2065 >  begin
2066 >    j := GetFieldPosition(QryResults[i].GetAliasName);
2067 >    if j > 0 then
2068 >    begin
2069 >      ColumnDataToBuffer(QryResults,i,j,Buffer);
2070 >      FBufferUpdatedOnQryReturn := true;
2071 >    end;
2072 >  end;
2073 > end;
2074 >
2075 >
2076 > {Move column data returned from query to row buffer}
2077 >
2078 > procedure TIBCustomDataSet.ColumnDataToBuffer(QryResults: IResults;
2079 >               ColumnIndex, FieldIndex: integer; Buffer: PChar);
2080 > var
2081 >  LocalData: PByte;
2082 >  LocalDate: TDateTime;
2083 >  LocalDouble: Double;
2084 >  LocalInt: Integer;
2085 >  LocalBool: wordBool;
2086 >  LocalInt64: Int64;
2087 >  LocalCurrency: Currency;
2088 >  ColData: ISQLData;
2089 > begin
2090 >  LocalData := nil;
2091 >  with PRecordData(Buffer)^.rdFields[FieldIndex], FFieldColumns^[FieldIndex] do
2092 >  begin
2093 >    QryResults.GetData(ColumnIndex,fdIsNull,fdDataLength,LocalData);
2094 >    if not fdIsNull then
2095 >    begin
2096 >      ColData := QryResults[ColumnIndex];
2097 >      case fdDataType of  {Get Formatted data for column types that need formatting}
2098 >        SQL_TYPE_DATE,
2099 >        SQL_TYPE_TIME,
2100 >        SQL_TIMESTAMP:
2101          begin
2102 <          rdFields[j].fdDataSize := SizeOf(TDateTime);
2103 <          if RecordNumber >= 0 then
2104 <            LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Time;
1777 <          LocalData := PChar(@LocalInt);
2102 >          {This is an IBX native format and not the TDataset approach. See also GetFieldData}
2103 >          LocalDate := ColData.AsDateTime;
2104 >          LocalData := PByte(@LocalDate);
2105          end;
2106          SQL_SHORT, SQL_LONG:
2107          begin
2108 <          if (rdFields[j].fdDataScale = 0) then
2108 >          if (fdDataScale = 0) then
2109            begin
2110 <            rdFields[j].fdDataSize := SizeOf(Integer);
2111 <            if RecordNumber >= 0 then
1785 <              LocalInt := Qry.Current[i].AsLong;
1786 <            LocalData := PChar(@LocalInt);
2110 >            LocalInt := ColData.AsLong;
2111 >            LocalData := PByte(@LocalInt);
2112            end
2113 <          else if (rdFields[j].fdDataScale >= (-4)) then
2114 <               begin
2115 <                 rdFields[j].fdDataSize := SizeOf(Currency);
2116 <                 if RecordNumber >= 0 then
2117 <                   LocalCurrency := Qry.Current[i].AsCurrency;
2118 <                 LocalData := PChar(@LocalCurrency);
2119 <               end
2120 <               else begin
2121 <                 rdFields[j].fdDataSize := SizeOf(Double);
2122 <                 if RecordNumber >= 0 then
2123 <                   LocalDouble := Qry.Current[i].AsDouble;
1799 <                LocalData := PChar(@LocalDouble);
1800 <              end;
2113 >          else
2114 >          if (fdDataScale >= (-4)) then
2115 >          begin
2116 >            LocalCurrency := ColData.AsCurrency;
2117 >            LocalData := PByte(@LocalCurrency);
2118 >          end
2119 >          else
2120 >          begin
2121 >           LocalDouble := ColData.AsDouble;
2122 >           LocalData := PByte(@LocalDouble);
2123 >          end;
2124          end;
2125          SQL_INT64:
2126          begin
2127 <          if (rdFields[j].fdDataScale = 0) then
2127 >          if (fdDataScale = 0) then
2128            begin
2129 <            rdFields[j].fdDataSize := SizeOf(Int64);
2130 <            if RecordNumber >= 0 then
1808 <              LocalInt64 := Qry.Current[i].AsInt64;
1809 <            LocalData := PChar(@LocalInt64);
2129 >            LocalInt64 := ColData.AsInt64;
2130 >            LocalData := PByte(@LocalInt64);
2131            end
2132 <          else if (rdFields[j].fdDataScale >= (-4)) then
2133 <               begin
1813 <                 rdFields[j].fdDataSize := SizeOf(Currency);
1814 <                 if RecordNumber >= 0 then
1815 <                   LocalCurrency := Qry.Current[i].AsCurrency;
1816 <                   LocalData := PChar(@LocalCurrency);
1817 <               end
1818 <               else begin
1819 <                  rdFields[j].fdDataSize := SizeOf(Double);
1820 <                  if RecordNumber >= 0 then
1821 <                    LocalDouble := Qry.Current[i].AsDouble;
1822 <                  LocalData := PChar(@LocalDouble);
1823 <               end
1824 <        end;
1825 <        SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
1826 <        begin
1827 <          rdFields[j].fdDataSize := SizeOf(Double);
1828 <          if RecordNumber >= 0 then
1829 <            LocalDouble := Qry.Current[i].AsDouble;
1830 <          LocalData := PChar(@LocalDouble);
1831 <        end;
1832 <        SQL_VARYING:
1833 <        begin
1834 <          rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
1835 <          rdFields[j].fdDataLength := isc_vax_integer(Qry.Current[i].Data^.sqldata, 2);
1836 <          if RecordNumber >= 0 then
2132 >          else
2133 >          if (fdDataScale >= (-4)) then
2134            begin
2135 <            if (rdFields[j].fdDataLength = 0) then
2136 <              LocalData := nil
2135 >            LocalCurrency := ColData.AsCurrency;
2136 >            LocalData := PByte(@LocalCurrency);
2137 >            end
2138              else
2139              begin
2140 <              temp :=  Qry.Current[i];
2141 <              LocalData := @temp.Data^.sqldata[2];
2142 < (*              LocalData := @Qry.Current[i].Data^.sqldata[2];*)
1845 <            end;
1846 <          end;
2140 >              LocalDouble := ColData.AsDouble;
2141 >              LocalData := PByte(@LocalDouble);
2142 >            end
2143          end;
2144 <        SQL_BOOLEAN:
2144 >        SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2145          begin
2146 <          LocalBool:= false;
2147 <          rdFields[j].fdDataSize := SizeOf(wordBool);
1852 <          if RecordNumber >= 0 then
1853 <            LocalBool := Qry.Current[i].AsBoolean;
1854 <          LocalData := PChar(@LocalBool);
2146 >          LocalDouble := ColData.AsDouble;
2147 >          LocalData := PByte(@LocalDouble);
2148          end;
2149 <        else { SQL_TEXT, SQL_BLOB, SQL_ARRAY, SQL_QUAD }
2149 >        SQL_BOOLEAN:
2150          begin
2151 <          rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
2152 <          if (rdFields[j].fdDataType = SQL_TEXT) then
1860 <            rdFields[j].fdDataLength := rdFields[j].fdDataSize;
2151 >          LocalBool := ColData.AsBoolean;
2152 >          LocalData := PByte(@LocalBool);
2153          end;
2154        end;
2155 <      if RecordNumber < 0 then
2155 >
2156 >      if fdDataType = SQL_VARYING then
2157 >        Move(LocalData^, Buffer[fdDataOfs], fdDataLength)
2158 >      else
2159 >        Move(LocalData^, Buffer[fdDataOfs], fdDataSize)
2160 >    end
2161 >    else {Null column}
2162 >    if fdDataType = SQL_VARYING then
2163 >      FillChar(Buffer[fdDataOfs],fdDataLength,0)
2164 >    else
2165 >      FillChar(Buffer[fdDataOfs],fdDataSize,0);
2166 >  end;
2167 > end;
2168 >
2169 > { Read the record from FQSelect.Current into the record buffer
2170 >  Then write the buffer to in memory cache }
2171 > procedure TIBCustomDataSet.FetchCurrentRecordToBuffer(Qry: TIBSQL;
2172 >  RecordNumber: Integer; Buffer: PChar);
2173 > var
2174 >  pbd: PBlobDataArray;
2175 >  pda: PArrayDataArray;
2176 >  i, j: Integer;
2177 >  FieldsLoaded: Integer;
2178 >  p: PRecordData;
2179 > begin
2180 >  if RecordNumber = -1 then
2181 >  begin
2182 >    InitModelBuffer(Qry,Buffer);
2183 >    Exit;
2184 >  end;
2185 >  p := PRecordData(Buffer);
2186 >  { Make sure blob cache is empty }
2187 >  pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
2188 >  pda := PArrayDataArray(Buffer + FArrayCacheOffset);
2189 >  for i := 0 to BlobFieldCount - 1 do
2190 >    pbd^[i] := nil;
2191 >  for i := 0 to ArrayFieldCount - 1 do
2192 >    pda^[i] := nil;
2193 >
2194 >  { Get record information }
2195 >  p^.rdBookmarkFlag := bfCurrent;
2196 >  p^.rdFieldCount := Qry.FieldCount;
2197 >  p^.rdRecordNumber := RecordNumber;
2198 >  p^.rdUpdateStatus := usUnmodified;
2199 >  p^.rdCachedUpdateStatus := cusUnmodified;
2200 >  p^.rdSavedOffset := $FFFFFFFF;
2201 >
2202 >  { Load up the fields }
2203 >  FieldsLoaded := FQSelect.MetaData.Count;
2204 >  j := 1;
2205 >  for i := 0 to Qry.FieldCount - 1 do
2206 >  begin
2207 >    if (Qry = FQSelect) then
2208 >      j := i + 1
2209 >    else
2210 >    begin
2211 >      if FieldsLoaded = 0 then
2212 >        break;
2213 >      j := FQSelect.FieldIndex[Qry[i].Name] + 1;
2214 >      if j < 1 then
2215 >        continue
2216 >      else
2217 >        Dec(FieldsLoaded);
2218 >    end;
2219 >    with FQSelect.MetaData[j - 1] do
2220 >      if GetAliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
2221        begin
2222 <        rdFields[j].fdIsNull := True;
2223 <        rdFields[j].fdDataOfs := FRecordSize;
2224 <        Inc(FRecordSize, rdFields[j].fdDataSize);
1868 <      end
1869 <      else begin
1870 <        if rdFields[j].fdDataType = SQL_VARYING then
1871 <        begin
1872 <          if LocalData <> nil then
1873 <            Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataLength)
1874 <        end
1875 <        else
1876 <          Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataSize)
2222 >        if (GetSize <= 8) then
2223 >          p^.rdDBKey := PIBDBKEY(Qry[i].AsPointer)^;
2224 >        continue;
2225        end;
2226 <    end;
2226 >    if j > 0 then
2227 >      ColumnDataToBuffer(Qry.Current,i,j,Buffer);
2228    end;
2229 <  WriteRecordCache(RecordNumber, PChar(p));
2229 >  WriteRecordCache(RecordNumber, Buffer);
2230   end;
2231  
2232   function TIBCustomDataSet.GetActiveBuf: PChar;
# Line 1922 | Line 2271 | begin
2271    result := FBase.Database;
2272   end;
2273  
1925 function TIBCustomDataSet.GetDBHandle: PISC_DB_HANDLE;
1926 begin
1927  result := FBase.DBHandle;
1928 end;
1929
2274   function TIBCustomDataSet.GetDeleteSQL: TStrings;
2275   begin
2276    result := FQDelete.SQL;
# Line 1937 | Line 2281 | begin
2281    result := FQInsert.SQL;
2282   end;
2283  
2284 < function TIBCustomDataSet.GetSQLParams: TIBXSQLDA;
2284 > function TIBCustomDataSet.GetSQLParams: ISQLParams;
2285   begin
2286    if not FInternalPrepared then
2287      InternalPrepare;
# Line 1954 | Line 2298 | begin
2298    result := FQSelect.SQL;
2299   end;
2300  
2301 < function TIBCustomDataSet.GetStatementType: TIBSQLTypes;
2301 > function TIBCustomDataSet.GetStatementType: TIBSQLStatementTypes;
2302   begin
2303 <  result := FQSelect.SQLType;
2303 >  result := FQSelect.SQLStatementType;
2304   end;
2305  
2306   function TIBCustomDataSet.GetModifySQL: TStrings;
# Line 1969 | Line 2313 | begin
2313    result := FBase.Transaction;
2314   end;
2315  
1972 function TIBCustomDataSet.GetTRHandle: PISC_TR_HANDLE;
1973 begin
1974  result := FBase.TRHandle;
1975 end;
1976
2316   procedure TIBCustomDataSet.InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer);
2317   begin
2318    if (Assigned(FUpdateObject) and (FUpdateObject.GetSQL(ukDelete).Text <> '')) then
2319      FUpdateObject.Apply(ukDelete,Buff)
2320    else
2321    begin
2322 <    SetInternalSQLParams(FQDelete, Buff);
2322 >    SetInternalSQLParams(FQDelete.Params, Buff);
2323      FQDelete.ExecQuery;
2324    end;
2325    with PRecordData(Buff)^ do
# Line 1995 | Line 2334 | function TIBCustomDataSet.InternalLocate
2334    const KeyValues: Variant; Options: TLocateOptions): Boolean;
2335   var
2336    keyFieldList: TList;
1998  {$IF FPC_FULLVERSION >= 20700 }
2337    CurBookmark: TBookmark;
2000  {$ELSE}
2001  CurBookmark: string;
2002  {$ENDIF}
2338    fieldValue: Variant;
2339    lookupValues: array of variant;
2340    i, fieldCount: Integer;
# Line 2081 | Line 2416 | end;
2416  
2417   procedure TIBCustomDataSet.InternalPostRecord(Qry: TIBSQL; Buff: Pointer);
2418   var
2419 <  i, j, k: Integer;
2419 >  i, j, k, arr: Integer;
2420    pbd: PBlobDataArray;
2421 +  pda: PArrayDataArray;
2422   begin
2423    pbd := PBlobDataArray(PChar(Buff) + FBlobCacheOffset);
2424 <  j := 0;
2424 >  pda := PArrayDataArray(PChar(Buff) + FArrayCacheOffset);
2425 >  j := 0; arr := 0;
2426    for i := 0 to FieldCount - 1 do
2427      if Fields[i].IsBlob then
2428      begin
# Line 2094 | Line 2431 | begin
2431        begin
2432          pbd^[j].Finalize;
2433          PISC_QUAD(
2434 <          PChar(Buff) + PRecordData(Buff)^.rdFields[k].fdDataOfs)^ :=
2434 >          PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=
2435            pbd^[j].BlobID;
2436          PRecordData(Buff)^.rdFields[k].fdIsNull := pbd^[j].Size = 0;
2437 +      end
2438 +      else
2439 +      begin
2440 +        PRecordData(Buff)^.rdFields[k].fdIsNull := true;
2441 +        with PISC_QUAD(PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ do
2442 +        begin
2443 +          gds_quad_high := 0;
2444 +          gds_quad_low := 0;
2445 +        end;
2446        end;
2447        Inc(j);
2448 +    end
2449 +    else
2450 +    if Fields[i] is TIBArrayField then
2451 +    begin
2452 +      if pda^[arr] <> nil then
2453 +      begin
2454 +        k := FMappedFieldPosition[Fields[i].FieldNo -1];
2455 +        PISC_QUAD(
2456 +          PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=  pda^[arr].ArrayIntf.GetArrayID;
2457 +        PRecordData(Buff)^.rdFields[k].fdIsNull := pda^[arr].ArrayIntf.IsEmpty;
2458 +      end;
2459 +      Inc(arr);
2460      end;
2461 +  FBufferUpdatedOnQryReturn := false;
2462    if Assigned(FUpdateObject) then
2463    begin
2464      if (Qry = FQDelete) then
# Line 2110 | 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 +    if Qry.FieldCount > 0 then {Has RETURNING Clause}
2475 +      UpdateRecordFromQuery(Qry.Current,Buff);
2476    end;
2477    PRecordData(Buff)^.rdUpdateStatus := usUnmodified;
2478    PRecordData(Buff)^.rdCachedUpdateStatus := cusUnmodified;
2479    SetModified(False);
2480    WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Buff);
2481 <  if (FForcedRefresh or FNeedsRefresh) and CanRefresh then
2481 >  if (FForcedRefresh or (FNeedsRefresh and not FBufferUpdatedOnQryReturn)) and CanRefresh then
2482      InternalRefreshRow;
2483   end;
2484  
# Line 2144 | 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
2151 <             (Qry.Next <> nil) then
2511 >          if (Qry.SQLStatementType = SQLExecProcedure) or Qry.Next then
2512            begin
2513              ofs := PRecordData(Buff)^.rdSavedOffset;
2514              FetchCurrentRecordToBuffer(Qry,
# Line 2241 | Line 2601 | begin
2601   end;
2602  
2603   procedure TIBCustomDataSet.InternalPrepare;
2244 var
2245  DidActivate: Boolean;
2604   begin
2605    if FInternalPrepared then
2606      Exit;
2249  DidActivate := False;
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
# Line 2288 | Line 2645 | begin
2645      end else
2646        IBError(ibxeEmptyQuery, [nil]);
2647    finally
2291    if DidActivate then
2292      DeactivateTransaction;
2648      FBase.RestoreCursor;
2649    end;
2650   end;
# Line 2319 | 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 2358 | Line 2714 | end;
2714  
2715   procedure TIBCustomDataSet.SetDatabase(Value: TIBDatabase);
2716   begin
2717 <  if (FBase.Database <> Value) then
2717 >  if (csLoading in ComponentState) or (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 2388 | 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 2402 | 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 2424 | 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)^
2451 <              else if rdFields[j].fdDataScale >= (-4) then
2452 <                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)^;
2832 <            SQL_TYPE_DATE:
2833 <            begin
2469 <              ts.Date := PInt(data)^;
2470 <              ts.Time := 0;
2471 <              Qry.Params[i].AsDate :=
2472 <                TimeStampToDateTime(ts);
2473 <            end;
2474 <            SQL_TYPE_TIME:
2475 <            begin
2476 <              ts.Date := 0;
2477 <              ts.Time := PInt(data)^;
2478 <              Qry.Params[i].AsTime :=
2479 <                TimeStampToDateTime(ts);
2480 <            end;
2831 >              Param.AsQuad := PISC_QUAD(data)^;
2832 >            SQL_TYPE_DATE,
2833 >            SQL_TYPE_TIME,
2834              SQL_TIMESTAMP:
2835 <              Qry.Params[i].AsDateTime :=
2836 <                       TimeStampToDateTime(MSecsToTimeStamp(trunc(PDouble(data)^)));
2835 >            {This is an IBX native format and not the TDataset approach. See also SetFieldData}
2836 >              Param.AsDateTime := PDateTime(data)^;
2837              SQL_BOOLEAN:
2838 <              Qry.Params[i].AsBoolean := PWordBool(data)^;
2838 >              Param.AsBoolean := PWordBool(data)^;
2839            end;
2840          end;
2841        end;
# Line 2531 | Line 2884 | begin
2884      FQRefresh.Transaction := Value;
2885      FQSelect.Transaction := Value;
2886      FQModify.Transaction := Value;
2887 +    FGeneratorField.Transaction := Value;
2888    end;
2889   end;
2890  
# Line 2638 | Line 2992 | begin
2992    Result := Assigned( FQSelect ) and FQSelect.EOF;
2993   end;
2994  
2995 < function TIBCustomDataSet.ParamByName(ParamName: String): TIBXSQLVAR;
2995 > function TIBCustomDataSet.ParamByName(ParamName: String): ISQLParam;
2996   begin
2997    ActivateConnection;
2998    ActivateTransaction;
# Line 2775 | Line 3129 | var
3129    Buff: PChar;
3130    bTr, bDB: Boolean;
3131   begin
3132 +  if (Field = nil) or (Field.DataSet <> self) then
3133 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3134    Buff := GetActiveBuf;
3135    if Buff = nil then
3136    begin
3137      fs := TIBBlobStream.Create;
3138      fs.Mode := bmReadWrite;
3139 +    fs.Database := Database;
3140 +    fs.Transaction := Transaction;
3141 +    fs.SetField(Field);
3142      FBlobStreamList.Add(Pointer(fs));
3143      result := TIBDSBlobStream.Create(Field, fs, Mode);
3144      exit;
# Line 2794 | Line 3153 | begin
3153      fs.Mode := bmReadWrite;
3154      fs.Database := Database;
3155      fs.Transaction := Transaction;
3156 +    fs.SetField(Field);
3157      fs.BlobID :=
3158 <      PISC_QUAD(@Buff[PRecordData(Buff)^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3158 >      PISC_QUAD(@Buff[FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3159      if (CachedUpdates) then
3160      begin
3161        bTr := not Transaction.InTransaction;
# Line 2816 | Line 3176 | begin
3176    result := TIBDSBlobStream.Create(Field, fs, Mode);
3177   end;
3178  
3179 + function TIBCustomDataSet.GetArray(Field: TIBArrayField): IArray;
3180 + var Buff: PChar;
3181 +    pda: PArrayDataArray;
3182 +    bTr, bDB: Boolean;
3183 + begin
3184 +  if (Field = nil) or (Field.DataSet <> self) then
3185 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3186 +  Buff := GetActiveBuf;
3187 +  if Buff = nil then
3188 +    Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3189 +                              Field.FRelationName,Field.FieldName)
3190 +  else
3191 +  begin
3192 +    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3193 +    if pda^[Field.FCacheOffset] = nil then
3194 +    begin
3195 +      AdjustRecordOnInsert(Buff);
3196 +      if Field.IsNull then
3197 +        Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3198 +                                Field.FRelationName,Field.FieldName)
3199 +      else
3200 +        Result := Database.Attachment.OpenArray(Transaction.TransactionIntf,
3201 +                            Field.FRelationName,Field.FieldName,Field.ArrayID);
3202 +      pda^[Field.FCacheOffset] := TIBArray.Create(Field,Result);
3203 +      FArrayList.Add(pda^[Field.FCacheOffset]);
3204 +      if (CachedUpdates) then
3205 +      begin
3206 +        bTr := not Transaction.InTransaction;
3207 +        bDB := not Database.Connected;
3208 +        if bDB then
3209 +          Database.Open;
3210 +        if bTr then
3211 +          Transaction.StartTransaction;
3212 +         pda^[Field.FCacheOffset].ArrayIntf.PreLoad;
3213 +        if bTr then
3214 +          Transaction.Commit;
3215 +        if bDB then
3216 +          Database.Close;
3217 +      end;
3218 +      WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3219 +    end
3220 +    else
3221 +      Result := pda^[Field.FCacheOffset].ArrayIntf;
3222 +  end;
3223 + end;
3224 +
3225 + procedure TIBCustomDataSet.SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
3226 + var Buff: PChar;
3227 +    pda: PArrayDataArray;
3228 + begin
3229 +  if (Field = nil) or (Field.DataSet <> self) then
3230 +    IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3231 +  Buff := GetActiveBuf;
3232 +  if Buff <> nil then
3233 +  begin
3234 +    AdjustRecordOnInsert(Buff);
3235 +    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3236 +    pda^[Field.FCacheOffset].FArray := AnArray;
3237 +    WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3238 +  end;
3239 + end;
3240 +
3241   function TIBCustomDataSet.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer;
3242   const
3243    CMPLess = -1;
# Line 2896 | Line 3318 | end;
3318   procedure TIBCustomDataSet.DoBeforeClose;
3319   begin
3320    inherited DoBeforeClose;
3321 +  if FInTransactionEnd and (FCloseAction = TARollback) then
3322 +     Exit;
3323    if State in [dsInsert,dsEdit] then
3324    begin
2901    if FInTransactionEnd and (FCloseAction = TARollback) then
2902       Exit;
2903
3325      if DataSetCloseAction = dcSaveChanges then
3326        Post;
3327        {Note this can fail with an exception e.g. due to
3328         database validation error. In which case the dataset remains open }
3329    end;
3330 +  if FCachedUpdates and FUpdatesPending and (DataSetCloseAction = dcSaveChanges) then
3331 +    ApplyUpdates;
3332   end;
3333  
3334   procedure TIBCustomDataSet.DoBeforeOpen;
# Line 2937 | Line 3360 | end;
3360  
3361   procedure TIBCustomDataSet.FetchAll;
3362   var
2940  {$IF FPC_FULLVERSION >= 20700 }
3363    CurBookmark: TBookmark;
2942  {$ELSE}
2943  CurBookmark: string;
2944  {$ENDIF}
3364   begin
3365    FBase.SetCursor;
3366   try
# Line 3052 | Line 3471 | begin
3471      if result and (Buffer <> nil) then
3472        Move(Buff[1], Buffer^, Field.DataSize);
3473    end
3474 <  else if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3474 >  else
3475 >  if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3476       (FMappedFieldPosition[Field.FieldNo - 1] <= CurrentRecord^.rdFieldCount) then
3477 +  with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]],
3478 +                         FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]] do
3479    begin
3480 <    result := not CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull;
3480 >    result := not fdIsNull;
3481      if result and (Buffer <> nil) then
3060      with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]] do
3482        begin
3483 <        Data := Buff + CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs;
3483 >        Data := Buff + fdDataOfs;
3484          if (fdDataType = SQL_VARYING) or (fdDataType = SQL_TEXT) then
3485          begin
3486            if fdDataLength < Field.DataSize then
# Line 3130 | Line 3551 | begin
3551          if FCurrentRecord < FRecordCount then
3552            ReadRecordCache(FCurrentRecord, Buffer, False)
3553          else begin
3554 <          while (not FQSelect.EOF) and
3134 <                (FQSelect.Next <> nil) and
3554 >          while (not FQSelect.EOF) and FQSelect.Next  and
3555                  (FCurrentRecord >= FRecordCount) do begin
3556              FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
3557              Inc(FRecordCount);
# Line 3242 | Line 3662 | procedure TIBCustomDataSet.InternalCance
3662   var
3663    Buff: PChar;
3664    CurRec: Integer;
3665 +  pda: PArrayDataArray;
3666 +  i: integer;
3667   begin
3668    inherited InternalCancel;
3669    Buff := GetActiveBuf;
3670 <  if Buff <> nil then begin
3670 >  if Buff <> nil then
3671 >  begin
3672 >    pda := PArrayDataArray(Buff + FArrayCacheOffset);
3673 >    for i := 0 to ArrayFieldCount - 1 do
3674 >      pda^[i].ArrayIntf.CancelChanges;
3675      CurRec := FCurrentRecord;
3676      AdjustRecordOnInsert(Buff);
3677      if (State = dsEdit) then begin
# Line 3268 | Line 3694 | begin
3694      DeactivateTransaction;
3695    FQSelect.Close;
3696    ClearBlobCache;
3697 +  ClearArrayCache;
3698    FreeRecordBuffer(FModelBuffer);
3699    FreeRecordBuffer(FOldBuffer);
3700    FCurrentRecord := -1;
# Line 3283 | Line 3710 | begin
3710    FOBEnd := 0;
3711    FreeMem(FBufferCache);
3712    FBufferCache := nil;
3713 +  FreeMem(FFieldColumns);
3714 +  FFieldColumns := nil;
3715    FreeMem(FOldBufferCache);
3716    FOldBufferCache := nil;
3717    BindFields(False);
# Line 3357 | Line 3786 | const
3786                 'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
3787                 'and ((not F.RDB$COMPUTED_BLR is NULL) or ' + {do not localize}
3788                 '     (not F.RDB$DEFAULT_VALUE is NULL)) '; {do not localize}
3789 +
3790 +  DefaultSQLODS12 = 'Select F.RDB$COMPUTED_BLR, ' + {do not localize}
3791 +               'F.RDB$DEFAULT_VALUE, R.RDB$FIELD_NAME, R.RDB$IDENTITY_TYPE ' + {do not localize}
3792 +               'from RDB$RELATION_FIELDS R, RDB$FIELDS F ' + {do not localize}
3793 +               'where R.RDB$RELATION_NAME = :RELATION ' +  {do not localize}
3794 +               'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
3795 +               'and ((not F.RDB$COMPUTED_BLR is NULL) or ' + {do not localize}
3796 +               '     (not F.RDB$DEFAULT_VALUE is NULL) or ' + {do not localize}
3797 +               '     ( not R.RDB$IDENTITY_TYPE is NULL))' ; {do not localize}
3798 +
3799   var
3800    FieldType: TFieldType;
3801    FieldSize: Word;
3802 +  FieldDataSize: integer;
3803    charSetID: short;
3804    CharSetSize: integer;
3805 <  CharSetName: string;
3805 >  CharSetName: RawByteString;
3806 >  FieldCodePage: TSystemCodePage;
3807    FieldNullable : Boolean;
3808    i, FieldPosition, FieldPrecision: Integer;
3809    FieldAliasName, DBAliasName: string;
3810 <  RelationName, FieldName: string;
3810 >  aRelationName, FieldName: string;
3811    Query : TIBSQL;
3812    FieldIndex: Integer;
3813    FRelationNodes : TRelationNode;
3814 +  aArrayDimensions: integer;
3815 +  aArrayBounds: TArrayBounds;
3816 +  ArrayMetaData: IArrayMetaData;
3817  
3818    function Add_Node(Relation, Field : String) : TRelationNode;
3819    var
# Line 3392 | Line 3836 | var
3836        FField.FieldName := Query.Fields[2].AsString;
3837        FField.DEFAULT_VALUE := not Query.Fields[1].IsNull;
3838        FField.COMPUTED_BLR := not Query.Fields[0].IsNull;
3839 +      FField.IDENTITY_COLUMN := (Query.FieldCount > 3) and not Query.Fields[3].IsNull;
3840        FField.NextField := Result.FieldNodes;
3841        Result.FieldNodes := FField;
3842        Query.Next;
# Line 3445 | Line 3890 | var
3890          FField := Ffield.NextField;
3891    end;
3892  
3893 +  function Is_IDENTITY_COLUMN(Relation, Field : String) : Boolean;
3894 +  var
3895 +    FRelation : TRelationNode;
3896 +    FField : TFieldNode;
3897 +  begin
3898 +    FRelation := FRelationNodes;
3899 +    while Assigned(FRelation) and
3900 +         (FRelation.RelationName <> Relation) do
3901 +      FRelation := FRelation.NextRelation;
3902 +    if not Assigned(FRelation) then
3903 +      FRelation := Add_Node(Relation, Field);
3904 +    Result := false;
3905 +    FField := FRelation.FieldNodes;
3906 +    while Assigned(FField) do
3907 +      if FField.FieldName = Field then
3908 +      begin
3909 +        Result := Ffield.IDENTITY_COLUMN;
3910 +        Exit;
3911 +      end
3912 +      else
3913 +        FField := Ffield.NextField;
3914 +  end;
3915 +
3916    Procedure FreeNodes;
3917    var
3918      FRelation : TRelationNode;
# Line 3467 | Line 3935 | var
3935   begin
3936    FRelationNodes := TRelationNode.Create;
3937    FNeedsRefresh := False;
3938 <  Database.InternalTransaction.StartTransaction;
3938 >  if not Database.InternalTransaction.InTransaction then
3939 >    Database.InternalTransaction.StartTransaction;
3940    Query := TIBSQL.Create(self);
3941    try
3942      Query.Database := DataBase;
# Line 3475 | Line 3944 | begin
3944      FieldDefs.BeginUpdate;
3945      FieldDefs.Clear;
3946      FieldIndex := 0;
3947 <    if (Length(FMappedFieldPosition) < SourceQuery.Current.Count) then
3948 <      SetLength(FMappedFieldPosition, SourceQuery.Current.Count);
3949 <    Query.SQL.Text := DefaultSQL;
3947 >    if (Length(FMappedFieldPosition) < SourceQuery.MetaData.Count) then
3948 >      SetLength(FMappedFieldPosition, SourceQuery.MetaData.Count);
3949 >    if FDatabaseInfo.ODSMajorVersion >= 12 then
3950 >      Query.SQL.Text := DefaultSQLODS12
3951 >    else
3952 >      Query.SQL.Text := DefaultSQL;
3953      Query.Prepare;
3954 <    SetLength(FAliasNameMap, SourceQuery.Current.Count);
3955 <    SetLength(FAliasNameList, SourceQuery.Current.Count);
3956 <    for i := 0 to SourceQuery.Current.Count - 1 do
3957 <      with SourceQuery.Current[i].Data^ do
3954 >    SetLength(FAliasNameMap, SourceQuery.MetaData.Count);
3955 >    SetLength(FAliasNameList, SourceQuery.MetaData.Count);
3956 >    for i := 0 to SourceQuery.MetaData.GetCount - 1 do
3957 >      with SourceQuery.MetaData[i] do
3958        begin
3959          { Get the field name }
3960 <        FieldAliasName := SourceQuery.Current[i].Name;
3961 <        SetString(DBAliasName, aliasname, aliasname_length);
3962 <        SetString(RelationName, relname, relname_length);
3963 <        SetString(FieldName, sqlname, sqlname_length);
3960 >        FieldAliasName := GetName;
3961 >        DBAliasName := GetAliasname;
3962 >        aRelationName := getRelationName;
3963 >        FieldName := getSQLName;
3964          FAliasNameList[i] := DBAliasName;
3965          FieldSize := 0;
3966 +        FieldDataSize := GetSize;
3967          FieldPrecision := 0;
3968 <        FieldNullable := SourceQuery.Current[i].IsNullable;
3968 >        FieldNullable := IsNullable;
3969          CharSetSize := 0;
3970          CharSetName := '';
3971 <        case sqltype and not 1 of
3971 >        FieldCodePage := CP_NONE;
3972 >        aArrayDimensions := 0;
3973 >        SetLength(aArrayBounds,0);
3974 >        case SQLType of
3975            { All VARCHAR's must be converted to strings before recording
3976             their values }
3977            SQL_VARYING, SQL_TEXT:
3978            begin
3979 <            CharSetSize := FBase.GetCharSetSize(sqlsubtype and $FF);
3980 <            CharSetName := FBase.GetCharSetName(sqlsubtype and $FF);
3981 <            {FieldSize is encoded for strings - see TIBStringField.SetSize for decode}
3982 <            FieldSize := sqllen;
3983 <            if CharSetSize = 2 then
3984 <              FieldType := ftWideString
3509 <            else
3510 <              FieldType := ftString;
3979 >            if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
3980 >              CharSetSize := 1;
3981 >            CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
3982 >            Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
3983 >            FieldSize := FieldDataSize div CharSetSize;
3984 >            FieldType := ftString;
3985            end;
3986            { All Doubles/Floats should be cast to doubles }
3987            SQL_DOUBLE, SQL_FLOAT:
3988              FieldType := ftFloat;
3989            SQL_SHORT:
3990            begin
3991 <            if (sqlscale = 0) then
3991 >            if (getScale = 0) then
3992                FieldType := ftSmallInt
3993              else begin
3994                FieldType := ftBCD;
3995                FieldPrecision := 4;
3996 <              FieldSize := -sqlscale;
3996 >              FieldSize := -getScale;
3997              end;
3998            end;
3999            SQL_LONG:
4000            begin
4001 <            if (sqlscale = 0) then
4001 >            if (getScale = 0) then
4002                FieldType := ftInteger
4003 <            else if (sqlscale >= (-4)) then
4003 >            else if (getScale >= (-4)) then
4004              begin
4005                FieldType := ftBCD;
4006                FieldPrecision := 9;
4007 <              FieldSize := -sqlscale;
4007 >              FieldSize := -getScale;
4008              end
4009              else
4010              if Database.SQLDialect = 1 then
# Line 3542 | Line 4016 | begin
4016              begin
4017                FieldType := ftFMTBCD;
4018                FieldPrecision := 9;
4019 <              FieldSize := -sqlscale;
4019 >              FieldSize := -getScale;
4020              end;
4021            end;
4022  
4023            SQL_INT64:
4024            begin
4025 <            if (sqlscale = 0) then
4025 >            if (getScale = 0) then
4026                FieldType := ftLargeInt
4027 <            else if (sqlscale >= (-4)) then
4027 >            else if (getScale >= (-4)) then
4028              begin
4029                FieldType := ftBCD;
4030                FieldPrecision := 18;
4031 <              FieldSize := -sqlscale;
4031 >              FieldSize := -getScale;
4032              end
4033              else
4034 <              FieldType := ftFloat
4034 >              FieldType := ftFloat;
4035            end;
4036            SQL_TIMESTAMP: FieldType := ftDateTime;
4037            SQL_TYPE_TIME: FieldType := ftTime;
# Line 3565 | Line 4039 | begin
4039            SQL_BLOB:
4040            begin
4041              FieldSize := sizeof (TISC_QUAD);
4042 <            if (sqlsubtype = 1) then
4042 >            if (getSubtype = 1) then
4043              begin
4044 <              if strpas(sqlname) = '' then {Complex SQL with no identifiable column - use connection default}
4045 <              begin
4046 <                CharSetSize := FBase.GetDefaultCharSetSize;
4047 <                CharSetName := FBase.GetDefaultCharSetName;
4048 <              end
3575 <              else
3576 <              begin
3577 <                charSetID := GetBlobCharSetID(Database.Handle,Database.InternalTransaction.Handle,
3578 <                        @relname,@sqlname);
3579 <                CharSetSize := FBase.GetCharSetSize(charSetID);
3580 <                CharSetName := FBase.GetCharSetName(charSetID);
3581 <              end;
3582 <              if CharSetSize = 2 then
3583 <                FieldType := ftWideMemo
3584 <              else
3585 <                FieldType := ftMemo;
4044 >              if not Database.Attachment.CharSetWidth(getCharSetID,CharSetSize) then
4045 >                CharSetSize := 1;
4046 >              CharSetName := Database.Attachment.GetCharsetName(getCharSetID);
4047 >              Database.Attachment.CharSetID2CodePage(getCharSetID,FieldCodePage);
4048 >              FieldType := ftMemo;
4049              end
4050              else
4051                FieldType := ftBlob;
# Line 3590 | Line 4053 | begin
4053            SQL_ARRAY:
4054            begin
4055              FieldSize := sizeof (TISC_QUAD);
4056 <            FieldType := ftUnknown;
4056 >            FieldType := ftArray;
4057 >            ArrayMetaData := GetArrayMetaData;
4058 >            if ArrayMetaData <> nil then
4059 >            begin
4060 >              aArrayDimensions := ArrayMetaData.GetDimensions;
4061 >              aArrayBounds := ArrayMetaData.GetBounds;
4062 >            end;
4063            end;
4064            SQL_BOOLEAN:
4065               FieldType:= ftBoolean;
# Line 3607 | Line 4076 | begin
4076              Name := FieldAliasName;
4077              FAliasNameMap[FieldNo-1] := DBAliasName;
4078              Size := FieldSize;
4079 +            DataSize := FieldDataSize;
4080              Precision := FieldPrecision;
4081              Required := not FieldNullable;
4082 +            RelationName := aRelationName;
4083              InternalCalcField := False;
4084              CharacterSetSize := CharSetSize;
4085              CharacterSetName := CharSetName;
4086 +            CodePage := FieldCodePage;
4087 +            ArrayDimensions := aArrayDimensions;
4088 +            ArrayBounds := aArrayBounds;
4089              if (FieldName <> '') and (RelationName <> '') then
4090              begin
4091 +              IdentityColumn := Is_IDENTITY_COLUMN(RelationName, FieldName);
4092                if Has_COMPUTED_BLR(RelationName, FieldName) then
4093                begin
4094                  Attributes := [faReadOnly];
# Line 3639 | Line 4114 | begin
4114      FreeNodes;
4115      Database.InternalTransaction.Commit;
4116      FieldDefs.EndUpdate;
4117 +    FieldDefs.Updated := true;
4118    end;
4119   end;
4120  
# Line 3656 | Line 4132 | begin
4132    else begin
4133      Buffer := AllocRecordBuffer;
4134      try
4135 <      while FQSelect.Next <> nil do
4135 >      while FQSelect.Next do
4136        begin
4137          FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
4138          Inc(FRecordCount);
# Line 3671 | Line 4147 | end;
4147   procedure TIBCustomDataSet.InternalSetParamsFromCursor;
4148   var
4149    i: Integer;
4150 <  cur_param: TIBXSQLVAR;
4150 >  cur_param: ISQLParam;
4151    cur_field: TField;
4152    s: TStream;
4153   begin
# Line 3679 | Line 4155 | begin
4155      IBError(ibxeEmptyQuery, [nil]);
4156    if not FInternalPrepared then
4157      InternalPrepare;
4158 <  if (SQLParams.Count > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
4158 >  if (SQLParams.GetCount > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
4159    begin
4160 <    for i := 0 to SQLParams.Count - 1 do
4160 >    for i := 0 to SQLParams.GetCount - 1 do
4161      begin
4162        cur_field := DataSource.DataSet.FindField(SQLParams[i].Name);
4163 <      cur_param := SQLParams[i];
4164 <      if (cur_field <> nil) then begin
4163 >      if (cur_field <> nil) then
4164 >      begin
4165 >        cur_param := SQLParams[i];
4166          if (cur_field.IsNull) then
4167            cur_param.IsNull := True
4168 <        else case cur_field.DataType of
4168 >        else
4169 >        case cur_field.DataType of
4170            ftString:
4171              cur_param.AsString := cur_field.AsString;
4172            ftBoolean:
# Line 3698 | Line 4176 | begin
4176            ftInteger:
4177              cur_param.AsLong := cur_field.AsInteger;
4178            ftLargeInt:
4179 <            cur_param.AsInt64 := TLargeIntField(cur_field).AsLargeInt;
4179 >            cur_param.AsInt64 := cur_field.AsLargeInt;
4180            ftFloat, ftCurrency:
4181             cur_param.AsDouble := cur_field.AsFloat;
4182            ftBCD:
# Line 3715 | Line 4193 | begin
4193              try
4194                s := DataSource.DataSet.
4195                       CreateBlobStream(cur_field, bmRead);
4196 <              cur_param.LoadFromStream(s);
4196 >              cur_param.AsBlob := TIBDSBlobStream(s).FBlobStream.Blob;
4197              finally
4198                s.free;
4199              end;
4200            end;
4201 +          ftArray:
4202 +            cur_param.AsArray := TIBArrayField(cur_field).ArrayIntf;
4203            else
4204              IBError(ibxeNotSupported, [nil]);
4205          end;
# Line 3752 | Line 4232 | procedure TIBCustomDataSet.InternalOpen;
4232      result := SizeOf(TRecordData) + ((n - 1) * SizeOf(TFieldData));
4233    end;
4234  
3755  function GetFieldDef(aFieldNo: integer): TIBFieldDef;
3756  var i: integer;
3757  begin
3758    Result := nil;
3759    for i := 0 to FieldDefs.Count - 1 do
3760      if FieldDefs[i].FieldNo = aFieldNo then
3761      begin
3762        Result := TIBFieldDef(FieldDefs[i]);
3763        break;
3764      end;
3765  end;
3766
3767  procedure SetExtendedProperties;
3768  var i: integer;
3769      IBFieldDef: TIBFieldDef;
3770  begin
3771    for i := 0 to Fields.Count - 1 do
3772      if Fields[i].FieldNo > 0 then
3773      begin
3774        if(Fields[i] is TIBStringField) then
3775        with TIBStringField(Fields[i]) do
3776        begin
3777          IBFieldDef := GetFieldDef(FieldNo);
3778          if IBFieldDef <> nil then
3779          begin
3780            CharacterSetSize := IBFieldDef.CharacterSetSize;
3781            CharacterSetName := IBFieldDef.CharacterSetName;
3782          end;
3783        end
3784        else
3785        if(Fields[i] is TIBWideStringField) then
3786        with TIBWideStringField(Fields[i]) do
3787        begin
3788          IBFieldDef := GetFieldDef(FieldNo);
3789          if IBFieldDef <> nil then
3790          begin
3791            CharacterSetSize := IBFieldDef.CharacterSetSize;
3792            CharacterSetName := IBFieldDef.CharacterSetName;
3793          end;
3794        end
3795        else
3796        if(Fields[i] is TIBMemoField) then
3797        with TIBMemoField(Fields[i]) do
3798        begin
3799          IBFieldDef := GetFieldDef(FieldNo);
3800          if IBFieldDef <> nil then
3801          begin
3802            CharacterSetSize := IBFieldDef.CharacterSetSize;
3803            CharacterSetName := IBFieldDef.CharacterSetName;
3804          end;
3805        end
3806        else
3807        if(Fields[i] is TIBWideMemoField) then
3808        with TIBWideMemoField(Fields[i]) do
3809        begin
3810          IBFieldDef := GetFieldDef(FieldNo);
3811          if IBFieldDef <> nil then
3812          begin
3813            CharacterSetSize := IBFieldDef.CharacterSetSize;
3814            CharacterSetName := IBFieldDef.CharacterSetName;
3815          end;
3816        end
3817      end
3818  end;
3819
4235   begin
4236    FBase.SetCursor;
4237    try
# Line 3826 | Line 4241 | begin
4241        IBError(ibxeEmptyQuery, [nil]);
4242      if not FInternalPrepared then
4243        InternalPrepare;
4244 <   if FQSelect.SQLType = SQLSelect then
4244 >   if FQSelect.SQLStatementType = SQLSelect then
4245     begin
4246        if DefaultFields then
4247          CreateFields;
4248 +      FArrayFieldCount := 0;
4249        BindFields(True);
3834      SetExtendedProperties;
4250        FCurrentRecord := -1;
4251        FQSelect.ExecQuery;
4252        FOpen := FQSelect.Open;
# Line 3842 | Line 4257 | begin
4257          3. After the dummy fetch, FRecordSize will be appropriately
4258             adjusted to reflect the additional "weight" of the field
4259             data.
4260 <        4. Set up the FCalcFieldsOffset, FBlobCacheOffset and FRecordBufferSize.
4260 >        4. Set up the FCalcFieldsOffset, FBlobCacheOffset, FArrayCacheOffset and FRecordBufferSize.
4261          5. Now, with the BufferSize available, allocate memory for chunks of records
4262          6. Re-allocate the model buffer, accounting for the new
4263             FRecordBufferSize.
4264          7. Finally, calls to AllocRecordBuffer will work!.
4265         }
4266        {Step 1}
4267 <      FRecordSize := RecordDataLength(FQSelect.Current.Count);
4267 >      FRecordSize := RecordDataLength(FQSelect.FieldCount);
4268        {Step 2, 3}
4269 +      GetMem(FFieldColumns,sizeof(TFieldColumns) * (FQSelect.FieldCount));
4270        IBAlloc(FModelBuffer, 0, FRecordSize);
4271 <      FetchCurrentRecordToBuffer(FQSelect, -1, FModelBuffer);
4271 >      InitModelBuffer(FQSelect, FModelBuffer);
4272        {Step 4}
4273        FCalcFieldsOffset := FRecordSize;
4274        FBlobCacheOffset := FCalcFieldsOffset + CalcFieldsSize;
4275 <      FRecordBufferSize := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4275 >      FArrayCacheOffset := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4276 >      FRecordBufferSize := FArrayCacheOffset + (ArrayFieldCount * sizeof(IArray));
4277        {Step 5}
4278        if UniDirectional then
4279          FBufferChunkSize := FRecordBufferSize * UniCache
# Line 3872 | Line 4289 | begin
4289        FCacheSize := FBufferChunkSize;
4290        FOldCacheSize := FBufferChunkSize;
4291        {Step 6}
4292 <      IBAlloc(FModelBuffer, RecordDataLength(FQSelect.Current.Count),
4292 >      IBAlloc(FModelBuffer, RecordDataLength(FQSelect.FieldCount),
4293                               FRecordBufferSize);
4294        {Step 7}
4295        FOldBuffer := AllocRecordBuffer;
# Line 3970 | Line 4387 | end;
4387   function TIBCustomDataSet.Locate(const KeyFields: string; const KeyValues: Variant;
4388                                   Options: TLocateOptions): Boolean;
4389   var
3973  {$IF FPC_FULLVERSION >= 20700 }
4390    CurBookmark: TBookmark;
3975  {$ELSE}
3976  CurBookmark: string;
3977  {$ENDIF}
4391   begin
4392    DisableControls;
4393    try
# Line 3992 | Line 4405 | function TIBCustomDataSet.Lookup(const K
4405                                   const ResultFields: string): Variant;
4406   var
4407    fl: TList;
3995  {$IF FPC_FULLVERSION >= 20700 }
4408    CurBookmark: TBookmark;
3997  {$ELSE}
3998  CurBookmark: string;
3999  {$ENDIF}
4409   begin
4410    DisableControls;
4411    fl := TList.Create;
# Line 4069 | Line 4478 | begin
4478        MappedFieldPos := FMappedFieldPosition[Field.FieldNo - 1];
4479        if (MappedFieldPos > 0) and
4480           (MappedFieldPos <= rdFieldCount) then
4481 +      with rdFields[MappedFieldPos], FFieldColumns^[MappedFieldPos] do
4482        begin
4483          Field.Validate(Buffer);
4484          if (Buffer = nil) or
4485             (Field is TIBStringField) and (PChar(Buffer)[0] = #0) then
4486 <          rdFields[MappedFieldPos].fdIsNull := True
4487 <        else begin
4488 <          Move(Buffer^, Buff[rdFields[MappedFieldPos].fdDataOfs],
4489 <                 rdFields[MappedFieldPos].fdDataSize);
4490 <          if (rdFields[MappedFieldPos].fdDataType = SQL_TEXT) or
4491 <             (rdFields[MappedFieldPos].fdDataType = SQL_VARYING) then
4492 <            rdFields[MappedFieldPos].fdDataLength := StrLen(PChar(Buffer));
4083 <          rdFields[MappedFieldPos].fdIsNull := False;
4486 >          fdIsNull := True
4487 >        else
4488 >        begin
4489 >          Move(Buffer^, Buff[fdDataOfs],fdDataSize);
4490 >          if (fdDataType = SQL_TEXT) or (fdDataType = SQL_VARYING) then
4491 >            fdDataLength := StrLen(PChar(Buffer));
4492 >          fdIsNull := False;
4493            if rdUpdateStatus = usUnmodified then
4494            begin
4495              if CachedUpdates then
# Line 4181 | Line 4590 | begin
4590    if FInternalPrepared then
4591    begin
4592      CheckDatasetClosed;
4593 +    if FDidActivate then
4594 +      DeactivateTransaction;
4595      FieldDefs.Clear;
4596      FieldDefs.Updated := false;
4597      FInternalPrepared := False;
# Line 4201 | Line 4612 | begin
4612        IBError(ibxeEmptyQuery, [nil]);
4613      if not FInternalPrepared then
4614        InternalPrepare;
4615 <    if FQSelect.SQLType = SQLSelect then
4615 >    if FQSelect.SQLStatementType = SQLSelect then
4616      begin
4617        IBError(ibxeIsASelectStatement, [nil]);
4618      end
# Line 4214 | Line 4625 | begin
4625    end;
4626   end;
4627  
4628 < function TIBCustomDataSet.GetSelectStmtHandle: TISC_STMT_HANDLE;
4628 > function TIBCustomDataSet.GetSelectStmtIntf: IStatement;
4629   begin
4630 <  Result := FQSelect.Handle;
4630 >  Result := FQSelect.Statement;
4631   end;
4632  
4633   function TIBCustomDataSet.GetParser: TSelectSQLParser;
# Line 4271 | Line 4682 | end;
4682  
4683   { TIBDataSet IProviderSupport }
4684  
4685 < (*procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4685 > procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4686   begin
4687    if Commit then
4688      Transaction.Commit else
# Line 4424 | Line 4835 | begin
4835    Transaction.StartTransaction;
4836   end;
4837  
4838 < function TIBCustomDataSet.PSGetTableName: string;
4838 > function TIBCustomDataSet.PsGetTableName: string;
4839   begin
4840   //  if not FInternalPrepared then
4841   //    InternalPrepare;
# Line 4434 | Line 4845 | begin
4845    if not FQSelect.Prepared then
4846      FQSelect.Prepare;
4847    Result := FQSelect.UniqueRelationName;
4848 < end;*)
4848 > end;
4849  
4850   procedure TIBDataSet.BatchInput(InputObject: TIBBatchInput);
4851   begin
# Line 4519 | Line 4930 | end;
4930   function TIBCustomDataSet.GetFieldData(Field: TField; Buffer: Pointer;
4931    NativeFormat: Boolean): Boolean;
4932   begin
4933 <  if (Field.DataType = ftBCD) and not NativeFormat then
4933 >  {These datatypes use IBX conventions and not TDataset conventions}
4934 >  if (Field.DataType in [ftBCD,ftDateTime,ftDate,ftTime]) and not NativeFormat then
4935      Result := InternalGetFieldData(Field, Buffer)
4936    else
4937      Result := inherited GetFieldData(Field, Buffer, NativeFormat);
# Line 4545 | Line 4957 | end;
4957   procedure TIBCustomDataSet.SetFieldData(Field: TField; Buffer: Pointer;
4958    NativeFormat: Boolean);
4959   begin
4960 <  if (not NativeFormat) and (Field.DataType = ftBCD) then
4960 >  {These datatypes use IBX conventions and not TDataset conventions}
4961 >  if (not NativeFormat) and (Field.DataType in [ftBCD,ftDateTime,ftDate,ftTime]) then
4962      InternalSetfieldData(Field, Buffer)
4963    else
4964      inherited SetFieldData(Field, buffer, NativeFormat);
# Line 4565 | Line 4978 | begin
4978    inherited Destroy;
4979   end;
4980  
4981 < procedure TIBDataSetUpdateObject.SetRefreshSQL(Value: TStrings);
4981 > procedure TIBDataSetUpdateObject.SetRefreshSQL(value: TStrings);
4982   begin
4983    FRefreshSQL.Assign(Value);
4984   end;
4985  
4986 + procedure TIBDataSetUpdateObject.InternalSetParams(Params: ISQLParams;
4987 +  buff: PChar);
4988 + begin
4989 +  if not Assigned(DataSet) then Exit;
4990 +  DataSet.SetInternalSQLParams(Params, buff);
4991 + end;
4992 +
4993   procedure TIBDataSetUpdateObject.InternalSetParams(Query: TIBSQL; buff: PChar);
4994   begin
4995 +  InternalSetParams(Query.Params,buff);
4996 + end;
4997 +
4998 + procedure TIBDataSetUpdateObject.UpdateRecordFromQuery(QryResults: IResults;
4999 +  Buffer: PChar);
5000 + begin
5001    if not Assigned(DataSet) then Exit;
5002 <  DataSet.SetInternalSQLParams(Query, buff);
5002 >  DataSet.UpdateRecordFromQuery(QryResults, Buffer);
5003 > end;
5004 >
5005 > function TIBDSBlobStream.GetSize: Int64;
5006 > begin
5007 >  Result := FBlobStream.BlobSize;
5008   end;
5009  
5010   { TIBDSBlobStream }
# Line 4584 | Line 5015 | begin
5015    FBlobStream := ABlobStream;
5016    FBlobStream.Seek(0, soFromBeginning);
5017    if (Mode = bmWrite) then
5018 +  begin
5019      FBlobStream.Truncate;
5020 +    TIBCustomDataSet(FField.DataSet).RecordModified(True);
5021 +    TBlobField(FField).Modified := true;
5022 +    FHasWritten := true;
5023 +  end;
5024   end;
5025  
5026   destructor TIBDSBlobStream.Destroy;
# Line 4626 | Line 5062 | end;
5062  
5063   procedure TIBGenerator.SetIncrement(const AValue: integer);
5064   begin
5065 +  if FIncrement = AValue then Exit;
5066    if AValue < 0 then
5067 <     raise Exception.Create('A Generator Increment cannot be negative');
5068 <  FIncrement := AValue
5067 >    IBError(ibxeNegativeGenerator,[]);
5068 >  FIncrement := AValue;
5069 >  SetQuerySQL;
5070   end;
5071  
5072 < function TIBGenerator.GetNextValue(ADatabase: TIBDatabase;
4635 <  ATransaction: TIBTransaction): integer;
5072 > procedure TIBGenerator.SetTransaction(AValue: TIBTransaction);
5073   begin
5074 <  with TIBSQL.Create(nil) do
5075 <  try
5076 <    Database := ADatabase;
5077 <    Transaction := ATransaction;
5078 <    if not assigned(Database) then
5079 <       IBError(ibxeCannotSetDatabase,[]);
5080 <    if not assigned(Transaction) then
5081 <       IBError(ibxeCannotSetTransaction,[]);
5082 <    with Transaction do
5083 <      if not InTransaction then StartTransaction;
5084 <    SQL.Text := Format('Select Gen_ID(%s,%d) as ID From RDB$Database',[FGeneratorName,Increment]);
5085 <    Prepare;
5074 >  FQuery.Transaction := AValue;
5075 > end;
5076 >
5077 > procedure TIBGenerator.SetQuerySQL;
5078 > begin
5079 >  FQuery.SQL.Text := Format('Select Gen_ID(%s,%d) From RDB$Database',[FGeneratorName,Increment]);
5080 > end;
5081 >
5082 > function TIBGenerator.GetDatabase: TIBDatabase;
5083 > begin
5084 >  Result := FQuery.Database;
5085 > end;
5086 >
5087 > function TIBGenerator.GetTransaction: TIBTransaction;
5088 > begin
5089 >  Result := FQuery.Transaction;
5090 > end;
5091 >
5092 > procedure TIBGenerator.SetDatabase(AValue: TIBDatabase);
5093 > begin
5094 >  FQuery.Database := AValue;
5095 > end;
5096 >
5097 > procedure TIBGenerator.SetGeneratorName(AValue: string);
5098 > begin
5099 >  if FGeneratorName = AValue then Exit;
5100 >  FGeneratorName := AValue;
5101 >  SetQuerySQL;
5102 > end;
5103 >
5104 > function TIBGenerator.GetNextValue: integer;
5105 > begin
5106 >  with FQuery do
5107 >  begin
5108 >    Transaction.Active := true;
5109      ExecQuery;
5110      try
5111 <      Result := FieldByName('ID').AsInteger
5111 >      Result := Fields[0].AsInteger
5112      finally
5113        Close
5114      end;
4655  finally
4656    Free
5115    end;
5116   end;
5117  
# Line 4661 | Line 5119 | constructor TIBGenerator.Create(Owner: T
5119   begin
5120    FOwner := Owner;
5121    FIncrement := 1;
5122 +  FQuery := TIBSQL.Create(nil);
5123 + end;
5124 +
5125 + destructor TIBGenerator.Destroy;
5126 + begin
5127 +  if assigned(FQuery) then FQuery.Free;
5128 +  inherited Destroy;
5129   end;
5130  
5131  
5132   procedure TIBGenerator.Apply;
5133   begin
5134 <  if (FGeneratorName <> '') and (FFieldName <> '') and Owner.FieldByName(FFieldName).IsNull then
5135 <    Owner.FieldByName(FFieldName).AsInteger := GetNextValue(Owner.Database,Owner.Transaction);
5134 >  if assigned(Database) and assigned(Transaction) and
5135 >       (FGeneratorName <> '') and (FFieldName <> '') and Owner.FieldByName(FFieldName).IsNull then
5136 >    Owner.FieldByName(FFieldName).AsInteger := GetNextValue;
5137   end;
5138  
5139  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines