ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/runtime/IBCustomDataSet.pas

Comparing ibx/trunk/runtime/IBCustomDataSet.pas (file contents):
Revision 43 by tony, Thu Sep 22 17:10:15 2016 UTC vs.
Revision 58 by tony, Sat Mar 11 11:14:14 2017 UTC

#	Line 33 | Line 33
33
34		unit IBCustomDataSet;
35
36	–	{$IF FPC_FULLVERSION >= 20700 }
37	–	{$codepage UTF8}
38	–	{$DEFINE HAS_ANSISTRING_CODEPAGE}
39	–	{$DEFINE NEW_TBOOKMARK}
40	–	{$ENDIF}
41	–
36		{$R-}
37
38	+	{$IFDEF FPC}
39		{$Mode Delphi}
40	+	{$codepage UTF8}
41	+	{$ENDIF}
42
43		{$IFDEF DELPHI}
44		{$DEFINE TDBDFIELD_IS_BCD}
#	Line 55 | Line 52 | uses
52		{$ELSE}
53		unix,
54		{$ENDIF}
55	<	SysUtils, Classes, IBDatabase, IBExternals, IB, IBHeader,  IBSQL, Db,
55	>	SysUtils, Classes, IBDatabase, IBExternals, IB,  IBSQL, Db,
56		IBUtils, IBBlob, IBSQLParser;
57
58		const
#	Line 88 | Line 85 | type
85
86		TBlobDataArray = array[0..0] of TIBBlobStream;
87		PBlobDataArray = ^TBlobDataArray;
88	+	TIBArrayField = class;
89
90	<	{ TIBCustomDataSet }
91	<	TFieldData = record
92	<	fdDataType: Short;
93	<	fdDataScale: Short;
94	<	fdNullable: Boolean;
95	<	fdIsNull: Boolean;
96	<	fdDataSize: Short;
97	<	fdDataLength: Short;
98	<	fdDataOfs: Integer;
99	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
100	<	fdCodePage: TSystemCodePage;
101	<	{$ENDIF}
90	>	{ TIBArray }
91	>
92	>	{Wrapper class to support array cache in TIBCustomDataset and event handling}
93	>
94	>	TIBArray = class
95	>	private
96	>	FArray: IArray;
97	>	FRecNo: integer;
98	>	FField: TIBArrayField;
99	>	procedure EventHandler(Sender: IArray; Reason: TArrayEventReason);
100	>	public
101	>	constructor Create(aField: TIBArrayField; anArray: IArray);
102	>	destructor Destroy; override;
103	>	property ArrayIntf: IArray read FArray;
104		end;
105	<	PFieldData = ^TFieldData;
105	>
106	>	TArrayDataArray = array [0..0] of TIBArray;
107	>	PArrayDataArray = ^TArrayDataArray;
108	>
109	>	{ TIBCustomDataSet }
110
111		TCachedUpdateStatus = (
112		cusUnmodified, cusModified, cusInserted,
#	Line 113 | Line 117 | type
117		end;
118		PIBDBKey = ^TIBDBKey;
119
120	+	PFieldData = ^TFieldData;
121	+	TFieldData = record
122	+	fdIsNull: Boolean;
123	+	fdDataLength: Short;
124	+	end;
125	+
126	+	PColumnData = ^TColumnData;
127	+	TColumnData = record
128	+	fdDataType: Short;
129	+	fdDataScale: Short;
130	+	fdNullable: Boolean;
131	+	fdDataSize: Short;
132	+	fdDataOfs: Integer;
133	+	fdCodePage: TSystemCodePage;
134	+	end;
135	+
136	+	PFieldColumns = ^TFieldColumns;
137	+	TFieldColumns =  array[1..1] of TColumnData;
138	+
139		TRecordData = record
140		rdBookmarkFlag: TBookmarkFlag;
141		rdFieldCount: Short;
#	Line 125 | Line 148 | type
148		end;
149		PRecordData = ^TRecordData;
150
151	+	{ TIBArrayField }
152	+
153	+	TIBArrayField = class(TField)
154	+	private
155	+	FArrayBounds: TArrayBounds;
156	+	FArrayDimensions: integer;
157	+	FRelationName: string;
158	+	FCacheOffset: word;
159	+	function GetArrayID: TISC_QUAD;
160	+	function GetArrayIntf: IArray;
161	+	procedure SetArrayIntf(AValue: IArray);
162	+	protected
163	+	class procedure CheckTypeSize(AValue: Longint); override;
164	+	function GetAsString: string; override;
165	+	function GetDataSize: Integer; override;
166	+	procedure Bind(Binding: Boolean); override;
167	+	public
168	+	constructor Create(AOwner: TComponent); override;
169	+	function CreateArray: IArray;
170	+	property ArrayID: TISC_QUAD read GetArrayID;
171	+	property ArrayIntf: IArray read GetArrayIntf write SetArrayIntf;
172	+	property ArrayDimensions: integer read FArrayDimensions write FArrayDimensions;
173	+	property ArrayBounds: TArrayBounds read FArrayBounds write FArrayBounds;
174	+	end;
175	+
176		{ TIBStringField allows us to have strings longer than 8196 }
177
178		TIBStringField = class(TStringField)
179		private
180		FCharacterSetName: RawByteString;
181		FCharacterSetSize: integer;
182	+	FAutoFieldSize: boolean;
183	+	FCodePage: TSystemCodePage;
184		protected
185	<	function GetDefaultWidth: Longint; override;
185	>	procedure Bind(Binding: Boolean); override;
186	>	function GetDataSize: Integer; override;
187		public
188		constructor Create(aOwner: TComponent); override;
189		class procedure CheckTypeSize(Value: Integer); override;
#	Line 142 | Line 193 | type
193		procedure SetAsString(const Value: string); override;
194		property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
195		property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
196	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
197	<	private
198	<	FCodePage: TSystemCodePage;
148	<	public
149	<	property CodePage: TSystemCodePage read FCodePage write FCodePage;
150	<	{$ENDIF}
196	>	property CodePage: TSystemCodePage read FCodePage write FCodePage;
197	>	published
198	>	property AutoFieldSize: boolean read FAutoFieldSize write FAutoFieldSize default true;
199		end;
200
201		{ TIBBCDField }
#	Line 181 | Line 229 | type
229		FDisplayTextAsClassName: boolean;
230		function GetTruncatedText: string;
231		protected
232	+	procedure Bind(Binding: Boolean); override;
233		function GetAsString: string; override;
234		function GetDefaultWidth: Longint; override;
235		procedure GetText(var AText: string; ADisplayText: Boolean); override;
#	Line 192 | Line 241 | type
241		published
242		property DisplayTextAsClassName: boolean read FDisplayTextAsClassName
243		write FDisplayTextAsClassName;
195	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
244		private
245		FCodePage: TSystemCodePage;
246		FFCodePage: TSystemCodePage;
247		public
248		property CodePage: TSystemCodePage read FFCodePage write FFCodePage;
201	–	{$ENDIF}
249		end;
250
251		TIBDataLink = class(TDetailDataLink)
#	Line 256 | Line 303 | type
303		TIBAutoCommit = (acDisabled, acCommitRetaining);
304
305		{ TIBCustomDataSet }
306	+
307		TIBUpdateAction = (uaFail, uaAbort, uaSkip, uaRetry, uaApply, uaApplied);
308
309		TIBUpdateErrorEvent = procedure(DataSet: TDataSet; E: EDatabaseError;
#	Line 272 | Line 320 | type
320
321		TIBCustomDataSet = class(TDataset)
322		private
323	+	FAllowAutoActivateTransaction: Boolean;
324	+	FArrayFieldCount: integer;
325	+	FArrayCacheOffset: integer;
326		FAutoCommit: TIBAutoCommit;
327		FGenerateParamNames: Boolean;
328		FGeneratorField: TIBGenerator;
329		FNeedsRefresh: Boolean;
330		FForcedRefresh: Boolean;
331		FDidActivate: Boolean;
281	–	FIBLoaded: Boolean;
332		FBase: TIBBase;
333		FBlobCacheOffset: Integer;
334		FBlobStreamList: TList;
335	+	FArrayList: TList;
336		FBufferChunks: Integer;
337		FBufferCache,
338		FOldBufferCache: PChar;
#	Line 335 | Line 386 | type
386		FCloseAction: TTransactionAction;
387		FInTransactionEnd: boolean;
388		FIBLinks: TList;
389	<	function GetSelectStmtHandle: TISC_STMT_HANDLE;
389	>	FFieldColumns: PFieldColumns;
390	>	procedure InitModelBuffer(Qry: TIBSQL; Buffer: PChar);
391	>	function GetSelectStmtIntf: IStatement;
392		procedure SetUpdateMode(const Value: TUpdateMode);
393		procedure SetUpdateObject(Value: TIBDataSetUpdateObject);
394
#	Line 347 | Line 400 | type
400		function CanRefresh: Boolean;
401		procedure CheckEditState;
402		procedure ClearBlobCache;
403	+	procedure ClearArrayCache;
404		procedure ClearIBLinks;
405		procedure CopyRecordBuffer(Source, Dest: Pointer);
406		procedure DoBeforeDatabaseDisconnect(Sender: TObject);
#	Line 358 | Line 412 | type
412		procedure FetchCurrentRecordToBuffer(Qry: TIBSQL; RecordNumber: Integer;
413		Buffer: PChar);
414		function GetDatabase: TIBDatabase;
361	–	function GetDBHandle: PISC_DB_HANDLE;
415		function GetDeleteSQL: TStrings;
416		function GetInsertSQL: TStrings;
417	<	function GetSQLParams: TIBXSQLDA;
417	>	function GetSQLParams: ISQLParams;
418		function GetRefreshSQL: TStrings;
419		function GetSelectSQL: TStrings;
420	<	function GetStatementType: TIBSQLTypes;
420	>	function GetStatementType: TIBSQLStatementTypes;
421		function GetModifySQL: TStrings;
422		function GetTransaction: TIBTransaction;
370	–	function GetTRHandle: PISC_TR_HANDLE;
423		function GetParser: TSelectSQLParser;
424		procedure InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer); virtual;
425		function InternalLocate(const KeyFields: string; const KeyValues: Variant;
#	Line 422 | Line 474 | type
474		procedure SQLChanging(Sender: TObject); virtual;
475		procedure SQLChanged(Sender: TObject); virtual;
476
477	<	(*    { IProviderSupport }
477	>	{ IProviderSupport }
478		procedure PSEndTransaction(Commit: Boolean); override;
479		function PSExecuteStatement(const ASQL: string; AParams: TParams;
480		ResultSet: Pointer = nil): Integer; override;
#	Line 435 | Line 487 | type
487		procedure PSStartTransaction; override;
488		procedure PSReset; override;
489		function PSUpdateRecord(UpdateKind: TUpdateKind; Delta: TDataSet): Boolean; override;
490	<	*)
490	>
491		{ TDataSet support }
492		procedure InternalInsert; override;
493		procedure InitRecord(Buffer: PChar); override;
#	Line 499 | Line 551 | type
551		protected
552		{Likely to be made public by descendant classes}
553		property AutoCommit: TIBAutoCommit read FAutoCommit write FAutoCommit default acDisabled;
554	<	property SQLParams: TIBXSQLDA read GetSQLParams;
555	<	property Params: TIBXSQLDA read GetSQLParams;
554	>	property SQLParams: ISQLParams read GetSQLParams;
555	>	property Params: ISQLParams read GetSQLParams;
556		property InternalPrepared: Boolean read FInternalPrepared;
557		property QDelete: TIBSQL read FQDelete;
558		property QInsert: TIBSQL read FQInsert;
559		property QRefresh: TIBSQL read FQRefresh;
560		property QSelect: TIBSQL read FQSelect;
561		property QModify: TIBSQL read FQModify;
562	<	property StatementType: TIBSQLTypes read GetStatementType;
563	<	property SelectStmtHandle: TISC_STMT_HANDLE read GetSelectStmtHandle;
562	>	property StatementType: TIBSQLStatementTypes read GetStatementType;
563	>	property SelectStmtHandle: IStatement read GetSelectStmtIntf;
564
565		{Likely to be made published by descendant classes}
566		property BufferChunks: Integer read FBufferChunks write SetBufferChunks;
#	Line 559 | Line 611 | type
611		function BookmarkValid(Bookmark: TBookmark): Boolean; override;
612		function CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer; override;
613		function CreateBlobStream(Field: TField; Mode: TBlobStreamMode): TStream; override;
614	+	function GetArray(Field: TIBArrayField): IArray;
615	+	procedure SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
616		function GetCurrentRecord(Buffer: PChar): Boolean; override;
617		function GetFieldData(Field : TField; Buffer : Pointer) : Boolean; overload; override;
618		function GetFieldData(FieldNo: Integer; Buffer: Pointer): Boolean; overload; (*override;*)
#	Line 572 | Line 626 | type
626		function UpdateStatus: TUpdateStatus; override;
627		function IsSequenced: Boolean; override;
628		procedure Post; override;
629	<	function ParamByName(ParamName: String): TIBXSQLVAR;
630	<	property DBHandle: PISC_DB_HANDLE read GetDBHandle;
577	<	property TRHandle: PISC_TR_HANDLE read GetTRHandle;
629	>	function ParamByName(ParamName: String): ISQLParam;
630	>	property ArrayFieldCount: integer read FArrayFieldCount;
631		property UpdateObject: TIBDataSetUpdateObject read FUpdateObject write SetUpdateObject;
632		property UpdatesPending: Boolean read FUpdatesPending;
633		property UpdateRecordTypes: TIBUpdateRecordTypes read FUpdateRecordTypes
#	Line 583 | Line 636 | type
636		read FDataSetCloseAction write FDataSetCloseAction;
637
638		published
639	+	property AllowAutoActivateTransaction: Boolean read FAllowAutoActivateTransaction
640	+	write FAllowAutoActivateTransaction;
641		property Database: TIBDatabase read GetDatabase write SetDatabase;
642		property Transaction: TIBTransaction read GetTransaction
643		write SetTransaction;
#	Line 723 | Line 778 | type
778		function Write(const Buffer; Count: Longint): Longint; override;
779		end;
780
781	+	{Extended Field Def for character set info}
782	+
783	+	{ TIBFieldDef }
784	+
785	+	TIBFieldDef = class(TFieldDef)
786	+	private
787	+	FArrayBounds: TArrayBounds;
788	+	FArrayDimensions: integer;
789	+	FCharacterSetName: RawByteString;
790	+	FCharacterSetSize: integer;
791	+	FCodePage: TSystemCodePage;
792	+	FRelationName: string;
793	+	published
794	+	property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
795	+	property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
796	+	property CodePage: TSystemCodePage read FCodePage write FCodePage;
797	+	property RelationName: string read FRelationName write FRelationName;
798	+	property ArrayDimensions: integer read FArrayDimensions write FArrayDimensions;
799	+	property ArrayBounds: TArrayBounds read FArrayBounds write FArrayBounds;
800	+	end;
801	+
802		const
803		DefaultFieldClasses: array[TFieldType] of TFieldClass = (
804		nil,                { ftUnknown }
#	Line 752 | Line 828 | DefaultFieldClasses: array[TFieldType] o
828		nil,    { ftWideString }
829		TLargeIntField,     { ftLargeInt }
830		nil,          { ftADT }
831	<	nil,        { ftArray }
831	>	TIBArrayField,        { ftArray }
832		nil,    { ftReference }
833		nil,     { ftDataSet }
834		TBlobField,         { ftOraBlob }
#	Line 781 | Line 857 | DefaultFieldClasses: array[TFieldType] o
857
858		implementation
859
860	<	uses IBIntf, Variants, FmtBCD, LazUTF8, IBCodePage;
860	>	uses Variants, FmtBCD, LazUTF8, FBMessages, IBQuery;
861
862		const FILE_BEGIN = 0;
863		FILE_CURRENT = 1;
#	Line 804 | Line 880 | type
880		NextRelation : TRelationNode;
881		end;
882
807	–	{Extended Field Def for character set info}
808	–
809	–	{ TIBFieldDef }
810	–
811	–	TIBFieldDef = class(TFieldDef)
812	–	private
813	–	FCharacterSetName: RawByteString;
814	–	FCharacterSetSize: integer;
815	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
816	–	FCodePage: TSystemCodePage;
817	–	{$ENDIF}
818	–	published
819	–	property CharacterSetName: RawByteString read FCharacterSetName write FCharacterSetName;
820	–	property CharacterSetSize: integer read FCharacterSetSize write FCharacterSetSize;
821	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
822	–	property CodePage: TSystemCodePage read FCodePage write FCodePage;
823	–	{$ENDIF}
824	–	end;
825	–
883
884		{  Copied from LCLProc in order to avoid LCL dependency
885
#	Line 865 | Line 922 | type
922		Result := str;
923		end;
924
925	+	{ TIBArray }
926	+
927	+	procedure TIBArray.EventHandler(Sender: IArray; Reason: TArrayEventReason);
928	+	begin
929	+	case Reason of
930	+	arChanging:
931	+	if FRecNo <> FField.Dataset.RecNo then
932	+	IBError(ibxeNotCurrentArray,[nil]);
933	+
934	+	arChanged:
935	+	FField.DataChanged;
936	+	end;
937	+	end;
938	+
939	+	constructor TIBArray.Create(aField: TIBArrayField; anArray: IArray);
940	+	begin
941	+	inherited Create;
942	+	FField := aField;
943	+	FArray := anArray;
944	+	FRecNo := FField.Dataset.RecNo;
945	+	FArray.AddEventHandler(EventHandler);
946	+	end;
947	+
948	+	destructor TIBArray.Destroy;
949	+	begin
950	+	FArray.RemoveEventHandler(EventHandler);
951	+	inherited Destroy;
952	+	end;
953	+
954	+	{ TIBArrayField }
955	+
956	+	function TIBArrayField.GetArrayIntf: IArray;
957	+	begin
958	+	Result := TIBCustomDataSet(DataSet).GetArray(self);
959	+	end;
960	+
961	+	function TIBArrayField.GetArrayID: TISC_QUAD;
962	+	begin
963	+	GetData(@Result);
964	+	end;
965	+
966	+	procedure TIBArrayField.SetArrayIntf(AValue: IArray);
967	+	begin
968	+	TIBCustomDataSet(DataSet).SetArrayIntf(AValue,self);
969	+	DataChanged;
970	+	end;
971	+
972	+	class procedure TIBArrayField.CheckTypeSize(AValue: Longint);
973	+	begin
974	+	//Ignore
975	+	end;
976	+
977	+	function TIBArrayField.GetAsString: string;
978	+	begin
979	+	Result := '(Array)';
980	+	end;
981	+
982	+	function TIBArrayField.GetDataSize: Integer;
983	+	begin
984	+	Result := sizeof(TISC_QUAD);
985	+	end;
986	+
987	+	procedure TIBArrayField.Bind(Binding: Boolean);
988	+	begin
989	+	inherited Bind(Binding);
990	+	if Binding then
991	+	begin
992	+	FCacheOffset := TIBCustomDataSet(DataSet).ArrayFieldCount;
993	+	Inc(TIBCustomDataSet(DataSet).FArrayFieldCount);
994	+	if FieldDef <> nil then
995	+	begin
996	+	FRelationName := TIBFieldDef(FieldDef).FRelationName;
997	+	FArrayDimensions := TIBFieldDef(FieldDef).ArrayDimensions;
998	+	FArrayBounds :=  TIBFieldDef(FieldDef).ArrayBounds;
999	+	end;
1000	+	end;
1001	+	end;
1002	+
1003	+	constructor TIBArrayField.Create(AOwner: TComponent);
1004	+	begin
1005	+	inherited Create(AOwner);
1006	+	SetDataType(ftArray);
1007	+	end;
1008	+
1009	+	function TIBArrayField.CreateArray: IArray;
1010	+	begin
1011	+	with DataSet as TIBCustomDataSet do
1012	+	Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,FRelationName,FieldName);
1013	+	end;
1014	+
1015		{ TIBMemoField }
1016
1017		function TIBMemoField.GetTruncatedText: string;
#	Line 894 | Line 1041 | begin
1041		end
1042		end;
1043
1044	+	procedure TIBMemoField.Bind(Binding: Boolean);
1045	+	var IBFieldDef: TIBFieldDef;
1046	+	begin
1047	+	inherited Bind(Binding);
1048	+	if Binding and (FieldDef <> nil) then
1049	+	begin
1050	+	IBFieldDef := FieldDef as TIBFieldDef;
1051	+	CharacterSetSize := IBFieldDef.CharacterSetSize;
1052	+	CharacterSetName := IBFieldDef.CharacterSetName;
1053	+	CodePage := IBFieldDef.CodePage;
1054	+	end;
1055	+	end;
1056	+
1057		function TIBMemoField.GetAsString: string;
1058		var s: RawByteString;
1059		begin
1060		s := inherited GetAsString;
901	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1061		SetCodePage(s,CodePage,false);
1062		if (CodePage <> CP_NONE) and (CodePage <> CP_UTF8) then
1063		SetCodePage(s,CP_UTF8,true);  {LCL only accepts UTF8}
905	–	{$ENDIF}
1064		Result := s;
1065		end;
1066
#	Line 931 | Line 1089 | procedure TIBMemoField.SetAsString(const
1089		var s: RawByteString;
1090		begin
1091		s := AValue;
1092	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
935	<	if StringCodePage(Value) <> CodePage then
1092	>	if StringCodePage(s) <> CodePage then
1093		SetCodePage(s,CodePage,CodePage<>CP_NONE);
937	–	{$ENDIF}
1094		inherited SetAsString(s);
1095		end;
1096
#	Line 942 | Line 1098 | constructor TIBMemoField.Create(AOwner:
1098		begin
1099		inherited Create(AOwner);
1100		BlobType := ftMemo;
945	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1101		FCodePage := CP_NONE;
947	–	{$ENDIF}
1102		end;
1103
1104		{ TIBControlLink }
#	Line 978 | Line 1132 | end;
1132
1133		{ TIBStringField}
1134
1135	<	function TIBStringField.GetDefaultWidth: Longint;
1135	>	procedure TIBStringField.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	>	if AutoFieldSize then
1145	>	Size := IBFieldDef.Size;
1146	>	CodePage := IBFieldDef.CodePage;
1147	>	end;
1148	>	end;
1149	>
1150	>	function TIBStringField.GetDataSize: Integer;
1151		begin
1152	<	Result := Size div CharacterSetSize;
1152	>	Result := Size * CharacterSetSize + 1;
1153		end;
1154
1155		constructor TIBStringField.Create(aOwner: TComponent);
1156		begin
1157		inherited Create(aOwner);
1158		FCharacterSetSize := 1;
990	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1159		FCodePage := CP_NONE;
1160	<	{$ENDIF}
1160	>	FAutoFieldSize := true;
1161		end;
1162
1163		class procedure TIBStringField.CheckTypeSize(Value: Integer);
#	Line 1013 | Line 1181 | function TIBStringField.GetValue(var Val
1181		var
1182		Buffer: PChar;
1183		s: RawByteString;
1016	–	//  i: integer;
1184		begin
1185		Buffer := nil;
1186	<	IBAlloc(Buffer, 0, Size + 1);
1186	>	IBAlloc(Buffer, 0, DataSize);
1187		try
1188		Result := GetData(Buffer);
1189		if Result then
1190		begin
1191	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1025	<	s := string(Buffer);
1191	>	s := strpas(Buffer);
1192		SetCodePage(s,CodePage,false);
1193		if (CodePage <> CP_NONE) and (CodePage <> CP_UTF8) then
1194		SetCodePage(s,CP_UTF8,true);  {LCL only accepts UTF8}
1195		Value := s;
1196	<	(*      write(FieldName,': ', StringCodePage(Value),', ',Value,' ');
1031	<	for i := 1 to Length(Value) do
1032	<	write(Format('%x ',[byte(Value[i])]));
1033	<	writeln;*)
1034	<	{$ELSE}
1035	<	Value := string(Buffer);
1036	<	{$ENDIF}
1196	>	//      writeln(FieldName,': ', StringCodePage(Value),', ',Value);
1197		if Transliterate and (Value <> '') then
1198		DataSet.Translate(PChar(Value), PChar(Value), False);
1199		end
#	Line 1048 | Line 1208 | var
1208		s: RawByteString;
1209		begin
1210		Buffer := nil;
1211	<	IBAlloc(Buffer, 0, Size + 1);
1211	>	IBAlloc(Buffer, 0, DataSize);
1212		try
1213		s := Value;
1054	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1214		if StringCodePage(s) <> CodePage then
1215		SetCodePage(s,CodePage,CodePage<>CP_NONE);
1216	<	{$ENDIF}
1058	<	StrLCopy(Buffer, PChar(s), Size);
1216	>	StrLCopy(Buffer, PChar(s), DataSize-1);
1217		if Transliterate then
1218		DataSet.Translate(Buffer, Buffer, True);
1219		SetData(Buffer);
#	Line 1158 | Line 1316 | end;
1316		constructor TIBCustomDataSet.Create(AOwner: TComponent);
1317		begin
1318		inherited Create(AOwner);
1161	–	FIBLoaded := False;
1162	–	CheckIBLoaded;
1163	–	FIBLoaded := True;
1319		FBase := TIBBase.Create(Self);
1320		FIBLinks := TList.Create;
1321		FCurrentRecord := -1;
#	Line 1168 | Line 1323 | begin
1323		FUniDirectional := False;
1324		FBufferChunks := BufferCacheSize;
1325		FBlobStreamList := TList.Create;
1326	+	FArrayList := TList.Create;
1327		FGeneratorField := TIBGenerator.Create(self);
1328		FDataLink := TIBDataLink.Create(Self);
1329		FQDelete := TIBSQL.Create(Self);
#	Line 1211 | Line 1367 | end;
1367		destructor TIBCustomDataSet.Destroy;
1368		begin
1369		if Active then Active := false;
1370	<	if FIBLoaded then
1371	<	begin
1372	<	if assigned(FGeneratorField) then FGeneratorField.Free;
1373	<	FDataLink.Free;
1374	<	FBase.Free;
1375	<	ClearBlobCache;
1376	<	ClearIBLinks;
1377	<	FIBLinks.Free;
1378	<	FBlobStreamList.Free;
1379	<	FreeMem(FBufferCache);
1380	<	FBufferCache := nil;
1381	<	FreeMem(FOldBufferCache);
1382	<	FOldBufferCache := nil;
1383	<	FCacheSize := 0;
1384	<	FOldCacheSize := 0;
1229	<	FMappedFieldPosition := nil;
1230	<	end;
1370	>	if assigned(FGeneratorField) then FGeneratorField.Free;
1371	>	FDataLink.Free;
1372	>	FBase.Free;
1373	>	ClearBlobCache;
1374	>	ClearIBLinks;
1375	>	FIBLinks.Free;
1376	>	FBlobStreamList.Free;
1377	>	FArrayList.Free;
1378	>	FreeMem(FBufferCache);
1379	>	FBufferCache := nil;
1380	>	FreeMem(FOldBufferCache);
1381	>	FOldBufferCache := nil;
1382	>	FCacheSize := 0;
1383	>	FOldCacheSize := 0;
1384	>	FMappedFieldPosition := nil;
1385		if assigned(FBaseSQLSelect) then FBaseSQLSelect.Free;
1386		if assigned(FParser) then FParser.Free;
1387		inherited Destroy;
#	Line 1252 | Line 1406 | begin
1406		Inc(FCurrentRecord);
1407		if (FCurrentRecord = FRecordCount) then
1408		begin
1409	<	if (not FQSelect.EOF) and (FQSelect.Next <> nil) then
1409	>	if (not FQSelect.EOF) and FQSelect.Next  then
1410		begin
1411		FetchCurrentRecordToBuffer(FQSelect, FCurrentRecord, Buffer);
1412		Inc(FRecordCount);
#	Line 1271 | Line 1425 | end;
1425
1426		procedure TIBCustomDataSet.ApplyUpdates;
1427		var
1274	–	{$IFDEF NEW_TBOOKMARK }
1428		CurBookmark: TBookmark;
1276	–	{$ELSE}
1277	–	CurBookmark: string;
1278	–	{$ENDIF}
1429		Buffer: PRecordData;
1430		CurUpdateTypes: TIBUpdateRecordTypes;
1431		UpdateAction: TIBUpdateAction;
#	Line 1506 | Line 1656 | end;
1656		function TIBCustomDataSet.ActivateTransaction: Boolean;
1657		begin
1658		Result := False;
1659	<	if not Assigned(Transaction) then
1510	<	IBError(ibxeTransactionNotAssigned, [nil]);
1511	<	if not Transaction.Active then
1659	>	if AllowAutoActivateTransaction or (csDesigning in ComponentState) then
1660		begin
1661	<	Result := True;
1662	<	Transaction.StartTransaction;
1663	<	FDidActivate := True;
1661	>	if not Assigned(Transaction) then
1662	>	IBError(ibxeTransactionNotAssigned, [nil]);
1663	>	if not Transaction.Active then
1664	>	begin
1665	>	Result := True;
1666	>	Transaction.StartTransaction;
1667	>	FDidActivate := True;
1668	>	end;
1669		end;
1670		end;
1671
#	Line 1637 | Line 1790 | begin
1790		FBlobStreamList.Pack;
1791		end;
1792
1793	+	procedure TIBCustomDataSet.ClearArrayCache;
1794	+	var
1795	+	i: Integer;
1796	+	begin
1797	+	for i := 0 to FArrayList.Count - 1 do
1798	+	begin
1799	+	TIBArray(FArrayList[i]).Free;
1800	+	FArrayList[i] := nil;
1801	+	end;
1802	+	FArrayList.Pack;
1803	+	end;
1804	+
1805		procedure TIBCustomDataSet.CopyRecordBuffer(Source, Dest: Pointer);
1806		begin
1807		Move(Source^, Dest^, FRecordBufferSize);
#	Line 1646 | Line 1811 | procedure TIBCustomDataSet.DoBeforeDatab
1811		begin
1812		if Active then
1813		Active := False;
1814	<	FInternalPrepared := False;
1814	>	InternalUnPrepare;
1815		if Assigned(FBeforeDatabaseDisconnect) then
1816		FBeforeDatabaseDisconnect(Sender);
1817		end;
#	Line 1684 | Line 1849 | begin
1849		FQModify.FreeHandle;
1850		if FQRefresh <> nil then
1851		FQRefresh.FreeHandle;
1852	+	InternalUnPrepare;
1853		if Assigned(FBeforeTransactionEnd) then
1854		FBeforeTransactionEnd(Sender);
1855		end;
#	Line 1700 | Line 1866 | begin
1866		FTransactionFree(Sender);
1867		end;
1868
1869	+	procedure TIBCustomDataSet.InitModelBuffer(Qry: TIBSQL; Buffer: PChar);
1870	+	var i, j: Integer;
1871	+	FieldsLoaded: integer;
1872	+	p: PRecordData;
1873	+	colMetadata: IColumnMetaData;
1874	+	begin
1875	+	p := PRecordData(Buffer);
1876	+	{ Get record information }
1877	+	p^.rdBookmarkFlag := bfCurrent;
1878	+	p^.rdFieldCount := Qry.FieldCount;
1879	+	p^.rdRecordNumber := -1;
1880	+	p^.rdUpdateStatus := usUnmodified;
1881	+	p^.rdCachedUpdateStatus := cusUnmodified;
1882	+	p^.rdSavedOffset := $FFFFFFFF;
1883	+
1884	+	{ Load up the fields }
1885	+	FieldsLoaded := FQSelect.MetaData.Count;
1886	+	j := 1;
1887	+	for i := 0 to Qry.MetaData.Count - 1 do
1888	+	begin
1889	+	if (Qry = FQSelect) then
1890	+	j := i + 1
1891	+	else
1892	+	begin
1893	+	if FieldsLoaded = 0 then
1894	+	break;
1895	+	j := FQSelect.FieldIndex[Qry[i].Name] + 1;
1896	+	if j < 1 then
1897	+	continue
1898	+	else
1899	+	Dec(FieldsLoaded);
1900	+	end;
1901	+	if j > 0 then
1902	+	begin
1903	+	colMetadata := Qry.MetaData[i];
1904	+	with p^.rdFields[j], FFieldColumns^[j] do
1905	+	begin
1906	+	fdDataType := colMetadata.GetSQLType;
1907	+	if fdDataType = SQL_BLOB then
1908	+	fdDataScale := 0
1909	+	else
1910	+	fdDataScale := colMetadata.getScale;
1911	+	fdNullable := colMetadata.getIsNullable;
1912	+	fdIsNull := true;
1913	+	fdDataSize := colMetadata.GetSize;
1914	+	fdDataLength := 0;
1915	+	fdCodePage := CP_NONE;
1916	+
1917	+	case fdDataType of
1918	+	SQL_TIMESTAMP,
1919	+	SQL_TYPE_DATE,
1920	+	SQL_TYPE_TIME:
1921	+	fdDataSize := SizeOf(TDateTime);
1922	+	SQL_SHORT, SQL_LONG:
1923	+	begin
1924	+	if (fdDataScale = 0) then
1925	+	fdDataSize := SizeOf(Integer)
1926	+	else
1927	+	if (fdDataScale >= (-4)) then
1928	+	fdDataSize := SizeOf(Currency)
1929	+	else
1930	+	fdDataSize := SizeOf(Double);
1931	+	end;
1932	+	SQL_INT64:
1933	+	begin
1934	+	if (fdDataScale = 0) then
1935	+	fdDataSize := SizeOf(Int64)
1936	+	else
1937	+	if (fdDataScale >= (-4)) then
1938	+	fdDataSize := SizeOf(Currency)
1939	+	else
1940	+	fdDataSize := SizeOf(Double);
1941	+	end;
1942	+	SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
1943	+	fdDataSize := SizeOf(Double);
1944	+	SQL_BOOLEAN:
1945	+	fdDataSize := SizeOf(wordBool);
1946	+	SQL_VARYING,
1947	+	SQL_TEXT,
1948	+	SQL_BLOB:
1949	+	fdCodePage := Qry.Metadata[i].getCodePage;
1950	+	end;
1951	+	fdDataOfs := FRecordSize;
1952	+	Inc(FRecordSize, fdDataSize);
1953	+	end;
1954	+	end;
1955	+	end;
1956	+	end;
1957	+
1958		{ Read the record from FQSelect.Current into the record buffer
1959		Then write the buffer to in memory cache }
1960		procedure TIBCustomDataSet.FetchCurrentRecordToBuffer(Qry: TIBSQL;
1961		RecordNumber: Integer; Buffer: PChar);
1962		var
1708	–	p: PRecordData;
1963		pbd: PBlobDataArray;
1964	+	pda: PArrayDataArray;
1965		i, j: Integer;
1966	<	LocalData: Pointer;
1966	>	LocalData: PByte;
1967		LocalDate, LocalDouble: Double;
1968		LocalInt: Integer;
1969		LocalBool: wordBool;
1970		LocalInt64: Int64;
1971		LocalCurrency: Currency;
1972		FieldsLoaded: Integer;
1973	+	p: PRecordData;
1974		begin
1975	+	if RecordNumber = -1 then
1976	+	begin
1977	+	InitModelBuffer(Qry,Buffer);
1978	+	Exit;
1979	+	end;
1980		p := PRecordData(Buffer);
1981		{ Make sure blob cache is empty }
1982		pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
1983	<	if RecordNumber > -1 then
1984	<	for i := 0 to BlobFieldCount - 1 do
1985	<	pbd^[i] := nil;
1983	>	pda := PArrayDataArray(Buffer + FArrayCacheOffset);
1984	>	for i := 0 to BlobFieldCount - 1 do
1985	>	pbd^[i] := nil;
1986	>	for i := 0 to ArrayFieldCount - 1 do
1987	>	pda^[i] := nil;
1988	>
1989		{ Get record information }
1990		p^.rdBookmarkFlag := bfCurrent;
1991	<	p^.rdFieldCount := Qry.Current.Count;
1991	>	p^.rdFieldCount := Qry.FieldCount;
1992		p^.rdRecordNumber := RecordNumber;
1993		p^.rdUpdateStatus := usUnmodified;
1994		p^.rdCachedUpdateStatus := cusUnmodified;
1995		p^.rdSavedOffset := $FFFFFFFF;
1996
1997		{ Load up the fields }
1998	<	FieldsLoaded := FQSelect.Current.Count;
1998	>	FieldsLoaded := FQSelect.MetaData.Count;
1999		j := 1;
2000	<	for i := 0 to Qry.Current.Count - 1 do
2000	>	for i := 0 to Qry.FieldCount - 1 do
2001		begin
2002		if (Qry = FQSelect) then
2003		j := i + 1
2004	<	else begin
2004	>	else
2005	>	begin
2006		if FieldsLoaded = 0 then
2007		break;
2008	<	j := FQSelect.FieldIndex[Qry.Current[i].Name] + 1;
2008	>	j := FQSelect.FieldIndex[Qry[i].Name] + 1;
2009		if j < 1 then
2010		continue
2011		else
2012		Dec(FieldsLoaded);
2013		end;
2014	<	with FQSelect.Current[j - 1].Data^ do
2015	<	if aliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
2014	>	with FQSelect.MetaData[j - 1] do
2015	>	if GetAliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
2016		begin
2017	<	if sqllen <= 8 then
2018	<	p^.rdDBKey := PIBDBKEY(Qry.Current[i].AsPointer)^;
2017	>	if (GetSize <= 8) then
2018	>	p^.rdDBKey := PIBDBKEY(Qry[i].AsPointer)^;
2019		continue;
2020		end;
2021	<	if j > 0 then with p^ do
2021	>	if j > 0 then
2022		begin
2023	<	rdFields[j].fdDataType :=
2024	<	Qry.Current[i].Data^.sqltype and (not 1);
2025	<	rdFields[j].fdDataScale :=
2026	<	Qry.Current[i].Data^.sqlscale;
2027	<	rdFields[j].fdNullable :=
1763	<	(Qry.Current[i].Data^.sqltype and 1 = 1);
1764	<	rdFields[j].fdIsNull :=
1765	<	(rdFields[j].fdNullable and (Qry.Current[i].Data^.sqlind^ = -1));
1766	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1767	<	rdFields[j].fdCodePage := 0;
1768	<	{$ENDIF}
1769	<	LocalData := Qry.Current[i].Data^.sqldata;
1770	<	case rdFields[j].fdDataType of
1771	<	SQL_TIMESTAMP:
1772	<	begin
1773	<	rdFields[j].fdDataSize := SizeOf(TDateTime);
1774	<	if RecordNumber >= 0 then
1775	<	LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(Qry.Current[i].AsDateTime));
1776	<	LocalData := PChar(@LocalDate);
1777	<	end;
1778	<	SQL_TYPE_DATE:
1779	<	begin
1780	<	rdFields[j].fdDataSize := SizeOf(TDateTime);
1781	<	if RecordNumber >= 0 then
1782	<	LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Date;
1783	<	LocalData := PChar(@LocalInt);
1784	<	end;
1785	<	SQL_TYPE_TIME:
1786	<	begin
1787	<	rdFields[j].fdDataSize := SizeOf(TDateTime);
1788	<	if RecordNumber >= 0 then
1789	<	LocalInt := DateTimeToTimeStamp(Qry.Current[i].AsDateTime).Time;
1790	<	LocalData := PChar(@LocalInt);
1791	<	end;
1792	<	SQL_SHORT, SQL_LONG:
2023	>	LocalData := nil;
2024	>	with p^.rdFields[j], FFieldColumns^[j] do
2025	>	begin
2026	>	Qry.Current.GetData(i,fdIsNull,fdDataLength,LocalData);
2027	>	if not fdIsNull then
2028		begin
2029	<	if (rdFields[j].fdDataScale = 0) then
2030	<	begin
2031	<	rdFields[j].fdDataSize := SizeOf(Integer);
2032	<	if RecordNumber >= 0 then
2033	<	LocalInt := Qry.Current[i].AsLong;
2034	<	LocalData := PChar(@LocalInt);
2035	<	end
2036	<	else if (rdFields[j].fdDataScale >= (-4)) then
2037	<	begin
2038	<	rdFields[j].fdDataSize := SizeOf(Currency);
2039	<	if RecordNumber >= 0 then
2040	<	LocalCurrency := Qry.Current[i].AsCurrency;
2041	<	LocalData := PChar(@LocalCurrency);
2042	<	end
2043	<	else begin
2044	<	rdFields[j].fdDataSize := SizeOf(Double);
2045	<	if RecordNumber >= 0 then
2046	<	LocalDouble := Qry.Current[i].AsDouble;
2047	<	LocalData := PChar(@LocalDouble);
2029	>	case fdDataType of  {Get Formatted data for column types that need formatting}
2030	>	SQL_TIMESTAMP:
2031	>	begin
2032	>	LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(Qry[i].AsDateTime));
2033	>	LocalData := PByte(@LocalDate);
2034	>	end;
2035	>	SQL_TYPE_DATE:
2036	>	begin
2037	>	LocalInt := DateTimeToTimeStamp(Qry[i].AsDateTime).Date;
2038	>	LocalData := PByte(@LocalInt);
2039	>	end;
2040	>	SQL_TYPE_TIME:
2041	>	begin
2042	>	LocalInt := DateTimeToTimeStamp(Qry[i].AsDateTime).Time;
2043	>	LocalData := PByte(@LocalInt);
2044	>	end;
2045	>	SQL_SHORT, SQL_LONG:
2046	>	begin
2047	>	if (fdDataScale = 0) then
2048	>	begin
2049	>	LocalInt := Qry[i].AsLong;
2050	>	LocalData := PByte(@LocalInt);
2051	>	end
2052	>	else
2053	>	if (fdDataScale >= (-4)) then
2054	>	begin
2055	>	LocalCurrency := Qry[i].AsCurrency;
2056	>	LocalData := PByte(@LocalCurrency);
2057	>	end
2058	>	else
2059	>	begin
2060	>	LocalDouble := Qry[i].AsDouble;
2061	>	LocalData := PByte(@LocalDouble);
2062		end;
2063	<	end;
2064	<	SQL_INT64:
2065	<	begin
2066	<	if (rdFields[j].fdDataScale = 0) then
2067	<	begin
2068	<	rdFields[j].fdDataSize := SizeOf(Int64);
2069	<	if RecordNumber >= 0 then
2070	<	LocalInt64 := Qry.Current[i].AsInt64;
2071	<	LocalData := PChar(@LocalInt64);
2072	<	end
2073	<	else if (rdFields[j].fdDataScale >= (-4)) then
2074	<	begin
2075	<	rdFields[j].fdDataSize := SizeOf(Currency);
2076	<	if RecordNumber >= 0 then
2077	<	LocalCurrency := Qry.Current[i].AsCurrency;
2078	<	LocalData := PChar(@LocalCurrency);
2079	<	end
2080	<	else begin
2081	<	rdFields[j].fdDataSize := SizeOf(Double);
2082	<	if RecordNumber >= 0 then
2083	<	LocalDouble := Qry.Current[i].AsDouble;
2084	<	LocalData := PChar(@LocalDouble);
2085	<	end
2086	<	end;
2087	<	SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2088	<	begin
2089	<	rdFields[j].fdDataSize := SizeOf(Double);
2090	<	if RecordNumber >= 0 then
2091	<	LocalDouble := Qry.Current[i].AsDouble;
2092	<	LocalData := PChar(@LocalDouble);
1844	<	end;
1845	<	SQL_VARYING:
1846	<	begin
1847	<	rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
1848	<	rdFields[j].fdDataLength := isc_vax_integer(Qry.Current[i].Data^.sqldata, 2);
1849	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1850	<	TFirebirdCharacterSets.CharSetID2CodePage(Qry.Current[i].Data^.sqlsubtype and $FF,
1851	<	rdFields[j].fdCodePage);
1852	<	{$ENDIF}
1853	<	if RecordNumber >= 0 then
1854	<	begin
1855	<	if (rdFields[j].fdDataLength = 0) then
1856	<	LocalData := nil
1857	<	else
1858	<	Inc(LocalData,2);
2063	>	end;
2064	>	SQL_INT64:
2065	>	begin
2066	>	if (fdDataScale = 0) then
2067	>	begin
2068	>	LocalInt64 := Qry[i].AsInt64;
2069	>	LocalData := PByte(@LocalInt64);
2070	>	end
2071	>	else
2072	>	if (fdDataScale >= (-4)) then
2073	>	begin
2074	>	LocalCurrency := Qry[i].AsCurrency;
2075	>	LocalData := PByte(@LocalCurrency);
2076	>	end
2077	>	else
2078	>	begin
2079	>	LocalDouble := Qry[i].AsDouble;
2080	>	LocalData := PByte(@LocalDouble);
2081	>	end
2082	>	end;
2083	>	SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2084	>	begin
2085	>	LocalDouble := Qry[i].AsDouble;
2086	>	LocalData := PByte(@LocalDouble);
2087	>	end;
2088	>	SQL_BOOLEAN:
2089	>	begin
2090	>	LocalBool := Qry[i].AsBoolean;
2091	>	LocalData := PByte(@LocalBool);
2092	>	end;
2093		end;
2094	<	end;
2095	<	SQL_BOOLEAN:
2096	<	begin
2097	<	LocalBool:= false;
2098	<	rdFields[j].fdDataSize := SizeOf(wordBool);
1865	<	if RecordNumber >= 0 then
1866	<	LocalBool := Qry.Current[i].AsBoolean;
1867	<	LocalData := PChar(@LocalBool);
1868	<	end;
1869	<	SQL_TEXT:
1870	<	begin
1871	<	rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
1872	<	rdFields[j].fdDataLength := rdFields[j].fdDataSize;
1873	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1874	<	TFirebirdCharacterSets.CharSetID2CodePage(Qry.Current[i].Data^.sqlsubtype and $FF,
1875	<	rdFields[j].fdCodePage);
1876	<	{$ENDIF}
1877	<	end;
1878	<	else {  SQL_BLOB, SQL_ARRAY, SQL_QUAD }
1879	<	begin
1880	<	rdFields[j].fdDataSize := Qry.Current[i].Data^.sqllen;
1881	<	end;
1882	<	end;
1883	<	if RecordNumber < 0 then
1884	<	begin
1885	<	rdFields[j].fdIsNull := True;
1886	<	rdFields[j].fdDataOfs := FRecordSize;
1887	<	Inc(FRecordSize, rdFields[j].fdDataSize);
1888	<	end
1889	<	else begin
1890	<	if rdFields[j].fdDataType = SQL_VARYING then
1891	<	begin
1892	<	if LocalData <> nil then
1893	<	Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataLength)
2094	>
2095	>	if fdDataType = SQL_VARYING then
2096	>	Move(LocalData^, Buffer[fdDataOfs], fdDataLength)
2097	>	else
2098	>	Move(LocalData^, Buffer[fdDataOfs], fdDataSize)
2099		end
2100	+	else {Null column}
2101	+	if fdDataType = SQL_VARYING then
2102	+	FillChar(Buffer[fdDataOfs],fdDataLength,0)
2103		else
2104	<	Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataSize)
2104	>	FillChar(Buffer[fdDataOfs],fdDataSize,0);
2105		end;
2106		end;
2107		end;
2108	<	WriteRecordCache(RecordNumber, PChar(p));
2108	>	WriteRecordCache(RecordNumber, Buffer);
2109		end;
2110
2111		function TIBCustomDataSet.GetActiveBuf: PChar;
#	Line 1942 | Line 2150 | begin
2150		result := FBase.Database;
2151		end;
2152
1945	–	function TIBCustomDataSet.GetDBHandle: PISC_DB_HANDLE;
1946	–	begin
1947	–	result := FBase.DBHandle;
1948	–	end;
1949	–
2153		function TIBCustomDataSet.GetDeleteSQL: TStrings;
2154		begin
2155		result := FQDelete.SQL;
#	Line 1957 | Line 2160 | begin
2160		result := FQInsert.SQL;
2161		end;
2162
2163	<	function TIBCustomDataSet.GetSQLParams: TIBXSQLDA;
2163	>	function TIBCustomDataSet.GetSQLParams: ISQLParams;
2164		begin
2165		if not FInternalPrepared then
2166		InternalPrepare;
#	Line 1974 | Line 2177 | begin
2177		result := FQSelect.SQL;
2178		end;
2179
2180	<	function TIBCustomDataSet.GetStatementType: TIBSQLTypes;
2180	>	function TIBCustomDataSet.GetStatementType: TIBSQLStatementTypes;
2181		begin
2182	<	result := FQSelect.SQLType;
2182	>	result := FQSelect.SQLStatementType;
2183		end;
2184
2185		function TIBCustomDataSet.GetModifySQL: TStrings;
#	Line 1989 | Line 2192 | begin
2192		result := FBase.Transaction;
2193		end;
2194
1992	–	function TIBCustomDataSet.GetTRHandle: PISC_TR_HANDLE;
1993	–	begin
1994	–	result := FBase.TRHandle;
1995	–	end;
1996	–
2195		procedure TIBCustomDataSet.InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer);
2196		begin
2197		if (Assigned(FUpdateObject) and (FUpdateObject.GetSQL(ukDelete).Text <> '')) then
#	Line 2015 | Line 2213 | function TIBCustomDataSet.InternalLocate
2213		const KeyValues: Variant; Options: TLocateOptions): Boolean;
2214		var
2215		keyFieldList: TList;
2018	–	{$IFDEF NEW_TBOOKMARK }
2216		CurBookmark: TBookmark;
2020	–	{$ELSE}
2021	–	CurBookmark: string;
2022	–	{$ENDIF}
2217		fieldValue: Variant;
2218		lookupValues: array of variant;
2219		i, fieldCount: Integer;
#	Line 2101 | Line 2295 | end;
2295
2296		procedure TIBCustomDataSet.InternalPostRecord(Qry: TIBSQL; Buff: Pointer);
2297		var
2298	<	i, j, k: Integer;
2298	>	i, j, k, arr: Integer;
2299		pbd: PBlobDataArray;
2300	+	pda: PArrayDataArray;
2301		begin
2302		pbd := PBlobDataArray(PChar(Buff) + FBlobCacheOffset);
2303	<	j := 0;
2303	>	pda := PArrayDataArray(PChar(Buff) + FArrayCacheOffset);
2304	>	j := 0; arr := 0;
2305		for i := 0 to FieldCount - 1 do
2306		if Fields[i].IsBlob then
2307		begin
#	Line 2114 | Line 2310 | begin
2310		begin
2311		pbd^[j].Finalize;
2312		PISC_QUAD(
2313	<	PChar(Buff) + PRecordData(Buff)^.rdFields[k].fdDataOfs)^ :=
2313	>	PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=
2314		pbd^[j].BlobID;
2315		PRecordData(Buff)^.rdFields[k].fdIsNull := pbd^[j].Size = 0;
2316	+	end
2317	+	else
2318	+	begin
2319	+	PRecordData(Buff)^.rdFields[k].fdIsNull := true;
2320	+	with PISC_QUAD(PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ do
2321	+	begin
2322	+	gds_quad_high := 0;
2323	+	gds_quad_low := 0;
2324	+	end;
2325		end;
2326		Inc(j);
2327	+	end
2328	+	else
2329	+	if Fields[i] is TIBArrayField then
2330	+	begin
2331	+	if pda^[arr] <> nil then
2332	+	begin
2333	+	k := FMappedFieldPosition[Fields[i].FieldNo -1];
2334	+	PISC_QUAD(
2335	+	PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=  pda^[arr].ArrayIntf.GetArrayID;
2336	+	PRecordData(Buff)^.rdFields[k].fdIsNull := pda^[arr].ArrayIntf.IsEmpty;
2337	+	end;
2338	+	Inc(arr);
2339		end;
2340		if Assigned(FUpdateObject) then
2341		begin
#	Line 2167 | Line 2384 | begin
2384		SetInternalSQLParams(Qry, Buff);
2385		Qry.ExecQuery;
2386		try
2387	<	if (Qry.SQLType = SQLExecProcedure) or
2171	<	(Qry.Next <> nil) then
2387	>	if (Qry.SQLStatementType = SQLExecProcedure) or Qry.Next then
2388		begin
2389		ofs := PRecordData(Buff)^.rdSavedOffset;
2390		FetchCurrentRecordToBuffer(Qry,
#	Line 2261 | Line 2477 | begin
2477		end;
2478
2479		procedure TIBCustomDataSet.InternalPrepare;
2264	–	var
2265	–	DidActivate: Boolean;
2480		begin
2481		if FInternalPrepared then
2482		Exit;
2269	–	DidActivate := False;
2483		FBase.SetCursor;
2484		try
2485		ActivateConnection;
2486	<	DidActivate := ActivateTransaction;
2486	>	ActivateTransaction;
2487		FBase.CheckDatabase;
2488		FBase.CheckTransaction;
2489		if HasParser and (FParser.SQLText <> FQSelect.SQL.Text) then
#	Line 2308 | Line 2521 | begin
2521		end else
2522		IBError(ibxeEmptyQuery, [nil]);
2523		finally
2311	–	if DidActivate then
2312	–	DeactivateTransaction;
2524		FBase.RestoreCursor;
2525		end;
2526		end;
#	Line 2339 | Line 2550 | var
2550		begin
2551		CopyRecordBuffer(Buffer, OldBuffer);
2552		if BlobFieldCount > 0 then
2553	<	FillChar(PChar(OldBuffer)[FBlobCacheOffset], BlobFieldCount * SizeOf(TIBBlobStream),
2553	>	FillChar(PChar(OldBuffer)[FBlobCacheOffset],
2554	>	BlobFieldCount * SizeOf(TIBBlobStream) + ArrayFieldCount * SizeOf(IArray),
2555		0);
2556		end;
2557
#	Line 2416 | Line 2628 | var
2628		st: RawByteString;
2629		OldBuffer: Pointer;
2630		ts: TTimeStamp;
2631	+	Param: ISQLParam;
2632		begin
2633		if (Buffer = nil) then
2634		IBError(ibxeBufferNotSet, [nil]);
#	Line 2423 | Line 2636 | begin
2636		InternalPrepare;
2637		OldBuffer := nil;
2638		try
2639	<	for i := 0 to Qry.Params.Count - 1 do
2639	>	for i := 0 to Qry.Params.GetCount - 1 do
2640		begin
2641	<	fn := Qry.Params[i].Name;
2641	>	Param := Qry.Params[i];
2642	>	fn := Param.Name;
2643		if (Pos('OLD_', fn) = 1) then {mbcs ok}
2644		begin
2645		fn := Copy(fn, 5, Length(fn));
#	Line 2445 | Line 2659 | begin
2659		cr := Buffer;
2660		j := FQSelect.FieldIndex[fn] + 1;
2661		if (j > 0) then
2662	<	with PRecordData(cr)^ do
2662	>	with PRecordData(cr)^,rdFields[j], FFieldColumns^[j] do
2663		begin
2664	<	if Qry.Params[i].name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2664	>	if Param.name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2665		begin
2666	<	PIBDBKey(Qry.Params[i].AsPointer)^ := rdDBKey;
2666	>	PIBDBKey(Param.AsPointer)^ := rdDBKey;
2667		continue;
2668		end;
2669	<	if rdFields[j].fdIsNull then
2670	<	Qry.Params[i].IsNull := True
2669	>	if fdIsNull then
2670	>	Param.IsNull := True
2671		else begin
2672	<	Qry.Params[i].IsNull := False;
2673	<	data := cr + rdFields[j].fdDataOfs;
2674	<	case rdFields[j].fdDataType of
2672	>	Param.IsNull := False;
2673	>	data := cr + fdDataOfs;
2674	>	case fdDataType of
2675		SQL_TEXT, SQL_VARYING:
2676		begin
2677	<	SetString(st, data, rdFields[j].fdDataLength);
2678	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
2679	<	SetCodePage(st,rdFields[j].fdCodePage,false);
2466	<	{$ENDIF}
2467	<	Qry.Params[i].AsString := st;
2677	>	SetString(st, data, fdDataLength);
2678	>	SetCodePage(st,fdCodePage,false);
2679	>	Param.AsString := st;
2680		end;
2681		SQL_FLOAT, SQL_DOUBLE, SQL_D_FLOAT:
2682	<	Qry.Params[i].AsDouble := PDouble(data)^;
2682	>	Param.AsDouble := PDouble(data)^;
2683		SQL_SHORT, SQL_LONG:
2684		begin
2685	<	if rdFields[j].fdDataScale = 0 then
2686	<	Qry.Params[i].AsLong := PLong(data)^
2687	<	else if rdFields[j].fdDataScale >= (-4) then
2688	<	Qry.Params[i].AsCurrency := PCurrency(data)^
2685	>	if fdDataScale = 0 then
2686	>	Param.AsLong := PLong(data)^
2687	>	else
2688	>	if fdDataScale >= (-4) then
2689	>	Param.AsCurrency := PCurrency(data)^
2690		else
2691	<	Qry.Params[i].AsDouble := PDouble(data)^;
2691	>	Param.AsDouble := PDouble(data)^;
2692		end;
2693		SQL_INT64:
2694		begin
2695	<	if rdFields[j].fdDataScale = 0 then
2696	<	Qry.Params[i].AsInt64 := PInt64(data)^
2484	<	else if rdFields[j].fdDataScale >= (-4) then
2485	<	Qry.Params[i].AsCurrency := PCurrency(data)^
2695	>	if fdDataScale = 0 then
2696	>	Param.AsInt64 := PInt64(data)^
2697		else
2698	<	Qry.Params[i].AsDouble := PDouble(data)^;
2698	>	if fdDataScale >= (-4) then
2699	>	Param.AsCurrency := PCurrency(data)^
2700	>	else
2701	>	Param.AsDouble := PDouble(data)^;
2702		end;
2703		SQL_BLOB, SQL_ARRAY, SQL_QUAD:
2704	<	Qry.Params[i].AsQuad := PISC_QUAD(data)^;
2704	>	Param.AsQuad := PISC_QUAD(data)^;
2705		SQL_TYPE_DATE:
2706		begin
2707		ts.Date := PInt(data)^;
2708		ts.Time := 0;
2709	<	Qry.Params[i].AsDate :=
2496	<	TimeStampToDateTime(ts);
2709	>	Param.AsDate := TimeStampToDateTime(ts);
2710		end;
2711		SQL_TYPE_TIME:
2712		begin
2713		ts.Date := 0;
2714		ts.Time := PInt(data)^;
2715	<	Qry.Params[i].AsTime :=
2503	<	TimeStampToDateTime(ts);
2715	>	Param.AsTime := TimeStampToDateTime(ts);
2716		end;
2717		SQL_TIMESTAMP:
2718	<	Qry.Params[i].AsDateTime :=
2718	>	Param.AsDateTime :=
2719		TimeStampToDateTime(MSecsToTimeStamp(trunc(PDouble(data)^)));
2720		SQL_BOOLEAN:
2721	<	Qry.Params[i].AsBoolean := PWordBool(data)^;
2721	>	Param.AsBoolean := PWordBool(data)^;
2722		end;
2723		end;
2724		end;
#	Line 2662 | Line 2874 | begin
2874		Result := Assigned( FQSelect ) and FQSelect.EOF;
2875		end;
2876
2877	<	function TIBCustomDataSet.ParamByName(ParamName: String): TIBXSQLVAR;
2877	>	function TIBCustomDataSet.ParamByName(ParamName: String): ISQLParam;
2878		begin
2879		ActivateConnection;
2880		ActivateTransaction;
#	Line 2799 | Line 3011 | var
3011		Buff: PChar;
3012		bTr, bDB: Boolean;
3013		begin
3014	+	if (Field = nil) or (Field.DataSet <> self) then
3015	+	IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3016		Buff := GetActiveBuf;
3017		if Buff = nil then
3018		begin
3019		fs := TIBBlobStream.Create;
3020		fs.Mode := bmReadWrite;
3021	+	fs.Database := Database;
3022	+	fs.Transaction := Transaction;
3023	+	fs.SetField(Field);
3024		FBlobStreamList.Add(Pointer(fs));
3025		result := TIBDSBlobStream.Create(Field, fs, Mode);
3026		exit;
#	Line 2818 | Line 3035 | begin
3035		fs.Mode := bmReadWrite;
3036		fs.Database := Database;
3037		fs.Transaction := Transaction;
3038	+	fs.SetField(Field);
3039		fs.BlobID :=
3040	<	PISC_QUAD(@Buff[PRecordData(Buff)^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3040	>	PISC_QUAD(@Buff[FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3041		if (CachedUpdates) then
3042		begin
3043		bTr := not Transaction.InTransaction;
#	Line 2840 | Line 3058 | begin
3058		result := TIBDSBlobStream.Create(Field, fs, Mode);
3059		end;
3060
3061	+	function TIBCustomDataSet.GetArray(Field: TIBArrayField): IArray;
3062	+	var Buff: PChar;
3063	+	pda: PArrayDataArray;
3064	+	bTr, bDB: Boolean;
3065	+	begin
3066	+	if (Field = nil) or (Field.DataSet <> self) then
3067	+	IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3068	+	Buff := GetActiveBuf;
3069	+	if Buff = nil then
3070	+	Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3071	+	Field.FRelationName,Field.FieldName)
3072	+	else
3073	+	begin
3074	+	pda := PArrayDataArray(Buff + FArrayCacheOffset);
3075	+	if pda^[Field.FCacheOffset] = nil then
3076	+	begin
3077	+	AdjustRecordOnInsert(Buff);
3078	+	if Field.IsNull then
3079	+	Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3080	+	Field.FRelationName,Field.FieldName)
3081	+	else
3082	+	Result := Database.Attachment.OpenArray(Transaction.TransactionIntf,
3083	+	Field.FRelationName,Field.FieldName,Field.ArrayID);
3084	+	pda^[Field.FCacheOffset] := TIBArray.Create(Field,Result);
3085	+	FArrayList.Add(pda^[Field.FCacheOffset]);
3086	+	if (CachedUpdates) then
3087	+	begin
3088	+	bTr := not Transaction.InTransaction;
3089	+	bDB := not Database.Connected;
3090	+	if bDB then
3091	+	Database.Open;
3092	+	if bTr then
3093	+	Transaction.StartTransaction;
3094	+	pda^[Field.FCacheOffset].ArrayIntf.PreLoad;
3095	+	if bTr then
3096	+	Transaction.Commit;
3097	+	if bDB then
3098	+	Database.Close;
3099	+	end;
3100	+	WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3101	+	end
3102	+	else
3103	+	Result := pda^[Field.FCacheOffset].ArrayIntf;
3104	+	end;
3105	+	end;
3106	+
3107	+	procedure TIBCustomDataSet.SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
3108	+	var Buff: PChar;
3109	+	pda: PArrayDataArray;
3110	+	begin
3111	+	if (Field = nil) or (Field.DataSet <> self) then
3112	+	IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3113	+	Buff := GetActiveBuf;
3114	+	if Buff <> nil then
3115	+	begin
3116	+	AdjustRecordOnInsert(Buff);
3117	+	pda := PArrayDataArray(Buff + FArrayCacheOffset);
3118	+	pda^[Field.FCacheOffset].FArray := AnArray;
3119	+	WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3120	+	end;
3121	+	end;
3122	+
3123		function TIBCustomDataSet.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer;
3124		const
3125		CMPLess = -1;
#	Line 2920 | Line 3200 | end;
3200		procedure TIBCustomDataSet.DoBeforeClose;
3201		begin
3202		inherited DoBeforeClose;
3203	+	if FInTransactionEnd and (FCloseAction = TARollback) then
3204	+	Exit;
3205		if State in [dsInsert,dsEdit] then
3206		begin
2925	–	if FInTransactionEnd and (FCloseAction = TARollback) then
2926	–	Exit;
2927	–
3207		if DataSetCloseAction = dcSaveChanges then
3208		Post;
3209		{Note this can fail with an exception e.g. due to
3210		database validation error. In which case the dataset remains open }
3211		end;
3212	+	if FCachedUpdates and FUpdatesPending and (DataSetCloseAction = dcSaveChanges) then
3213	+	ApplyUpdates;
3214		end;
3215
3216		procedure TIBCustomDataSet.DoBeforeOpen;
#	Line 2961 | Line 3242 | end;
3242
3243		procedure TIBCustomDataSet.FetchAll;
3244		var
2964	–	{$IFDEF NEW_TBOOKMARK }
3245		CurBookmark: TBookmark;
2966	–	{$ELSE}
2967	–	CurBookmark: string;
2968	–	{$ENDIF}
3246		begin
3247		FBase.SetCursor;
3248		try
#	Line 3076 | Line 3353 | begin
3353		if result and (Buffer <> nil) then
3354		Move(Buff[1], Buffer^, Field.DataSize);
3355		end
3356	<	else if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3356	>	else
3357	>	if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3358		(FMappedFieldPosition[Field.FieldNo - 1] <= CurrentRecord^.rdFieldCount) then
3359	+	with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]],
3360	+	FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]] do
3361		begin
3362	<	result := not CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull;
3362	>	result := not fdIsNull;
3363		if result and (Buffer <> nil) then
3084	–	with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]] do
3364		begin
3365	<	Data := Buff + CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs;
3365	>	Data := Buff + fdDataOfs;
3366		if (fdDataType = SQL_VARYING) or (fdDataType = SQL_TEXT) then
3367		begin
3368		if fdDataLength < Field.DataSize then
#	Line 3154 | Line 3433 | begin
3433		if FCurrentRecord < FRecordCount then
3434		ReadRecordCache(FCurrentRecord, Buffer, False)
3435		else begin
3436	<	while (not FQSelect.EOF) and
3158	<	(FQSelect.Next <> nil) and
3436	>	while (not FQSelect.EOF) and FQSelect.Next  and
3437		(FCurrentRecord >= FRecordCount) do begin
3438		FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
3439		Inc(FRecordCount);
#	Line 3266 | Line 3544 | procedure TIBCustomDataSet.InternalCance
3544		var
3545		Buff: PChar;
3546		CurRec: Integer;
3547	+	pda: PArrayDataArray;
3548	+	i: integer;
3549		begin
3550		inherited InternalCancel;
3551		Buff := GetActiveBuf;
3552	<	if Buff <> nil then begin
3552	>	if Buff <> nil then
3553	>	begin
3554	>	pda := PArrayDataArray(Buff + FArrayCacheOffset);
3555	>	for i := 0 to ArrayFieldCount - 1 do
3556	>	pda^[i].ArrayIntf.CancelChanges;
3557		CurRec := FCurrentRecord;
3558		AdjustRecordOnInsert(Buff);
3559		if (State = dsEdit) then begin
#	Line 3292 | Line 3576 | begin
3576		DeactivateTransaction;
3577		FQSelect.Close;
3578		ClearBlobCache;
3579	+	ClearArrayCache;
3580		FreeRecordBuffer(FModelBuffer);
3581		FreeRecordBuffer(FOldBuffer);
3582		FCurrentRecord := -1;
#	Line 3307 | Line 3592 | begin
3592		FOBEnd := 0;
3593		FreeMem(FBufferCache);
3594		FBufferCache := nil;
3595	+	FreeMem(FFieldColumns);
3596	+	FFieldColumns := nil;
3597		FreeMem(FOldBufferCache);
3598		FOldBufferCache := nil;
3599		BindFields(False);
#	Line 3384 | Line 3671 | const
3671		var
3672		FieldType: TFieldType;
3673		FieldSize: Word;
3674	<	charSetID: integer;
3674	>	charSetID: short;
3675		CharSetSize: integer;
3676		CharSetName: RawByteString;
3390	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3677		FieldCodePage: TSystemCodePage;
3392	–	{$ENDIF}
3678		FieldNullable : Boolean;
3679		i, FieldPosition, FieldPrecision: Integer;
3680		FieldAliasName, DBAliasName: string;
3681	<	RelationName, FieldName: string;
3681	>	aRelationName, FieldName: string;
3682		Query : TIBSQL;
3683		FieldIndex: Integer;
3684		FRelationNodes : TRelationNode;
3685	+	aArrayDimensions: integer;
3686	+	aArrayBounds: TArrayBounds;
3687	+	ArrayMetaData: IArrayMetaData;
3688
3689		function Add_Node(Relation, Field : String) : TRelationNode;
3690		var
#	Line 3494 | Line 3782 | var
3782		begin
3783		FRelationNodes := TRelationNode.Create;
3784		FNeedsRefresh := False;
3785	<	Database.InternalTransaction.StartTransaction;
3785	>	if not Database.InternalTransaction.InTransaction then
3786	>	Database.InternalTransaction.StartTransaction;
3787		Query := TIBSQL.Create(self);
3788		try
3789		Query.Database := DataBase;
#	Line 3502 | Line 3791 | begin
3791		FieldDefs.BeginUpdate;
3792		FieldDefs.Clear;
3793		FieldIndex := 0;
3794	<	if (Length(FMappedFieldPosition) < SourceQuery.Current.Count) then
3795	<	SetLength(FMappedFieldPosition, SourceQuery.Current.Count);
3794	>	if (Length(FMappedFieldPosition) < SourceQuery.MetaData.Count) then
3795	>	SetLength(FMappedFieldPosition, SourceQuery.MetaData.Count);
3796		Query.SQL.Text := DefaultSQL;
3797		Query.Prepare;
3798	<	SetLength(FAliasNameMap, SourceQuery.Current.Count);
3799	<	SetLength(FAliasNameList, SourceQuery.Current.Count);
3800	<	for i := 0 to SourceQuery.Current.Count - 1 do
3801	<	with SourceQuery.Current[i].Data^ do
3798	>	SetLength(FAliasNameMap, SourceQuery.MetaData.Count);
3799	>	SetLength(FAliasNameList, SourceQuery.MetaData.Count);
3800	>	for i := 0 to SourceQuery.MetaData.GetCount - 1 do
3801	>	with SourceQuery.MetaData[i] do
3802		begin
3803		{ Get the field name }
3804	<	FieldAliasName := SourceQuery.Current[i].Name;
3805	<	SetString(DBAliasName, aliasname, aliasname_length);
3806	<	SetString(RelationName, relname, relname_length);
3807	<	SetString(FieldName, sqlname, sqlname_length);
3804	>	FieldAliasName := GetName;
3805	>	DBAliasName := GetAliasname;
3806	>	aRelationName := getRelationName;
3807	>	FieldName := getSQLName;
3808		FAliasNameList[i] := DBAliasName;
3809		FieldSize := 0;
3810		FieldPrecision := 0;
3811	<	FieldNullable := SourceQuery.Current[i].IsNullable;
3811	>	FieldNullable := IsNullable;
3812		CharSetSize := 0;
3813		CharSetName := '';
3525	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3814		FieldCodePage := CP_NONE;
3815	<	{$ENDIF}
3816	<	case sqltype and not 1 of
3815	>	aArrayDimensions := 0;
3816	>	SetLength(aArrayBounds,0);
3817	>	case SQLType of
3818		{ All VARCHAR's must be converted to strings before recording
3819		their values }
3820		SQL_VARYING, SQL_TEXT:
3821		begin
3822	<	CharSetID := SourceQuery.Current[i].GetCharSetID;
3823	<	TFirebirdCharacterSets.CharSetWidth(CharSetID,CharSetSize);
3824	<	CharSetName := TFirebirdCharacterSets.GetCharsetName(CharSetID);
3825	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3537	<	TFirebirdCharacterSets.CharSetID2CodePage(CharSetID,FieldCodePage);
3538	<	{$ENDIF}
3539	<	FieldSize := sqllen;
3822	>	FirebirdAPI.CharSetWidth(getCharSetID,CharSetSize);
3823	>	CharSetName := FirebirdAPI.GetCharsetName(getCharSetID);
3824	>	FirebirdAPI.CharSetID2CodePage(getCharSetID,FieldCodePage);
3825	>	FieldSize := GetSize div CharSetSize;
3826		FieldType := ftString;
3827		end;
3828		{ All Doubles/Floats should be cast to doubles }
#	Line 3544 | Line 3830 | begin
3830		FieldType := ftFloat;
3831		SQL_SHORT:
3832		begin
3833	<	if (sqlscale = 0) then
3833	>	if (getScale = 0) then
3834		FieldType := ftSmallInt
3835		else begin
3836		FieldType := ftBCD;
3837		FieldPrecision := 4;
3838	<	FieldSize := -sqlscale;
3838	>	FieldSize := -getScale;
3839		end;
3840		end;
3841		SQL_LONG:
3842		begin
3843	<	if (sqlscale = 0) then
3843	>	if (getScale = 0) then
3844		FieldType := ftInteger
3845	<	else if (sqlscale >= (-4)) then
3845	>	else if (getScale >= (-4)) then
3846		begin
3847		FieldType := ftBCD;
3848		FieldPrecision := 9;
3849	<	FieldSize := -sqlscale;
3849	>	FieldSize := -getScale;
3850		end
3851		else
3852		if Database.SQLDialect = 1 then
#	Line 3572 | Line 3858 | begin
3858		begin
3859		FieldType := ftFMTBCD;
3860		FieldPrecision := 9;
3861	<	FieldSize := -sqlscale;
3861	>	FieldSize := -getScale;
3862		end;
3863		end;
3864
3865		SQL_INT64:
3866		begin
3867	<	if (sqlscale = 0) then
3867	>	if (getScale = 0) then
3868		FieldType := ftLargeInt
3869	<	else if (sqlscale >= (-4)) then
3869	>	else if (getScale >= (-4)) then
3870		begin
3871		FieldType := ftBCD;
3872		FieldPrecision := 18;
3873	<	FieldSize := -sqlscale;
3873	>	FieldSize := -getScale;
3874		end
3875		else
3876		FieldType := ftFloat
#	Line 3595 | Line 3881 | begin
3881		SQL_BLOB:
3882		begin
3883		FieldSize := sizeof (TISC_QUAD);
3884	<	if (sqlsubtype = 1) then
3884	>	if (getSubtype = 1) then
3885		begin
3886	<	CharSetID := SourceQuery.Current[i].GetCharSetID;
3887	<	TFirebirdCharacterSets.CharSetWidth(CharSetID,CharSetSize);
3888	<	CharSetName := TFirebirdCharacterSets.GetCharsetName(CharSetID);
3603	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3604	<	TFirebirdCharacterSets.CharSetID2CodePage(CharSetID,FieldCodePage);
3605	<	{$ENDIF}
3886	>	FirebirdAPI.CharSetWidth(getCharSetID,CharSetSize);
3887	>	CharSetName := FirebirdAPI.GetCharsetName(getCharSetID);
3888	>	FirebirdAPI.CharSetID2CodePage(getCharSetID,FieldCodePage);
3889		FieldType := ftMemo;
3890		end
3891		else
#	Line 3611 | Line 3894 | begin
3894		SQL_ARRAY:
3895		begin
3896		FieldSize := sizeof (TISC_QUAD);
3897	<	FieldType := ftUnknown;
3897	>	FieldType := ftArray;
3898	>	ArrayMetaData := GetArrayMetaData;
3899	>	if ArrayMetaData <> nil then
3900	>	begin
3901	>	aArrayDimensions := ArrayMetaData.GetDimensions;
3902	>	aArrayBounds := ArrayMetaData.GetBounds;
3903	>	end;
3904		end;
3905		SQL_BOOLEAN:
3906		FieldType:= ftBoolean;
#	Line 3630 | Line 3919 | begin
3919		Size := FieldSize;
3920		Precision := FieldPrecision;
3921		Required := not FieldNullable;
3922	+	RelationName := aRelationName;
3923		InternalCalcField := False;
3924		CharacterSetSize := CharSetSize;
3925		CharacterSetName := CharSetName;
3636	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3926		CodePage := FieldCodePage;
3927	<	{$ENDIF}
3927	>	ArrayDimensions := aArrayDimensions;
3928	>	ArrayBounds := aArrayBounds;
3929		if (FieldName <> '') and (RelationName <> '') then
3930		begin
3931		if Has_COMPUTED_BLR(RelationName, FieldName) then
#	Line 3663 | Line 3953 | begin
3953		FreeNodes;
3954		Database.InternalTransaction.Commit;
3955		FieldDefs.EndUpdate;
3956	+	FieldDefs.Updated := true;
3957		end;
3958		end;
3959
#	Line 3680 | Line 3971 | begin
3971		else begin
3972		Buffer := AllocRecordBuffer;
3973		try
3974	<	while FQSelect.Next <> nil do
3974	>	while FQSelect.Next do
3975		begin
3976		FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
3977		Inc(FRecordCount);
#	Line 3695 | Line 3986 | end;
3986		procedure TIBCustomDataSet.InternalSetParamsFromCursor;
3987		var
3988		i: Integer;
3989	<	cur_param: TIBXSQLVAR;
3989	>	cur_param: ISQLParam;
3990		cur_field: TField;
3991		s: TStream;
3992		begin
#	Line 3703 | Line 3994 | begin
3994		IBError(ibxeEmptyQuery, [nil]);
3995		if not FInternalPrepared then
3996		InternalPrepare;
3997	<	if (SQLParams.Count > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
3997	>	if (SQLParams.GetCount > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
3998		begin
3999	<	for i := 0 to SQLParams.Count - 1 do
3999	>	for i := 0 to SQLParams.GetCount - 1 do
4000		begin
4001		cur_field := DataSource.DataSet.FindField(SQLParams[i].Name);
4002		cur_param := SQLParams[i];
#	Line 3739 | Line 4030 | begin
4030		try
4031		s := DataSource.DataSet.
4032		CreateBlobStream(cur_field, bmRead);
4033	<	cur_param.LoadFromStream(s);
4033	>	cur_param.AsBlob := TIBDSBlobStream(s).FBlobStream.Blob;
4034		finally
4035		s.free;
4036		end;
4037		end;
4038	+	ftArray:
4039	+	cur_param.AsArray := TIBArrayField(cur_field).ArrayIntf;
4040		else
4041		IBError(ibxeNotSupported, [nil]);
4042		end;
#	Line 3776 | Line 4069 | procedure TIBCustomDataSet.InternalOpen;
4069		result := SizeOf(TRecordData) + ((n - 1) * SizeOf(TFieldData));
4070		end;
4071
3779	–	function GetFieldDef(aFieldNo: integer): TIBFieldDef;
3780	–	var i: integer;
3781	–	begin
3782	–	Result := nil;
3783	–	for i := 0 to FieldDefs.Count - 1 do
3784	–	if FieldDefs[i].FieldNo = aFieldNo then
3785	–	begin
3786	–	Result := TIBFieldDef(FieldDefs[i]);
3787	–	break;
3788	–	end;
3789	–	end;
3790	–
3791	–	procedure SetExtendedProperties;
3792	–	var i: integer;
3793	–	IBFieldDef: TIBFieldDef;
3794	–	begin
3795	–	for i := 0 to Fields.Count - 1 do
3796	–	if Fields[i].FieldNo > 0 then
3797	–	begin
3798	–	if(Fields[i] is TIBStringField) then
3799	–	with TIBStringField(Fields[i]) do
3800	–	begin
3801	–	IBFieldDef := GetFieldDef(FieldNo);
3802	–	if IBFieldDef <> nil then
3803	–	begin
3804	–	CharacterSetSize := IBFieldDef.CharacterSetSize;
3805	–	CharacterSetName := IBFieldDef.CharacterSetName;
3806	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3807	–	CodePage := IBFieldDef.CodePage;
3808	–	{$ENDIF}
3809	–	end;
3810	–	end
3811	–	else
3812	–	if(Fields[i] is TIBMemoField) then
3813	–	with TIBMemoField(Fields[i]) do
3814	–	begin
3815	–	IBFieldDef := GetFieldDef(FieldNo);
3816	–	if IBFieldDef <> nil then
3817	–	begin
3818	–	CharacterSetSize := IBFieldDef.CharacterSetSize;
3819	–	CharacterSetName := IBFieldDef.CharacterSetName;
3820	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3821	–	CodePage := IBFieldDef.CodePage;
3822	–	{$ENDIF}
3823	–	end;
3824	–	end
3825	–	end
3826	–	end;
3827	–
4072		begin
4073		FBase.SetCursor;
4074		try
#	Line 3834 | Line 4078 | begin
4078		IBError(ibxeEmptyQuery, [nil]);
4079		if not FInternalPrepared then
4080		InternalPrepare;
4081	<	if FQSelect.SQLType = SQLSelect then
4081	>	if FQSelect.SQLStatementType = SQLSelect then
4082		begin
4083		if DefaultFields then
4084		CreateFields;
4085	+	FArrayFieldCount := 0;
4086		BindFields(True);
3842	–	SetExtendedProperties;
4087		FCurrentRecord := -1;
4088		FQSelect.ExecQuery;
4089		FOpen := FQSelect.Open;
#	Line 3850 | Line 4094 | begin
4094		3. After the dummy fetch, FRecordSize will be appropriately
4095		adjusted to reflect the additional "weight" of the field
4096		data.
4097	<	4. Set up the FCalcFieldsOffset, FBlobCacheOffset and FRecordBufferSize.
4097	>	4. Set up the FCalcFieldsOffset, FBlobCacheOffset, FArrayCacheOffset and FRecordBufferSize.
4098		5. Now, with the BufferSize available, allocate memory for chunks of records
4099		6. Re-allocate the model buffer, accounting for the new
4100		FRecordBufferSize.
4101		7. Finally, calls to AllocRecordBuffer will work!.
4102		}
4103		{Step 1}
4104	<	FRecordSize := RecordDataLength(FQSelect.Current.Count);
4104	>	FRecordSize := RecordDataLength(FQSelect.FieldCount);
4105		{Step 2, 3}
4106	+	GetMem(FFieldColumns,sizeof(TFieldColumns) * (FQSelect.FieldCount));
4107		IBAlloc(FModelBuffer, 0, FRecordSize);
4108	<	FetchCurrentRecordToBuffer(FQSelect, -1, FModelBuffer);
4108	>	InitModelBuffer(FQSelect, FModelBuffer);
4109		{Step 4}
4110		FCalcFieldsOffset := FRecordSize;
4111		FBlobCacheOffset := FCalcFieldsOffset + CalcFieldsSize;
4112	<	FRecordBufferSize := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4112	>	FArrayCacheOffset := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4113	>	FRecordBufferSize := FArrayCacheOffset + (ArrayFieldCount * sizeof(IArray));
4114		{Step 5}
4115		if UniDirectional then
4116		FBufferChunkSize := FRecordBufferSize * UniCache
#	Line 3880 | Line 4126 | begin
4126		FCacheSize := FBufferChunkSize;
4127		FOldCacheSize := FBufferChunkSize;
4128		{Step 6}
4129	<	IBAlloc(FModelBuffer, RecordDataLength(FQSelect.Current.Count),
4129	>	IBAlloc(FModelBuffer, RecordDataLength(FQSelect.FieldCount),
4130		FRecordBufferSize);
4131		{Step 7}
4132		FOldBuffer := AllocRecordBuffer;
#	Line 3978 | Line 4224 | end;
4224		function TIBCustomDataSet.Locate(const KeyFields: string; const KeyValues: Variant;
4225		Options: TLocateOptions): Boolean;
4226		var
3981	–	{$IFDEF NEW_TBOOKMARK }
4227		CurBookmark: TBookmark;
3983	–	{$ELSE}
3984	–	CurBookmark: string;
3985	–	{$ENDIF}
4228		begin
4229		DisableControls;
4230		try
#	Line 4000 | Line 4242 | function TIBCustomDataSet.Lookup(const K
4242		const ResultFields: string): Variant;
4243		var
4244		fl: TList;
4003	–	{$IFDEF NEW_TBOOKMARK }
4245		CurBookmark: TBookmark;
4005	–	{$ELSE}
4006	–	CurBookmark: string;
4007	–	{$ENDIF}
4246		begin
4247		DisableControls;
4248		fl := TList.Create;
#	Line 4077 | Line 4315 | begin
4315		MappedFieldPos := FMappedFieldPosition[Field.FieldNo - 1];
4316		if (MappedFieldPos > 0) and
4317		(MappedFieldPos <= rdFieldCount) then
4318	+	with rdFields[MappedFieldPos], FFieldColumns^[MappedFieldPos] do
4319		begin
4320		Field.Validate(Buffer);
4321		if (Buffer = nil) or
4322		(Field is TIBStringField) and (PChar(Buffer)[0] = #0) then
4323	<	rdFields[MappedFieldPos].fdIsNull := True
4324	<	else begin
4325	<	Move(Buffer^, Buff[rdFields[MappedFieldPos].fdDataOfs],
4326	<	rdFields[MappedFieldPos].fdDataSize);
4327	<	if (rdFields[MappedFieldPos].fdDataType = SQL_TEXT) or
4328	<	(rdFields[MappedFieldPos].fdDataType = SQL_VARYING) then
4329	<	rdFields[MappedFieldPos].fdDataLength := StrLen(PChar(Buffer));
4091	<	rdFields[MappedFieldPos].fdIsNull := False;
4323	>	fdIsNull := True
4324	>	else
4325	>	begin
4326	>	Move(Buffer^, Buff[fdDataOfs],fdDataSize);
4327	>	if (fdDataType = SQL_TEXT) or (fdDataType = SQL_VARYING) then
4328	>	fdDataLength := StrLen(PChar(Buffer));
4329	>	fdIsNull := False;
4330		if rdUpdateStatus = usUnmodified then
4331		begin
4332		if CachedUpdates then
#	Line 4189 | Line 4427 | begin
4427		if FInternalPrepared then
4428		begin
4429		CheckDatasetClosed;
4430	+	if FDidActivate then
4431	+	DeactivateTransaction;
4432		FieldDefs.Clear;
4433		FieldDefs.Updated := false;
4434		FInternalPrepared := False;
#	Line 4209 | Line 4449 | begin
4449		IBError(ibxeEmptyQuery, [nil]);
4450		if not FInternalPrepared then
4451		InternalPrepare;
4452	<	if FQSelect.SQLType = SQLSelect then
4452	>	if FQSelect.SQLStatementType = SQLSelect then
4453		begin
4454		IBError(ibxeIsASelectStatement, [nil]);
4455		end
#	Line 4222 | Line 4462 | begin
4462		end;
4463		end;
4464
4465	<	function TIBCustomDataSet.GetSelectStmtHandle: TISC_STMT_HANDLE;
4465	>	function TIBCustomDataSet.GetSelectStmtIntf: IStatement;
4466		begin
4467	<	Result := FQSelect.Handle;
4467	>	Result := FQSelect.Statement;
4468		end;
4469
4470		function TIBCustomDataSet.GetParser: TSelectSQLParser;
#	Line 4279 | Line 4519 | end;
4519
4520		{ TIBDataSet IProviderSupport }
4521
4522	<	(*procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4522	>	procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4523		begin
4524		if Commit then
4525		Transaction.Commit else
#	Line 4442 | Line 4682 | begin
4682		if not FQSelect.Prepared then
4683		FQSelect.Prepare;
4684		Result := FQSelect.UniqueRelationName;
4685	<	end;*)
4685	>	end;
4686
4687		procedure TIBDataSet.BatchInput(InputObject: TIBBatchInput);
4688		begin

Diff Legend

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