ViewVC Help

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

root/public/ibx/branches/journaling/fbintf/client/2.5/FB25Attachment.pas

Comparing ibx/trunk/fbintf/client/2.5/FB25Attachment.pas (file contents):
Revision 117 by tony, Mon Jan 22 13:58:11 2018 UTC vs.
Revision 291 by tony, Fri Apr 17 10:26:08 2020 UTC

#	Line 46 | Line 46 | type
46		TFB25Attachment = class(TFBAttachment, IAttachment, IActivityMonitor)
47		private
48		FHandle: TISC_DB_HANDLE;
49	+	FFirebird25ClientAPI: TFB25ClientAPI;
50		protected
51		procedure CheckHandle; override;
52		public
53	<	constructor Create(DatabaseName: AnsiString; aDPB: IDPB;
53	>	constructor Create(api: TFB25ClientAPI; DatabaseName: AnsiString; aDPB: IDPB;
54		RaiseExceptionOnConnectError: boolean);
55	<	constructor CreateDatabase(DatabaseName: AnsiString; aDPB: IDPB; RaiseExceptionOnError: boolean); overload;
56	<	constructor CreateDatabase(sql: AnsiString; aSQLDialect: integer;
55	>	constructor CreateDatabase(api: TFB25ClientAPI; DatabaseName: AnsiString; aDPB: IDPB; RaiseExceptionOnError: boolean); overload;
56	>	constructor CreateDatabase(api: TFB25ClientAPI; sql: AnsiString; aSQLDialect: integer;
57		RaiseExceptionOnError: boolean); overload;
58	+	function GetDBInfo(ReqBuffer: PByte; ReqBufLen: integer): IDBInformation; override;
59		property Handle: TISC_DB_HANDLE read FHandle;
60	+	property Firebird25ClientAPI: TFB25ClientAPI read FFirebird25ClientAPI;
61
62		public
63		{IAttachment}
#	Line 67 | Line 70 | type
70		procedure ExecImmediate(transaction: ITransaction; sql: AnsiString; aSQLDialect: integer); override;
71		function Prepare(transaction: ITransaction; sql: AnsiString; aSQLDialect: integer): IStatement; override;
72		function PrepareWithNamedParameters(transaction: ITransaction; sql: AnsiString;
73	<	aSQLDialect: integer; GenerateParamNames: boolean=false): IStatement; override;
73	>	aSQLDialect: integer; GenerateParamNames: boolean=false;
74	>	CaseSensitiveParams: boolean=false): IStatement; override;
75		function GetEventHandler(Events: TStrings): IEvents; override;
76	<	function CreateBlob(transaction: ITransaction; RelationName, ColumnName: AnsiString; BPB: IBPB=nil): IBlob; overload;
73	<	function CreateBlob(transaction: ITransaction; BlobMetaData: IBlobMetaData; BPB: IBPB=nil): IBlob; overload;
76	>	function CreateBlob(transaction: ITransaction; BlobMetaData: IBlobMetaData; BPB: IBPB=nil): IBlob; overload; override;
77		function CreateBlob(transaction: ITransaction; SubType: integer; aCharSetID: cardinal=0; BPB: IBPB=nil): IBlob; overload;
75	–	function OpenBlob(transaction: ITransaction; RelationName, ColumnName: AnsiString; BlobID: TISC_QUAD; BPB: IBPB=nil): IBlob; overload;
78		function OpenBlob(transaction: ITransaction; BlobMetaData: IBlobMetaData; BlobID: TISC_QUAD; BPB: IBPB=nil): IBlob; overload; override;
79
80	<	function OpenArray(transaction: ITransaction; RelationName, ColumnName: AnsiString;
81	<	ArrayID: TISC_QUAD): IArray;
80	<	function CreateArray(transaction: ITransaction; RelationName, ColumnName: AnsiString
81	<	): IArray; overload;
82	<	function CreateArray(transaction: ITransaction; ArrayMetaData: IArrayMetaData): IArray; overload;
80	>	function OpenArray(transaction: ITransaction; ArrayMetaData: IArrayMetaData; ArrayID: TISC_QUAD): IArray; overload; override;
81	>	function CreateArray(transaction: ITransaction; ArrayMetaData: IArrayMetaData): IArray; overload; override;
82		function CreateArrayMetaData(SQLType: cardinal; tableName: AnsiString; columnName: AnsiString;
83		Scale: integer; size: cardinal;
84		acharSetID: cardinal; dimensions: cardinal; bounds: TArrayBounds
#	Line 87 | Line 86 | type
86
87		{Database Information}
88
89	<	function GetBlobMetaData(Transaction: ITransaction; tableName, columnName: AnsiString): IBlobMetaData;
90	<	function GetArrayMetaData(Transaction: ITransaction; tableName, columnName: AnsiString): IArrayMetaData;
91	<	function GetDBInformation(Requests: array of byte): IDBInformation; overload; override;
93	<	function GetDBInformation(Request: byte): IDBInformation; overload; override;
89	>	function GetBlobMetaData(Transaction: ITransaction; tableName, columnName: AnsiString): IBlobMetaData; override;
90	>	function GetArrayMetaData(Transaction: ITransaction; tableName, columnName: AnsiString): IArrayMetaData; override;
91	>	procedure getFBVersion(version: TStrings);
92		end;
93
94		implementation
95
96		uses FB25Events,FB25Transaction, FBMessages, FB25Blob,
97	<	FB25Statement, FB25Array, IBUtils;
97	>	FB25Statement, FB25Array, IBUtils, IBExternals;
98
99		{ TFB25Attachment }
100
#	Line 106 | Line 104 | begin
104		IBError(ibxeDatabaseClosed,[nil]);
105		end;
106
107	<	constructor TFB25Attachment.Create(DatabaseName: AnsiString; aDPB: IDPB;
107	>	constructor TFB25Attachment.Create(api: TFB25ClientAPI; DatabaseName: AnsiString; aDPB: IDPB;
108		RaiseExceptionOnConnectError: boolean);
109		begin
110	+	FFirebird25ClientAPI := api;
111		if aDPB = nil then
112		begin
113		if RaiseExceptionOnConnectError then
114		IBError(ibxeNoDPB,[nil]);
115		Exit;
116		end;
117	<	inherited Create(DatabaseName,aDPB,RaiseExceptionOnConnectError);
117	>	inherited Create(api,DatabaseName,aDPB,RaiseExceptionOnConnectError);
118		Connect;
119		end;
120
121	<	constructor TFB25Attachment.CreateDatabase(DatabaseName: AnsiString; aDPB: IDPB;
121	>	constructor TFB25Attachment.CreateDatabase(api: TFB25ClientAPI; DatabaseName: AnsiString; aDPB: IDPB;
122		RaiseExceptionOnError: boolean);
123		var sql: AnsiString;
124		tr_handle: TISC_TR_HANDLE;
125		begin
126	<	inherited Create(DatabaseName,aDPB,RaiseExceptionOnError);
126	>	inherited Create(api,DatabaseName,aDPB,RaiseExceptionOnError);
127	>	FFirebird25ClientAPI := api;
128		sql := GenerateCreateDatabaseSQL(DatabaseName,aDPB);
129		tr_handle := nil;
130	<	with Firebird25ClientAPI do
130	>	with FFirebird25ClientAPI do
131		if (isc_dsql_execute_immediate(StatusVector, @FHandle, @tr_handle, 0, PAnsiChar(sql),
132		SQLDialect, nil) > 0) and RaiseExceptionOnError then
133		IBDataBaseError;
#	Line 141 | Line 141 | begin
141		GetODSAndConnectionInfo;
142		end;
143
144	<	constructor TFB25Attachment.CreateDatabase(sql: AnsiString; aSQLDialect: integer;
144	>	constructor TFB25Attachment.CreateDatabase(api: TFB25ClientAPI; sql: AnsiString; aSQLDialect: integer;
145		RaiseExceptionOnError: boolean);
146		var tr_handle: TISC_TR_HANDLE;
147		begin
148	<	inherited Create('',nil,RaiseExceptionOnError);
148	>	inherited Create(api,'',nil,RaiseExceptionOnError);
149	>	FFirebird25ClientAPI := api;
150		FSQLDialect := aSQLDialect;
151		tr_handle := nil;
152	<	with Firebird25ClientAPI do
152	>	with FFirebird25ClientAPI do
153		begin
154		if (isc_dsql_execute_immediate(StatusVector, @FHandle, @tr_handle, 0, PAnsiChar(sql),
155		aSQLDialect, nil) > 0) and RaiseExceptionOnError then
#	Line 160 | Line 161 | begin
161		DPBFromCreateSQL(sql);
162		end;
163
164	+	function TFB25Attachment.GetDBInfo(ReqBuffer: PByte; ReqBufLen: integer
165	+	): IDBInformation;
166	+	begin
167	+	Result := TDBInformation.Create(FFirebird25ClientAPI);
168	+	with FFirebird25ClientAPI, Result as TDBInformation do
169	+	if isc_database_info(StatusVector, @(FHandle), ReqBufLen, ReqBuffer,
170	+	getBufSize, Buffer) > 0 then
171	+	IBDataBaseError;
172	+	end;
173	+
174		procedure TFB25Attachment.Connect;
175		begin
176		FSQLDialect := 3;
177
178	<	with Firebird25ClientAPI do
178	>	with FFirebird25ClientAPI do
179		if DPB = nil then
180		begin
181		if (isc_attach_database(StatusVector, Length(FDatabaseName),
#	Line 190 | Line 201 | begin
201
202		EndAllTransactions;
203		{Disconnect}
204	<	with Firebird25ClientAPI do
204	>	with FFirebird25ClientAPI do
205		if (isc_detach_database(StatusVector, @FHandle) > 0) and not Force then
206		IBDatabaseError;
207		FHandle := nil;
#	Line 208 | Line 219 | procedure TFB25Attachment.DropDatabase;
219		begin
220		CheckHandle;
221		EndAllTransactions;
222	<	with Firebird25ClientAPI do
222	>	with FFirebird25ClientAPI do
223		if isc_drop_database(StatusVector, @FHandle) > 0 then
224		IBDatabaseError;
225		FHandle := nil;
#	Line 218 | Line 229 | function TFB25Attachment.StartTransactio
229		DefaultCompletion: TTransactionCompletion): ITransaction;
230		begin
231		CheckHandle;
232	<	Result := TFB25Transaction.Create(self,TPB,DefaultCompletion);
232	>	Result := TFB25Transaction.Create(FFirebird25ClientAPI,self,TPB,DefaultCompletion);
233		end;
234
235		function TFB25Attachment.StartTransaction(TPB: ITPB;
236		DefaultCompletion: TTransactionCompletion): ITransaction;
237		begin
238		CheckHandle;
239	<	Result := TFB25Transaction.Create(self,TPB,DefaultCompletion);
229	<	end;
230	<
231	<	function TFB25Attachment.CreateBlob(transaction: ITransaction; RelationName,
232	<	ColumnName: AnsiString; BPB: IBPB): IBlob;
233	<	begin
234	<	CheckHandle;
235	<	Result := TFB25Blob.Create(self,transaction as TFB25transaction,
236	<	TFB25BlobMetaData.Create(self,Transaction as TFB25Transaction,RelationName,ColumnName),BPB);
239	>	Result := TFB25Transaction.Create(FFirebird25ClientAPI,self,TPB,DefaultCompletion);
240		end;
241
242		function TFB25Attachment.CreateBlob(transaction: ITransaction;
#	Line 250 | Line 253 | begin
253		Result := TFB25Blob.Create(self,transaction as TFB25transaction,SubType,aCharSetID,BPB);
254		end;
255
253	–	function TFB25Attachment.OpenBlob(transaction: ITransaction; RelationName,
254	–	ColumnName: AnsiString; BlobID: TISC_QUAD; BPB: IBPB=nil): IBlob;
255	–	begin
256	–	CheckHandle;
257	–	Result := TFB25Blob.Create(self,transaction as TFB25transaction,
258	–	TFB25BlobMetaData.Create(self,Transaction as TFB25Transaction,RelationName,ColumnName),
259	–	BlobID,BPB);
260	–	end;
261	–
256		function TFB25Attachment.OpenBlob(transaction: ITransaction;
257		BlobMetaData: IBlobMetaData; BlobID: TISC_QUAD; BPB: IBPB=nil): IBlob;
258		begin
#	Line 272 | Line 266 | var TRHandle: TISC_TR_HANDLE;
266		begin
267		CheckHandle;
268		TRHandle := (Transaction as TFB25Transaction).Handle;
269	<	with Firebird25ClientAPI do
269	>	with FFirebird25ClientAPI do
270		if isc_dsql_execute_immediate(StatusVector, @fHandle, @TRHandle, 0,PAnsiChar(sql), aSQLDialect, nil) > 0 then
271		IBDatabaseError;
272		SignalActivity;
#	Line 286 | Line 280 | begin
280		end;
281
282		function TFB25Attachment.PrepareWithNamedParameters(transaction: ITransaction;
283	<	sql: AnsiString; aSQLDialect: integer; GenerateParamNames: boolean): IStatement;
283	>	sql: AnsiString; aSQLDialect: integer; GenerateParamNames: boolean;
284	>	CaseSensitiveParams: boolean): IStatement;
285		begin
286		CheckHandle;
287		Result := TFB25Statement.CreateWithParameterNames(self,transaction,sql,aSQLDialect,
288	<	GenerateParamNames);
288	>	GenerateParamNames,CaseSensitiveParams);
289		end;
290
291		function TFB25Attachment.GetEventHandler(Events: TStrings): IEvents;
#	Line 299 | Line 294 | begin
294		Result := TFB25Events.Create(self,Events);
295		end;
296
297	<	function TFB25Attachment.OpenArray(transaction: ITransaction; RelationName, ColumnName: AnsiString;
297	>	function TFB25Attachment.OpenArray(transaction: ITransaction; ArrayMetaData: IArrayMetaData;
298		ArrayID: TISC_QUAD): IArray;
299		begin
300		CheckHandle;
301		Result := TFB25Array.Create(self,transaction as TFB25Transaction,
302	<	GetArrayMetaData(transaction,RelationName,ColumnName),ArrayID);
308	<	end;
309	<
310	<	function TFB25Attachment.CreateArray(transaction: ITransaction; RelationName, ColumnName: AnsiString): IArray;
311	<	begin
312	<	CheckHandle;
313	<	Result := TFB25Array.Create(self,transaction as TFB25Transaction,
314	<	GetArrayMetaData(transaction,RelationName,ColumnName));
302	>	ArrayMetaData,ArrayID);
303		end;
304
305		function TFB25Attachment.CreateArray(transaction: ITransaction;
#	Line 343 | Line 331 | begin
331		Result := TFB25ArrayMetaData.Create(self,Transaction as TFB25Transaction,tableName,columnName);
332		end;
333
334	<	function TFB25Attachment.GetDBInformation(Requests: array of byte
347	<	): IDBInformation;
348	<	var ReqBuffer: PByte;
349	<	i: integer;
334	>	procedure ISCVersionCallback(userArg: pointer; text: PAnsiChar); cdecl;
335		begin
336	<	CheckHandle;
352	<	if Length(Requests) = 1 then
353	<	Result := GetDBInformation(Requests[0])
354	<	else
355	<	begin
356	<	Result := TDBInformation.Create;
357	<	GetMem(ReqBuffer,Length(Requests));
358	<	try
359	<	for i := 0 to Length(Requests) - 1 do
360	<	ReqBuffer[i] := Requests[i];
361	<
362	<	with Firebird25ClientAPI, Result as TDBInformation do
363	<	if isc_database_info(StatusVector, @(FHandle), Length(Requests), ReqBuffer,
364	<	getBufSize, Buffer) > 0 then
365	<	IBDataBaseError;
366	<
367	<	finally
368	<	FreeMem(ReqBuffer);
369	<	end;
370	<	end;
336	>	TStrings(userArg).Add(text);
337		end;
338
339	<	function TFB25Attachment.GetDBInformation(Request: byte): IDBInformation;
339	>	procedure TFB25Attachment.getFBVersion(version: TStrings);
340	>	var callback: pointer;
341		begin
342	<	CheckHandle;
343	<	Result := TDBInformation.Create;
344	<	with Firebird25ClientAPI, Result as TDBInformation do
345	<	if isc_database_info(StatusVector, @(FHandle), 1, @Request,
346	<	getBufSize, Buffer) > 0 then
380	<	IBDataBaseError;
342	>	callback := @ISCVersionCallback;
343	>	version.Clear;
344	>	with FFirebird25ClientAPI do
345	>	if isc_version(@FHandle,TISC_CALLBACK(callback),PVoid(version)) > 0 then
346	>	IBDataBaseError;
347		end;
348
349		end.

Diff Legend

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