paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-29 21:00:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Allocate and de-allocate the statement-handle in the PrepareStatement and UnPrepareStatements instead of the TODBCConnection.Destroy and .Create procedures. Because as long as the statements arent de-allocated, the tables used in the statements are still locked. The result was that a select and a drop table on the same table were not possible within one TSQLQuery object.

Browse Source 
git-svn-id: trunk@12651 -
This commit is contained in:
joost 2009-02-01 21:21:13 +00:00
parent 56ef86333d
commit 689ca30b21
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/fcl-db/src/sqldb/odbc/odbcconn.pas
View File

@ -481,10 +481,6 @@ end;
procedure TODBCConnection.DeAllocateCursorHandle(var cursor: TSQLCursor);
begin
// make sure we don't deallocate the cursor if the connection was lost already
if not Connected then
(cursor as TODBCCursor).FSTMTHandle:=SQL_NULL_HSTMT;
FreeAndNil(cursor); // the destructor of TODBCCursor frees the ODBC Statement handle
end;
@ -499,6 +495,13 @@ var
begin
ODBCCursor:=cursor as TODBCCursor;
// allocate statement handle
ODBCCheckResult(
SQLAllocHandle(SQL_HANDLE_STMT, FDBCHandle, ODBCCursor.FSTMTHandle),
SQL_HANDLE_DBC, FDBCHandle, 'Could not allocate ODBC Statement handle.'
);
ODBCCursor.FPrepared:=True;
// Parameter handling
// Note: We can only pass ? parameters to ODBC, so we should convert named parameters like :MyID
// ODBCCursor.FParamIndex will map th i-th ? token in the (modified) query to an index for AParams
@ -525,8 +528,20 @@ begin
end;
procedure TODBCConnection.UnPrepareStatement(cursor: TSQLCursor);
var Res:SQLRETURN;
begin
// not necessary in ODBC
with TODBCCursor(cursor) do
begin
if FSTMTHandle<>SQL_NULL_HSTMT then
begin
// deallocate statement handle
Res:=SQLFreeHandle(SQL_HANDLE_STMT, FSTMTHandle);
if Res=SQL_ERROR then
ODBCCheckResult(Res,SQL_HANDLE_STMT, FSTMTHandle, 'Could not free ODBC Statement handle.');
FSTMTHandle:=SQL_NULL_HSTMT;
FPrepared := False;
end;
end;
end;
function TODBCConnection.GetTransactionHandle(trans: TSQLHandle): pointer;
@ -1221,12 +1236,6 @@ end;
constructor TODBCCursor.Create(Connection:TODBCConnection);
begin
// allocate statement handle
ODBCCheckResult(
SQLAllocHandle(SQL_HANDLE_STMT, Connection.FDBCHandle, FSTMTHandle),
SQL_HANDLE_DBC, Connection.FDBCHandle, 'Could not allocate ODBC Statement handle.'
);
{$IF NOT((FPC_VERSION>=2) AND (FPC_RELEASE>=1))}
// allocate FBlobStreams
FBlobStreams:=TList.Create;
@ -1237,19 +1246,10 @@ destructor TODBCCursor.Destroy;
var
Res:SQLRETURN;
begin
inherited Destroy;
{$IF NOT((FPC_VERSION>=2) AND (FPC_RELEASE>=1))}
FBlobStreams.Free;
{$ENDIF}
if FSTMTHandle<>SQL_NULL_HSTMT then
begin
// deallocate statement handle
Res:=SQLFreeHandle(SQL_HANDLE_STMT, FSTMTHandle);
if Res=SQL_ERROR then
ODBCCheckResult(Res,SQL_HANDLE_STMT, FSTMTHandle, 'Could not free ODBC Statement handle.');
end;
inherited Destroy;
end;
{$IF (FPC_VERSION>=2) AND (FPC_RELEASE>=1)}