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 45 by tony, Tue Dec 6 10:33:46 2016 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;
934	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1092		if StringCodePage(Value) <> 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 1051 | Line 1211 | begin
1211		IBAlloc(Buffer, 0, Size + 1);
1212		try
1213		s := Value;
1054	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
1214		if StringCodePage(s) <> CodePage then
1215		SetCodePage(s,CodePage,CodePage<>CP_NONE);
1057	–	{$ENDIF}
1216		StrLCopy(Buffer, PChar(s), Size);
1217		if Transliterate then
1218		DataSet.Translate(Buffer, Buffer, True);
#	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 1700 | Line 1865 | begin
1865		FTransactionFree(Sender);
1866		end;
1867
1868	+	procedure TIBCustomDataSet.InitModelBuffer(Qry: TIBSQL; Buffer: PChar);
1869	+	var i, j: Integer;
1870	+	FieldsLoaded: integer;
1871	+	p: PRecordData;
1872	+	colMetadata: IColumnMetaData;
1873	+	begin
1874	+	p := PRecordData(Buffer);
1875	+	{ Get record information }
1876	+	p^.rdBookmarkFlag := bfCurrent;
1877	+	p^.rdFieldCount := Qry.FieldCount;
1878	+	p^.rdRecordNumber := -1;
1879	+	p^.rdUpdateStatus := usUnmodified;
1880	+	p^.rdCachedUpdateStatus := cusUnmodified;
1881	+	p^.rdSavedOffset := $FFFFFFFF;
1882	+
1883	+	{ Load up the fields }
1884	+	FieldsLoaded := FQSelect.MetaData.Count;
1885	+	j := 1;
1886	+	for i := 0 to Qry.MetaData.Count - 1 do
1887	+	begin
1888	+	if (Qry = FQSelect) then
1889	+	j := i + 1
1890	+	else
1891	+	begin
1892	+	if FieldsLoaded = 0 then
1893	+	break;
1894	+	j := FQSelect.FieldIndex[Qry[i].Name] + 1;
1895	+	if j < 1 then
1896	+	continue
1897	+	else
1898	+	Dec(FieldsLoaded);
1899	+	end;
1900	+	if j > 0 then
1901	+	begin
1902	+	colMetadata := Qry.MetaData[i];
1903	+	with p^.rdFields[j], FFieldColumns^[j] do
1904	+	begin
1905	+	fdDataType := colMetadata.GetSQLType;
1906	+	if fdDataType = SQL_BLOB then
1907	+	fdDataScale := 0
1908	+	else
1909	+	fdDataScale := colMetadata.getScale;
1910	+	fdNullable := colMetadata.getIsNullable;
1911	+	fdIsNull := true;
1912	+	fdDataSize := colMetadata.GetSize;
1913	+	fdDataLength := 0;
1914	+	fdCodePage := CP_NONE;
1915	+
1916	+	case fdDataType of
1917	+	SQL_TIMESTAMP,
1918	+	SQL_TYPE_DATE,
1919	+	SQL_TYPE_TIME:
1920	+	fdDataSize := SizeOf(TDateTime);
1921	+	SQL_SHORT, SQL_LONG:
1922	+	begin
1923	+	if (fdDataScale = 0) then
1924	+	fdDataSize := SizeOf(Integer)
1925	+	else
1926	+	if (fdDataScale >= (-4)) then
1927	+	fdDataSize := SizeOf(Currency)
1928	+	else
1929	+	fdDataSize := SizeOf(Double);
1930	+	end;
1931	+	SQL_INT64:
1932	+	begin
1933	+	if (fdDataScale = 0) then
1934	+	fdDataSize := SizeOf(Int64)
1935	+	else
1936	+	if (fdDataScale >= (-4)) then
1937	+	fdDataSize := SizeOf(Currency)
1938	+	else
1939	+	fdDataSize := SizeOf(Double);
1940	+	end;
1941	+	SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
1942	+	fdDataSize := SizeOf(Double);
1943	+	SQL_BOOLEAN:
1944	+	fdDataSize := SizeOf(wordBool);
1945	+	SQL_VARYING,
1946	+	SQL_TEXT,
1947	+	SQL_BLOB:
1948	+	fdCodePage := Qry.Metadata[i].getCodePage;
1949	+	end;
1950	+	fdDataOfs := FRecordSize;
1951	+	Inc(FRecordSize, fdDataSize);
1952	+	end;
1953	+	end;
1954	+	end;
1955	+	end;
1956	+
1957		{ Read the record from FQSelect.Current into the record buffer
1958		Then write the buffer to in memory cache }
1959		procedure TIBCustomDataSet.FetchCurrentRecordToBuffer(Qry: TIBSQL;
1960		RecordNumber: Integer; Buffer: PChar);
1961		var
1708	–	p: PRecordData;
1962		pbd: PBlobDataArray;
1963	+	pda: PArrayDataArray;
1964		i, j: Integer;
1965	<	LocalData: Pointer;
1965	>	LocalData: PChar;
1966		LocalDate, LocalDouble: Double;
1967		LocalInt: Integer;
1968		LocalBool: wordBool;
1969		LocalInt64: Int64;
1970		LocalCurrency: Currency;
1971		FieldsLoaded: Integer;
1972	+	p: PRecordData;
1973		begin
1974	+	if RecordNumber = -1 then
1975	+	begin
1976	+	InitModelBuffer(Qry,Buffer);
1977	+	Exit;
1978	+	end;
1979		p := PRecordData(Buffer);
1980		{ Make sure blob cache is empty }
1981		pbd := PBlobDataArray(Buffer + FBlobCacheOffset);
1982	<	if RecordNumber > -1 then
1983	<	for i := 0 to BlobFieldCount - 1 do
1984	<	pbd^[i] := nil;
1982	>	pda := PArrayDataArray(Buffer + FArrayCacheOffset);
1983	>	for i := 0 to BlobFieldCount - 1 do
1984	>	pbd^[i] := nil;
1985	>	for i := 0 to ArrayFieldCount - 1 do
1986	>	pda^[i] := nil;
1987	>
1988		{ Get record information }
1989		p^.rdBookmarkFlag := bfCurrent;
1990	<	p^.rdFieldCount := Qry.Current.Count;
1990	>	p^.rdFieldCount := Qry.FieldCount;
1991		p^.rdRecordNumber := RecordNumber;
1992		p^.rdUpdateStatus := usUnmodified;
1993		p^.rdCachedUpdateStatus := cusUnmodified;
1994		p^.rdSavedOffset := $FFFFFFFF;
1995
1996		{ Load up the fields }
1997	<	FieldsLoaded := FQSelect.Current.Count;
1997	>	FieldsLoaded := FQSelect.MetaData.Count;
1998		j := 1;
1999	<	for i := 0 to Qry.Current.Count - 1 do
1999	>	for i := 0 to Qry.FieldCount - 1 do
2000		begin
2001		if (Qry = FQSelect) then
2002		j := i + 1
2003	<	else begin
2003	>	else
2004	>	begin
2005		if FieldsLoaded = 0 then
2006		break;
2007	<	j := FQSelect.FieldIndex[Qry.Current[i].Name] + 1;
2007	>	j := FQSelect.FieldIndex[Qry[i].Name] + 1;
2008		if j < 1 then
2009		continue
2010		else
2011		Dec(FieldsLoaded);
2012		end;
2013	<	with FQSelect.Current[j - 1].Data^ do
2014	<	if aliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
2013	>	with FQSelect.MetaData[j - 1] do
2014	>	if GetAliasname = 'IBX_INTERNAL_DBKEY' then {do not localize}
2015		begin
2016	<	if sqllen <= 8 then
2017	<	p^.rdDBKey := PIBDBKEY(Qry.Current[i].AsPointer)^;
2016	>	if (GetSize <= 8) then
2017	>	p^.rdDBKey := PIBDBKEY(Qry[i].AsPointer)^;
2018		continue;
2019		end;
2020	<	if j > 0 then with p^ do
2020	>	if j > 0 then
2021		begin
2022	<	rdFields[j].fdDataType :=
2023	<	Qry.Current[i].Data^.sqltype and (not 1);
2024	<	rdFields[j].fdDataScale :=
2025	<	Qry.Current[i].Data^.sqlscale;
2026	<	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:
2022	>	LocalData := nil;
2023	>	with p^.rdFields[j], FFieldColumns^[j] do
2024	>	begin
2025	>	Qry.Current.GetData(i,fdIsNull,fdDataLength,LocalData);
2026	>	if not fdIsNull then
2027		begin
2028	<	if (rdFields[j].fdDataScale = 0) then
2029	<	begin
2030	<	rdFields[j].fdDataSize := SizeOf(Integer);
2031	<	if RecordNumber >= 0 then
2032	<	LocalInt := Qry.Current[i].AsLong;
2033	<	LocalData := PChar(@LocalInt);
2034	<	end
2035	<	else if (rdFields[j].fdDataScale >= (-4)) then
2036	<	begin
2037	<	rdFields[j].fdDataSize := SizeOf(Currency);
2038	<	if RecordNumber >= 0 then
2039	<	LocalCurrency := Qry.Current[i].AsCurrency;
2040	<	LocalData := PChar(@LocalCurrency);
2041	<	end
2042	<	else begin
2043	<	rdFields[j].fdDataSize := SizeOf(Double);
2044	<	if RecordNumber >= 0 then
2045	<	LocalDouble := Qry.Current[i].AsDouble;
2046	<	LocalData := PChar(@LocalDouble);
2028	>	case fdDataType of  {Get Formatted data for column types that need formatting}
2029	>	SQL_TIMESTAMP:
2030	>	begin
2031	>	LocalDate := TimeStampToMSecs(DateTimeToTimeStamp(Qry[i].AsDateTime));
2032	>	LocalData := PChar(@LocalDate);
2033	>	end;
2034	>	SQL_TYPE_DATE:
2035	>	begin
2036	>	LocalInt := DateTimeToTimeStamp(Qry[i].AsDateTime).Date;
2037	>	LocalData := PChar(@LocalInt);
2038	>	end;
2039	>	SQL_TYPE_TIME:
2040	>	begin
2041	>	LocalInt := DateTimeToTimeStamp(Qry[i].AsDateTime).Time;
2042	>	LocalData := PChar(@LocalInt);
2043	>	end;
2044	>	SQL_SHORT, SQL_LONG:
2045	>	begin
2046	>	if (fdDataScale = 0) then
2047	>	begin
2048	>	LocalInt := Qry[i].AsLong;
2049	>	LocalData := PChar(@LocalInt);
2050	>	end
2051	>	else
2052	>	if (fdDataScale >= (-4)) then
2053	>	begin
2054	>	LocalCurrency := Qry[i].AsCurrency;
2055	>	LocalData := PChar(@LocalCurrency);
2056	>	end
2057	>	else
2058	>	begin
2059	>	LocalDouble := Qry[i].AsDouble;
2060	>	LocalData := PChar(@LocalDouble);
2061		end;
2062	<	end;
2063	<	SQL_INT64:
2064	<	begin
2065	<	if (rdFields[j].fdDataScale = 0) then
2066	<	begin
2067	<	rdFields[j].fdDataSize := SizeOf(Int64);
2068	<	if RecordNumber >= 0 then
2069	<	LocalInt64 := Qry.Current[i].AsInt64;
2070	<	LocalData := PChar(@LocalInt64);
2071	<	end
2072	<	else if (rdFields[j].fdDataScale >= (-4)) then
2073	<	begin
2074	<	rdFields[j].fdDataSize := SizeOf(Currency);
2075	<	if RecordNumber >= 0 then
2076	<	LocalCurrency := Qry.Current[i].AsCurrency;
2077	<	LocalData := PChar(@LocalCurrency);
2078	<	end
1831	<	else begin
1832	<	rdFields[j].fdDataSize := SizeOf(Double);
1833	<	if RecordNumber >= 0 then
1834	<	LocalDouble := Qry.Current[i].AsDouble;
2062	>	end;
2063	>	SQL_INT64:
2064	>	begin
2065	>	if (fdDataScale = 0) then
2066	>	begin
2067	>	LocalInt64 := Qry[i].AsInt64;
2068	>	LocalData := PChar(@LocalInt64);
2069	>	end
2070	>	else
2071	>	if (fdDataScale >= (-4)) then
2072	>	begin
2073	>	LocalCurrency := Qry[i].AsCurrency;
2074	>	LocalData := PChar(@LocalCurrency);
2075	>	end
2076	>	else
2077	>	begin
2078	>	LocalDouble := Qry[i].AsDouble;
2079		LocalData := PChar(@LocalDouble);
2080	<	end
2081	<	end;
2082	<	SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2083	<	begin
2084	<	rdFields[j].fdDataSize := SizeOf(Double);
2085	<	if RecordNumber >= 0 then
2086	<	LocalDouble := Qry.Current[i].AsDouble;
2087	<	LocalData := PChar(@LocalDouble);
2088	<	end;
2089	<	SQL_VARYING:
2090	<	begin
2091	<	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);
2080	>	end
2081	>	end;
2082	>	SQL_DOUBLE, SQL_FLOAT, SQL_D_FLOAT:
2083	>	begin
2084	>	LocalDouble := Qry[i].AsDouble;
2085	>	LocalData := PChar(@LocalDouble);
2086	>	end;
2087	>	SQL_BOOLEAN:
2088	>	begin
2089	>	LocalBool := Qry[i].AsBoolean;
2090	>	LocalData := PChar(@LocalBool);
2091	>	end;
2092		end;
2093	<	end;
2094	<	SQL_BOOLEAN:
2095	<	begin
2096	<	LocalBool:= false;
2097	<	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)
2093	>
2094	>	if fdDataType = SQL_VARYING then
2095	>	Move(LocalData^, Buffer[fdDataOfs], fdDataLength)
2096	>	else
2097	>	Move(LocalData^, Buffer[fdDataOfs], fdDataSize)
2098		end
2099	+	else {Null column}
2100	+	if fdDataType = SQL_VARYING then
2101	+	FillChar(Buffer[fdDataOfs],fdDataLength,0)
2102		else
2103	<	Move(LocalData^, Buffer[rdFields[j].fdDataOfs], rdFields[j].fdDataSize)
2103	>	FillChar(Buffer[fdDataOfs],fdDataSize,0);
2104		end;
2105		end;
2106		end;
2107	<	WriteRecordCache(RecordNumber, PChar(p));
2107	>	WriteRecordCache(RecordNumber, Buffer);
2108		end;
2109
2110		function TIBCustomDataSet.GetActiveBuf: PChar;
#	Line 1942 | Line 2149 | begin
2149		result := FBase.Database;
2150		end;
2151
1945	–	function TIBCustomDataSet.GetDBHandle: PISC_DB_HANDLE;
1946	–	begin
1947	–	result := FBase.DBHandle;
1948	–	end;
1949	–
2152		function TIBCustomDataSet.GetDeleteSQL: TStrings;
2153		begin
2154		result := FQDelete.SQL;
#	Line 1957 | Line 2159 | begin
2159		result := FQInsert.SQL;
2160		end;
2161
2162	<	function TIBCustomDataSet.GetSQLParams: TIBXSQLDA;
2162	>	function TIBCustomDataSet.GetSQLParams: ISQLParams;
2163		begin
2164		if not FInternalPrepared then
2165		InternalPrepare;
#	Line 1974 | Line 2176 | begin
2176		result := FQSelect.SQL;
2177		end;
2178
2179	<	function TIBCustomDataSet.GetStatementType: TIBSQLTypes;
2179	>	function TIBCustomDataSet.GetStatementType: TIBSQLStatementTypes;
2180		begin
2181	<	result := FQSelect.SQLType;
2181	>	result := FQSelect.SQLStatementType;
2182		end;
2183
2184		function TIBCustomDataSet.GetModifySQL: TStrings;
#	Line 1989 | Line 2191 | begin
2191		result := FBase.Transaction;
2192		end;
2193
1992	–	function TIBCustomDataSet.GetTRHandle: PISC_TR_HANDLE;
1993	–	begin
1994	–	result := FBase.TRHandle;
1995	–	end;
1996	–
2194		procedure TIBCustomDataSet.InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer);
2195		begin
2196		if (Assigned(FUpdateObject) and (FUpdateObject.GetSQL(ukDelete).Text <> '')) then
#	Line 2015 | Line 2212 | function TIBCustomDataSet.InternalLocate
2212		const KeyValues: Variant; Options: TLocateOptions): Boolean;
2213		var
2214		keyFieldList: TList;
2018	–	{$IFDEF NEW_TBOOKMARK }
2215		CurBookmark: TBookmark;
2020	–	{$ELSE}
2021	–	CurBookmark: string;
2022	–	{$ENDIF}
2216		fieldValue: Variant;
2217		lookupValues: array of variant;
2218		i, fieldCount: Integer;
#	Line 2101 | Line 2294 | end;
2294
2295		procedure TIBCustomDataSet.InternalPostRecord(Qry: TIBSQL; Buff: Pointer);
2296		var
2297	<	i, j, k: Integer;
2297	>	i, j, k, arr: Integer;
2298		pbd: PBlobDataArray;
2299	+	pda: PArrayDataArray;
2300		begin
2301		pbd := PBlobDataArray(PChar(Buff) + FBlobCacheOffset);
2302	<	j := 0;
2302	>	pda := PArrayDataArray(PChar(Buff) + FArrayCacheOffset);
2303	>	j := 0; arr := 0;
2304		for i := 0 to FieldCount - 1 do
2305		if Fields[i].IsBlob then
2306		begin
#	Line 2114 | Line 2309 | begin
2309		begin
2310		pbd^[j].Finalize;
2311		PISC_QUAD(
2312	<	PChar(Buff) + PRecordData(Buff)^.rdFields[k].fdDataOfs)^ :=
2312	>	PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=
2313		pbd^[j].BlobID;
2314		PRecordData(Buff)^.rdFields[k].fdIsNull := pbd^[j].Size = 0;
2315	+	end
2316	+	else
2317	+	begin
2318	+	PRecordData(Buff)^.rdFields[k].fdIsNull := true;
2319	+	with PISC_QUAD(PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ do
2320	+	begin
2321	+	gds_quad_high := 0;
2322	+	gds_quad_low := 0;
2323	+	end;
2324		end;
2325		Inc(j);
2326	+	end
2327	+	else
2328	+	if Fields[i] is TIBArrayField then
2329	+	begin
2330	+	if pda^[arr] <> nil then
2331	+	begin
2332	+	k := FMappedFieldPosition[Fields[i].FieldNo -1];
2333	+	PISC_QUAD(
2334	+	PChar(Buff) + FFieldColumns^[k].fdDataOfs)^ :=  pda^[arr].ArrayIntf.GetArrayID;
2335	+	PRecordData(Buff)^.rdFields[k].fdIsNull := pda^[arr].ArrayIntf.IsEmpty;
2336	+	end;
2337	+	Inc(arr);
2338		end;
2339		if Assigned(FUpdateObject) then
2340		begin
#	Line 2167 | Line 2383 | begin
2383		SetInternalSQLParams(Qry, Buff);
2384		Qry.ExecQuery;
2385		try
2386	<	if (Qry.SQLType = SQLExecProcedure) or
2171	<	(Qry.Next <> nil) then
2386	>	if (Qry.SQLStatementType = SQLExecProcedure) or Qry.Next then
2387		begin
2388		ofs := PRecordData(Buff)^.rdSavedOffset;
2389		FetchCurrentRecordToBuffer(Qry,
#	Line 2261 | Line 2476 | begin
2476		end;
2477
2478		procedure TIBCustomDataSet.InternalPrepare;
2264	–	var
2265	–	DidActivate: Boolean;
2479		begin
2480		if FInternalPrepared then
2481		Exit;
2269	–	DidActivate := False;
2482		FBase.SetCursor;
2483		try
2484		ActivateConnection;
2485	<	DidActivate := ActivateTransaction;
2485	>	ActivateTransaction;
2486		FBase.CheckDatabase;
2487		FBase.CheckTransaction;
2488		if HasParser and (FParser.SQLText <> FQSelect.SQL.Text) then
#	Line 2308 | Line 2520 | begin
2520		end else
2521		IBError(ibxeEmptyQuery, [nil]);
2522		finally
2311	–	if DidActivate then
2312	–	DeactivateTransaction;
2523		FBase.RestoreCursor;
2524		end;
2525		end;
#	Line 2339 | Line 2549 | var
2549		begin
2550		CopyRecordBuffer(Buffer, OldBuffer);
2551		if BlobFieldCount > 0 then
2552	<	FillChar(PChar(OldBuffer)[FBlobCacheOffset], BlobFieldCount * SizeOf(TIBBlobStream),
2552	>	FillChar(PChar(OldBuffer)[FBlobCacheOffset],
2553	>	BlobFieldCount * SizeOf(TIBBlobStream) + ArrayFieldCount * SizeOf(IArray),
2554		0);
2555		end;
2556
#	Line 2416 | Line 2627 | var
2627		st: RawByteString;
2628		OldBuffer: Pointer;
2629		ts: TTimeStamp;
2630	+	Param: ISQLParam;
2631		begin
2632		if (Buffer = nil) then
2633		IBError(ibxeBufferNotSet, [nil]);
#	Line 2423 | Line 2635 | begin
2635		InternalPrepare;
2636		OldBuffer := nil;
2637		try
2638	<	for i := 0 to Qry.Params.Count - 1 do
2638	>	for i := 0 to Qry.Params.GetCount - 1 do
2639		begin
2640	<	fn := Qry.Params[i].Name;
2640	>	Param := Qry.Params[i];
2641	>	fn := Param.Name;
2642		if (Pos('OLD_', fn) = 1) then {mbcs ok}
2643		begin
2644		fn := Copy(fn, 5, Length(fn));
#	Line 2445 | Line 2658 | begin
2658		cr := Buffer;
2659		j := FQSelect.FieldIndex[fn] + 1;
2660		if (j > 0) then
2661	<	with PRecordData(cr)^ do
2661	>	with PRecordData(cr)^,rdFields[j], FFieldColumns^[j] do
2662		begin
2663	<	if Qry.Params[i].name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2663	>	if Param.name = 'IBX_INTERNAL_DBKEY' then {do not localize}
2664		begin
2665	<	PIBDBKey(Qry.Params[i].AsPointer)^ := rdDBKey;
2665	>	PIBDBKey(Param.AsPointer)^ := rdDBKey;
2666		continue;
2667		end;
2668	<	if rdFields[j].fdIsNull then
2669	<	Qry.Params[i].IsNull := True
2668	>	if fdIsNull then
2669	>	Param.IsNull := True
2670		else begin
2671	<	Qry.Params[i].IsNull := False;
2672	<	data := cr + rdFields[j].fdDataOfs;
2673	<	case rdFields[j].fdDataType of
2671	>	Param.IsNull := False;
2672	>	data := cr + fdDataOfs;
2673	>	case fdDataType of
2674		SQL_TEXT, SQL_VARYING:
2675		begin
2676	<	SetString(st, data, rdFields[j].fdDataLength);
2677	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
2678	<	SetCodePage(st,rdFields[j].fdCodePage,false);
2466	<	{$ENDIF}
2467	<	Qry.Params[i].AsString := st;
2676	>	SetString(st, data, fdDataLength);
2677	>	SetCodePage(st,fdCodePage,false);
2678	>	Param.AsString := st;
2679		end;
2680		SQL_FLOAT, SQL_DOUBLE, SQL_D_FLOAT:
2681	<	Qry.Params[i].AsDouble := PDouble(data)^;
2681	>	Param.AsDouble := PDouble(data)^;
2682		SQL_SHORT, SQL_LONG:
2683		begin
2684	<	if rdFields[j].fdDataScale = 0 then
2685	<	Qry.Params[i].AsLong := PLong(data)^
2686	<	else if rdFields[j].fdDataScale >= (-4) then
2687	<	Qry.Params[i].AsCurrency := PCurrency(data)^
2684	>	if fdDataScale = 0 then
2685	>	Param.AsLong := PLong(data)^
2686	>	else
2687	>	if fdDataScale >= (-4) then
2688	>	Param.AsCurrency := PCurrency(data)^
2689		else
2690	<	Qry.Params[i].AsDouble := PDouble(data)^;
2690	>	Param.AsDouble := PDouble(data)^;
2691		end;
2692		SQL_INT64:
2693		begin
2694	<	if rdFields[j].fdDataScale = 0 then
2695	<	Qry.Params[i].AsInt64 := PInt64(data)^
2484	<	else if rdFields[j].fdDataScale >= (-4) then
2485	<	Qry.Params[i].AsCurrency := PCurrency(data)^
2694	>	if fdDataScale = 0 then
2695	>	Param.AsInt64 := PInt64(data)^
2696		else
2697	<	Qry.Params[i].AsDouble := PDouble(data)^;
2697	>	if fdDataScale >= (-4) then
2698	>	Param.AsCurrency := PCurrency(data)^
2699	>	else
2700	>	Param.AsDouble := PDouble(data)^;
2701		end;
2702		SQL_BLOB, SQL_ARRAY, SQL_QUAD:
2703	<	Qry.Params[i].AsQuad := PISC_QUAD(data)^;
2703	>	Param.AsQuad := PISC_QUAD(data)^;
2704		SQL_TYPE_DATE:
2705		begin
2706		ts.Date := PInt(data)^;
2707		ts.Time := 0;
2708	<	Qry.Params[i].AsDate :=
2496	<	TimeStampToDateTime(ts);
2708	>	Param.AsDate := TimeStampToDateTime(ts);
2709		end;
2710		SQL_TYPE_TIME:
2711		begin
2712		ts.Date := 0;
2713		ts.Time := PInt(data)^;
2714	<	Qry.Params[i].AsTime :=
2503	<	TimeStampToDateTime(ts);
2714	>	Param.AsTime := TimeStampToDateTime(ts);
2715		end;
2716		SQL_TIMESTAMP:
2717	<	Qry.Params[i].AsDateTime :=
2717	>	Param.AsDateTime :=
2718		TimeStampToDateTime(MSecsToTimeStamp(trunc(PDouble(data)^)));
2719		SQL_BOOLEAN:
2720	<	Qry.Params[i].AsBoolean := PWordBool(data)^;
2720	>	Param.AsBoolean := PWordBool(data)^;
2721		end;
2722		end;
2723		end;
#	Line 2662 | Line 2873 | begin
2873		Result := Assigned( FQSelect ) and FQSelect.EOF;
2874		end;
2875
2876	<	function TIBCustomDataSet.ParamByName(ParamName: String): TIBXSQLVAR;
2876	>	function TIBCustomDataSet.ParamByName(ParamName: String): ISQLParam;
2877		begin
2878		ActivateConnection;
2879		ActivateTransaction;
#	Line 2799 | Line 3010 | var
3010		Buff: PChar;
3011		bTr, bDB: Boolean;
3012		begin
3013	+	if (Field = nil) or (Field.DataSet <> self) then
3014	+	IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3015		Buff := GetActiveBuf;
3016		if Buff = nil then
3017		begin
3018		fs := TIBBlobStream.Create;
3019		fs.Mode := bmReadWrite;
3020	+	fs.Database := Database;
3021	+	fs.Transaction := Transaction;
3022	+	fs.SetField(Field);
3023		FBlobStreamList.Add(Pointer(fs));
3024		result := TIBDSBlobStream.Create(Field, fs, Mode);
3025		exit;
#	Line 2818 | Line 3034 | begin
3034		fs.Mode := bmReadWrite;
3035		fs.Database := Database;
3036		fs.Transaction := Transaction;
3037	+	fs.SetField(Field);
3038		fs.BlobID :=
3039	<	PISC_QUAD(@Buff[PRecordData(Buff)^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3039	>	PISC_QUAD(@Buff[FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs])^;
3040		if (CachedUpdates) then
3041		begin
3042		bTr := not Transaction.InTransaction;
#	Line 2840 | Line 3057 | begin
3057		result := TIBDSBlobStream.Create(Field, fs, Mode);
3058		end;
3059
3060	+	function TIBCustomDataSet.GetArray(Field: TIBArrayField): IArray;
3061	+	var Buff: PChar;
3062	+	pda: PArrayDataArray;
3063	+	bTr, bDB: Boolean;
3064	+	begin
3065	+	if (Field = nil) or (Field.DataSet <> self) then
3066	+	IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3067	+	Buff := GetActiveBuf;
3068	+	if Buff = nil then
3069	+	Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3070	+	Field.FRelationName,Field.FieldName)
3071	+	else
3072	+	begin
3073	+	pda := PArrayDataArray(Buff + FArrayCacheOffset);
3074	+	if pda^[Field.FCacheOffset] = nil then
3075	+	begin
3076	+	AdjustRecordOnInsert(Buff);
3077	+	if Field.IsNull then
3078	+	Result := Database.Attachment.CreateArray(Transaction.TransactionIntf,
3079	+	Field.FRelationName,Field.FieldName)
3080	+	else
3081	+	Result := Database.Attachment.OpenArray(Transaction.TransactionIntf,
3082	+	Field.FRelationName,Field.FieldName,Field.ArrayID);
3083	+	pda^[Field.FCacheOffset] := TIBArray.Create(Field,Result);
3084	+	FArrayList.Add(pda^[Field.FCacheOffset]);
3085	+	if (CachedUpdates) then
3086	+	begin
3087	+	bTr := not Transaction.InTransaction;
3088	+	bDB := not Database.Connected;
3089	+	if bDB then
3090	+	Database.Open;
3091	+	if bTr then
3092	+	Transaction.StartTransaction;
3093	+	pda^[Field.FCacheOffset].ArrayIntf.PreLoad;
3094	+	if bTr then
3095	+	Transaction.Commit;
3096	+	if bDB then
3097	+	Database.Close;
3098	+	end;
3099	+	WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3100	+	end
3101	+	else
3102	+	Result := pda^[Field.FCacheOffset].ArrayIntf;
3103	+	end;
3104	+	end;
3105	+
3106	+	procedure TIBCustomDataSet.SetArrayIntf(AnArray: IArray; Field: TIBArrayField);
3107	+	var Buff: PChar;
3108	+	pda: PArrayDataArray;
3109	+	begin
3110	+	if (Field = nil) or (Field.DataSet <> self) then
3111	+	IBError(ibxFieldNotinDataSet,[Field.Name,Name]);
3112	+	Buff := GetActiveBuf;
3113	+	if Buff <> nil then
3114	+	begin
3115	+	AdjustRecordOnInsert(Buff);
3116	+	pda := PArrayDataArray(Buff + FArrayCacheOffset);
3117	+	pda^[Field.FCacheOffset].FArray := AnArray;
3118	+	WriteRecordCache(PRecordData(Buff)^.rdRecordNumber, Pointer(Buff));
3119	+	end;
3120	+	end;
3121	+
3122		function TIBCustomDataSet.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer;
3123		const
3124		CMPLess = -1;
#	Line 2920 | Line 3199 | end;
3199		procedure TIBCustomDataSet.DoBeforeClose;
3200		begin
3201		inherited DoBeforeClose;
3202	+	if FInTransactionEnd and (FCloseAction = TARollback) then
3203	+	Exit;
3204		if State in [dsInsert,dsEdit] then
3205		begin
2925	–	if FInTransactionEnd and (FCloseAction = TARollback) then
2926	–	Exit;
2927	–
3206		if DataSetCloseAction = dcSaveChanges then
3207		Post;
3208		{Note this can fail with an exception e.g. due to
3209		database validation error. In which case the dataset remains open }
3210		end;
3211	+	if FCachedUpdates and FUpdatesPending and (DataSetCloseAction = dcSaveChanges) then
3212	+	ApplyUpdates;
3213		end;
3214
3215		procedure TIBCustomDataSet.DoBeforeOpen;
#	Line 2961 | Line 3241 | end;
3241
3242		procedure TIBCustomDataSet.FetchAll;
3243		var
2964	–	{$IFDEF NEW_TBOOKMARK }
3244		CurBookmark: TBookmark;
2966	–	{$ELSE}
2967	–	CurBookmark: string;
2968	–	{$ENDIF}
3245		begin
3246		FBase.SetCursor;
3247		try
#	Line 3076 | Line 3352 | begin
3352		if result and (Buffer <> nil) then
3353		Move(Buff[1], Buffer^, Field.DataSize);
3354		end
3355	<	else if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3355	>	else
3356	>	if (FMappedFieldPosition[Field.FieldNo - 1] > 0) and
3357		(FMappedFieldPosition[Field.FieldNo - 1] <= CurrentRecord^.rdFieldCount) then
3358	+	with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]],
3359	+	FFieldColumns^[FMappedFieldPosition[Field.FieldNo - 1]] do
3360		begin
3361	<	result := not CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdIsNull;
3361	>	result := not fdIsNull;
3362		if result and (Buffer <> nil) then
3084	–	with CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]] do
3363		begin
3364	<	Data := Buff + CurrentRecord^.rdFields[FMappedFieldPosition[Field.FieldNo - 1]].fdDataOfs;
3364	>	Data := Buff + fdDataOfs;
3365		if (fdDataType = SQL_VARYING) or (fdDataType = SQL_TEXT) then
3366		begin
3367		if fdDataLength < Field.DataSize then
#	Line 3154 | Line 3432 | begin
3432		if FCurrentRecord < FRecordCount then
3433		ReadRecordCache(FCurrentRecord, Buffer, False)
3434		else begin
3435	<	while (not FQSelect.EOF) and
3158	<	(FQSelect.Next <> nil) and
3435	>	while (not FQSelect.EOF) and FQSelect.Next  and
3436		(FCurrentRecord >= FRecordCount) do begin
3437		FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
3438		Inc(FRecordCount);
#	Line 3266 | Line 3543 | procedure TIBCustomDataSet.InternalCance
3543		var
3544		Buff: PChar;
3545		CurRec: Integer;
3546	+	pda: PArrayDataArray;
3547	+	i: integer;
3548		begin
3549		inherited InternalCancel;
3550		Buff := GetActiveBuf;
3551	<	if Buff <> nil then begin
3551	>	if Buff <> nil then
3552	>	begin
3553	>	pda := PArrayDataArray(Buff + FArrayCacheOffset);
3554	>	for i := 0 to ArrayFieldCount - 1 do
3555	>	pda^[i].ArrayIntf.CancelChanges;
3556		CurRec := FCurrentRecord;
3557		AdjustRecordOnInsert(Buff);
3558		if (State = dsEdit) then begin
#	Line 3292 | Line 3575 | begin
3575		DeactivateTransaction;
3576		FQSelect.Close;
3577		ClearBlobCache;
3578	+	ClearArrayCache;
3579		FreeRecordBuffer(FModelBuffer);
3580		FreeRecordBuffer(FOldBuffer);
3581		FCurrentRecord := -1;
#	Line 3307 | Line 3591 | begin
3591		FOBEnd := 0;
3592		FreeMem(FBufferCache);
3593		FBufferCache := nil;
3594	+	FreeMem(FFieldColumns);
3595	+	FFieldColumns := nil;
3596		FreeMem(FOldBufferCache);
3597		FOldBufferCache := nil;
3598		BindFields(False);
#	Line 3384 | Line 3670 | const
3670		var
3671		FieldType: TFieldType;
3672		FieldSize: Word;
3673	<	charSetID: integer;
3673	>	charSetID: short;
3674		CharSetSize: integer;
3675		CharSetName: RawByteString;
3390	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3676		FieldCodePage: TSystemCodePage;
3392	–	{$ENDIF}
3677		FieldNullable : Boolean;
3678		i, FieldPosition, FieldPrecision: Integer;
3679		FieldAliasName, DBAliasName: string;
3680	<	RelationName, FieldName: string;
3680	>	aRelationName, FieldName: string;
3681		Query : TIBSQL;
3682		FieldIndex: Integer;
3683		FRelationNodes : TRelationNode;
3684	+	aArrayDimensions: integer;
3685	+	aArrayBounds: TArrayBounds;
3686	+	ArrayMetaData: IArrayMetaData;
3687
3688		function Add_Node(Relation, Field : String) : TRelationNode;
3689		var
#	Line 3494 | Line 3781 | var
3781		begin
3782		FRelationNodes := TRelationNode.Create;
3783		FNeedsRefresh := False;
3784	<	Database.InternalTransaction.StartTransaction;
3784	>	if not Database.InternalTransaction.InTransaction then
3785	>	Database.InternalTransaction.StartTransaction;
3786		Query := TIBSQL.Create(self);
3787		try
3788		Query.Database := DataBase;
#	Line 3502 | Line 3790 | begin
3790		FieldDefs.BeginUpdate;
3791		FieldDefs.Clear;
3792		FieldIndex := 0;
3793	<	if (Length(FMappedFieldPosition) < SourceQuery.Current.Count) then
3794	<	SetLength(FMappedFieldPosition, SourceQuery.Current.Count);
3793	>	if (Length(FMappedFieldPosition) < SourceQuery.MetaData.Count) then
3794	>	SetLength(FMappedFieldPosition, SourceQuery.MetaData.Count);
3795		Query.SQL.Text := DefaultSQL;
3796		Query.Prepare;
3797	<	SetLength(FAliasNameMap, SourceQuery.Current.Count);
3798	<	SetLength(FAliasNameList, SourceQuery.Current.Count);
3799	<	for i := 0 to SourceQuery.Current.Count - 1 do
3800	<	with SourceQuery.Current[i].Data^ do
3797	>	SetLength(FAliasNameMap, SourceQuery.MetaData.Count);
3798	>	SetLength(FAliasNameList, SourceQuery.MetaData.Count);
3799	>	for i := 0 to SourceQuery.MetaData.GetCount - 1 do
3800	>	with SourceQuery.MetaData[i] do
3801		begin
3802		{ Get the field name }
3803	<	FieldAliasName := SourceQuery.Current[i].Name;
3804	<	SetString(DBAliasName, aliasname, aliasname_length);
3805	<	SetString(RelationName, relname, relname_length);
3806	<	SetString(FieldName, sqlname, sqlname_length);
3803	>	FieldAliasName := GetName;
3804	>	DBAliasName := GetAliasname;
3805	>	aRelationName := getRelationName;
3806	>	FieldName := getSQLName;
3807		FAliasNameList[i] := DBAliasName;
3808		FieldSize := 0;
3809		FieldPrecision := 0;
3810	<	FieldNullable := SourceQuery.Current[i].IsNullable;
3810	>	FieldNullable := IsNullable;
3811		CharSetSize := 0;
3812		CharSetName := '';
3525	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3813		FieldCodePage := CP_NONE;
3814	<	{$ENDIF}
3815	<	case sqltype and not 1 of
3814	>	aArrayDimensions := 0;
3815	>	SetLength(aArrayBounds,0);
3816	>	case SQLType of
3817		{ All VARCHAR's must be converted to strings before recording
3818		their values }
3819		SQL_VARYING, SQL_TEXT:
3820		begin
3821	<	CharSetID := SourceQuery.Current[i].GetCharSetID;
3822	<	TFirebirdCharacterSets.CharSetWidth(CharSetID,CharSetSize);
3823	<	CharSetName := TFirebirdCharacterSets.GetCharsetName(CharSetID);
3824	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3537	<	TFirebirdCharacterSets.CharSetID2CodePage(CharSetID,FieldCodePage);
3538	<	{$ENDIF}
3539	<	FieldSize := sqllen;
3821	>	FirebirdAPI.CharSetWidth(getCharSetID,CharSetSize);
3822	>	CharSetName := FirebirdAPI.GetCharsetName(getCharSetID);
3823	>	FirebirdAPI.CharSetID2CodePage(getCharSetID,FieldCodePage);
3824	>	FieldSize := GetSize div CharSetSize;
3825		FieldType := ftString;
3826		end;
3827		{ All Doubles/Floats should be cast to doubles }
#	Line 3544 | Line 3829 | begin
3829		FieldType := ftFloat;
3830		SQL_SHORT:
3831		begin
3832	<	if (sqlscale = 0) then
3832	>	if (getScale = 0) then
3833		FieldType := ftSmallInt
3834		else begin
3835		FieldType := ftBCD;
3836		FieldPrecision := 4;
3837	<	FieldSize := -sqlscale;
3837	>	FieldSize := -getScale;
3838		end;
3839		end;
3840		SQL_LONG:
3841		begin
3842	<	if (sqlscale = 0) then
3842	>	if (getScale = 0) then
3843		FieldType := ftInteger
3844	<	else if (sqlscale >= (-4)) then
3844	>	else if (getScale >= (-4)) then
3845		begin
3846		FieldType := ftBCD;
3847		FieldPrecision := 9;
3848	<	FieldSize := -sqlscale;
3848	>	FieldSize := -getScale;
3849		end
3850		else
3851		if Database.SQLDialect = 1 then
#	Line 3572 | Line 3857 | begin
3857		begin
3858		FieldType := ftFMTBCD;
3859		FieldPrecision := 9;
3860	<	FieldSize := -sqlscale;
3860	>	FieldSize := -getScale;
3861		end;
3862		end;
3863
3864		SQL_INT64:
3865		begin
3866	<	if (sqlscale = 0) then
3866	>	if (getScale = 0) then
3867		FieldType := ftLargeInt
3868	<	else if (sqlscale >= (-4)) then
3868	>	else if (getScale >= (-4)) then
3869		begin
3870		FieldType := ftBCD;
3871		FieldPrecision := 18;
3872	<	FieldSize := -sqlscale;
3872	>	FieldSize := -getScale;
3873		end
3874		else
3875		FieldType := ftFloat
#	Line 3595 | Line 3880 | begin
3880		SQL_BLOB:
3881		begin
3882		FieldSize := sizeof (TISC_QUAD);
3883	<	if (sqlsubtype = 1) then
3883	>	if (getSubtype = 1) then
3884		begin
3885	<	CharSetID := SourceQuery.Current[i].GetCharSetID;
3886	<	TFirebirdCharacterSets.CharSetWidth(CharSetID,CharSetSize);
3887	<	CharSetName := TFirebirdCharacterSets.GetCharsetName(CharSetID);
3603	<	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3604	<	TFirebirdCharacterSets.CharSetID2CodePage(CharSetID,FieldCodePage);
3605	<	{$ENDIF}
3885	>	FirebirdAPI.CharSetWidth(getCharSetID,CharSetSize);
3886	>	CharSetName := FirebirdAPI.GetCharsetName(getCharSetID);
3887	>	FirebirdAPI.CharSetID2CodePage(getCharSetID,FieldCodePage);
3888		FieldType := ftMemo;
3889		end
3890		else
#	Line 3611 | Line 3893 | begin
3893		SQL_ARRAY:
3894		begin
3895		FieldSize := sizeof (TISC_QUAD);
3896	<	FieldType := ftUnknown;
3896	>	FieldType := ftArray;
3897	>	ArrayMetaData := GetArrayMetaData;
3898	>	if ArrayMetaData <> nil then
3899	>	begin
3900	>	aArrayDimensions := ArrayMetaData.GetDimensions;
3901	>	aArrayBounds := ArrayMetaData.GetBounds;
3902	>	end;
3903		end;
3904		SQL_BOOLEAN:
3905		FieldType:= ftBoolean;
#	Line 3630 | Line 3918 | begin
3918		Size := FieldSize;
3919		Precision := FieldPrecision;
3920		Required := not FieldNullable;
3921	+	RelationName := aRelationName;
3922		InternalCalcField := False;
3923		CharacterSetSize := CharSetSize;
3924		CharacterSetName := CharSetName;
3636	–	{$IFDEF HAS_ANSISTRING_CODEPAGE}
3925		CodePage := FieldCodePage;
3926	<	{$ENDIF}
3926	>	ArrayDimensions := aArrayDimensions;
3927	>	ArrayBounds := aArrayBounds;
3928		if (FieldName <> '') and (RelationName <> '') then
3929		begin
3930		if Has_COMPUTED_BLR(RelationName, FieldName) then
#	Line 3663 | Line 3952 | begin
3952		FreeNodes;
3953		Database.InternalTransaction.Commit;
3954		FieldDefs.EndUpdate;
3955	+	FieldDefs.Updated := true;
3956		end;
3957		end;
3958
#	Line 3680 | Line 3970 | begin
3970		else begin
3971		Buffer := AllocRecordBuffer;
3972		try
3973	<	while FQSelect.Next <> nil do
3973	>	while FQSelect.Next do
3974		begin
3975		FetchCurrentRecordToBuffer(FQSelect, FRecordCount, Buffer);
3976		Inc(FRecordCount);
#	Line 3695 | Line 3985 | end;
3985		procedure TIBCustomDataSet.InternalSetParamsFromCursor;
3986		var
3987		i: Integer;
3988	<	cur_param: TIBXSQLVAR;
3988	>	cur_param: ISQLParam;
3989		cur_field: TField;
3990		s: TStream;
3991		begin
#	Line 3703 | Line 3993 | begin
3993		IBError(ibxeEmptyQuery, [nil]);
3994		if not FInternalPrepared then
3995		InternalPrepare;
3996	<	if (SQLParams.Count > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
3996	>	if (SQLParams.GetCount > 0) and (DataSource <> nil) and (DataSource.DataSet <> nil) then
3997		begin
3998	<	for i := 0 to SQLParams.Count - 1 do
3998	>	for i := 0 to SQLParams.GetCount - 1 do
3999		begin
4000		cur_field := DataSource.DataSet.FindField(SQLParams[i].Name);
4001		cur_param := SQLParams[i];
#	Line 3739 | Line 4029 | begin
4029		try
4030		s := DataSource.DataSet.
4031		CreateBlobStream(cur_field, bmRead);
4032	<	cur_param.LoadFromStream(s);
4032	>	cur_param.AsBlob := TIBDSBlobStream(s).FBlobStream.Blob;
4033		finally
4034		s.free;
4035		end;
4036		end;
4037	+	ftArray:
4038	+	cur_param.AsArray := TIBArrayField(cur_field).ArrayIntf;
4039		else
4040		IBError(ibxeNotSupported, [nil]);
4041		end;
#	Line 3776 | Line 4068 | procedure TIBCustomDataSet.InternalOpen;
4068		result := SizeOf(TRecordData) + ((n - 1) * SizeOf(TFieldData));
4069		end;
4070
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	–
4071		begin
4072		FBase.SetCursor;
4073		try
#	Line 3834 | Line 4077 | begin
4077		IBError(ibxeEmptyQuery, [nil]);
4078		if not FInternalPrepared then
4079		InternalPrepare;
4080	<	if FQSelect.SQLType = SQLSelect then
4080	>	if FQSelect.SQLStatementType = SQLSelect then
4081		begin
4082		if DefaultFields then
4083		CreateFields;
4084	+	FArrayFieldCount := 0;
4085		BindFields(True);
3842	–	SetExtendedProperties;
4086		FCurrentRecord := -1;
4087		FQSelect.ExecQuery;
4088		FOpen := FQSelect.Open;
#	Line 3850 | Line 4093 | begin
4093		3. After the dummy fetch, FRecordSize will be appropriately
4094		adjusted to reflect the additional "weight" of the field
4095		data.
4096	<	4. Set up the FCalcFieldsOffset, FBlobCacheOffset and FRecordBufferSize.
4096	>	4. Set up the FCalcFieldsOffset, FBlobCacheOffset, FArrayCacheOffset and FRecordBufferSize.
4097		5. Now, with the BufferSize available, allocate memory for chunks of records
4098		6. Re-allocate the model buffer, accounting for the new
4099		FRecordBufferSize.
4100		7. Finally, calls to AllocRecordBuffer will work!.
4101		}
4102		{Step 1}
4103	<	FRecordSize := RecordDataLength(FQSelect.Current.Count);
4103	>	FRecordSize := RecordDataLength(FQSelect.FieldCount);
4104		{Step 2, 3}
4105	+	GetMem(FFieldColumns,sizeof(TFieldColumns) * (FQSelect.FieldCount));
4106		IBAlloc(FModelBuffer, 0, FRecordSize);
4107	<	FetchCurrentRecordToBuffer(FQSelect, -1, FModelBuffer);
4107	>	InitModelBuffer(FQSelect, FModelBuffer);
4108		{Step 4}
4109		FCalcFieldsOffset := FRecordSize;
4110		FBlobCacheOffset := FCalcFieldsOffset + CalcFieldsSize;
4111	<	FRecordBufferSize := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4111	>	FArrayCacheOffset := (FBlobCacheOffset + (BlobFieldCount * SizeOf(TIBBlobStream)));
4112	>	FRecordBufferSize := FArrayCacheOffset + (ArrayFieldCount * sizeof(IArray));
4113		{Step 5}
4114		if UniDirectional then
4115		FBufferChunkSize := FRecordBufferSize * UniCache
#	Line 3880 | Line 4125 | begin
4125		FCacheSize := FBufferChunkSize;
4126		FOldCacheSize := FBufferChunkSize;
4127		{Step 6}
4128	<	IBAlloc(FModelBuffer, RecordDataLength(FQSelect.Current.Count),
4128	>	IBAlloc(FModelBuffer, RecordDataLength(FQSelect.FieldCount),
4129		FRecordBufferSize);
4130		{Step 7}
4131		FOldBuffer := AllocRecordBuffer;
#	Line 3978 | Line 4223 | end;
4223		function TIBCustomDataSet.Locate(const KeyFields: string; const KeyValues: Variant;
4224		Options: TLocateOptions): Boolean;
4225		var
3981	–	{$IFDEF NEW_TBOOKMARK }
4226		CurBookmark: TBookmark;
3983	–	{$ELSE}
3984	–	CurBookmark: string;
3985	–	{$ENDIF}
4227		begin
4228		DisableControls;
4229		try
#	Line 4000 | Line 4241 | function TIBCustomDataSet.Lookup(const K
4241		const ResultFields: string): Variant;
4242		var
4243		fl: TList;
4003	–	{$IFDEF NEW_TBOOKMARK }
4244		CurBookmark: TBookmark;
4005	–	{$ELSE}
4006	–	CurBookmark: string;
4007	–	{$ENDIF}
4245		begin
4246		DisableControls;
4247		fl := TList.Create;
#	Line 4077 | Line 4314 | begin
4314		MappedFieldPos := FMappedFieldPosition[Field.FieldNo - 1];
4315		if (MappedFieldPos > 0) and
4316		(MappedFieldPos <= rdFieldCount) then
4317	+	with rdFields[MappedFieldPos], FFieldColumns^[MappedFieldPos] do
4318		begin
4319		Field.Validate(Buffer);
4320		if (Buffer = nil) or
4321		(Field is TIBStringField) and (PChar(Buffer)[0] = #0) then
4322	<	rdFields[MappedFieldPos].fdIsNull := True
4323	<	else begin
4324	<	Move(Buffer^, Buff[rdFields[MappedFieldPos].fdDataOfs],
4325	<	rdFields[MappedFieldPos].fdDataSize);
4326	<	if (rdFields[MappedFieldPos].fdDataType = SQL_TEXT) or
4327	<	(rdFields[MappedFieldPos].fdDataType = SQL_VARYING) then
4328	<	rdFields[MappedFieldPos].fdDataLength := StrLen(PChar(Buffer));
4091	<	rdFields[MappedFieldPos].fdIsNull := False;
4322	>	fdIsNull := True
4323	>	else
4324	>	begin
4325	>	Move(Buffer^, Buff[fdDataOfs],fdDataSize);
4326	>	if (fdDataType = SQL_TEXT) or (fdDataType = SQL_VARYING) then
4327	>	fdDataLength := StrLen(PChar(Buffer));
4328	>	fdIsNull := False;
4329		if rdUpdateStatus = usUnmodified then
4330		begin
4331		if CachedUpdates then
#	Line 4189 | Line 4426 | begin
4426		if FInternalPrepared then
4427		begin
4428		CheckDatasetClosed;
4429	+	if FDidActivate then
4430	+	DeactivateTransaction;
4431		FieldDefs.Clear;
4432		FieldDefs.Updated := false;
4433		FInternalPrepared := False;
#	Line 4209 | Line 4448 | begin
4448		IBError(ibxeEmptyQuery, [nil]);
4449		if not FInternalPrepared then
4450		InternalPrepare;
4451	<	if FQSelect.SQLType = SQLSelect then
4451	>	if FQSelect.SQLStatementType = SQLSelect then
4452		begin
4453		IBError(ibxeIsASelectStatement, [nil]);
4454		end
#	Line 4222 | Line 4461 | begin
4461		end;
4462		end;
4463
4464	<	function TIBCustomDataSet.GetSelectStmtHandle: TISC_STMT_HANDLE;
4464	>	function TIBCustomDataSet.GetSelectStmtIntf: IStatement;
4465		begin
4466	<	Result := FQSelect.Handle;
4466	>	Result := FQSelect.Statement;
4467		end;
4468
4469		function TIBCustomDataSet.GetParser: TSelectSQLParser;
#	Line 4279 | Line 4518 | end;
4518
4519		{ TIBDataSet IProviderSupport }
4520
4521	<	(*procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4521	>	procedure TIBCustomDataSet.PSEndTransaction(Commit: Boolean);
4522		begin
4523		if Commit then
4524		Transaction.Commit else
#	Line 4442 | Line 4681 | begin
4681		if not FQSelect.Prepared then
4682		FQSelect.Prepare;
4683		Result := FQSelect.UniqueRelationName;
4684	<	end;*)
4684	>	end;
4685
4686		procedure TIBDataSet.BatchInput(InputObject: TIBBatchInput);
4687		begin

Diff Legend

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