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

* Patch from Laco to fix assigning transaction/database when database/transaction does not match

Browse Source 
git-svn-id: trunk@30483 -
This commit is contained in:
michael 2015-04-07 13:09:56 +00:00
parent 6a0afa1cc2
commit c1935de563
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
packages/fcl-db/src/sqldb/sqldb.pp
View File

@ -861,12 +861,27 @@ begin
begin
FDatabase.FreeNotification(Self);
FDatabase.RegisterStatement(Self);
if (Transaction=nil) and (Assigned(FDatabase.Transaction)) then
transaction := FDatabase.Transaction;
if not Assigned(Transaction) or (Transaction.DataBase <> FDatabase) then
Transaction := FDatabase.Transaction;
OnChangeSQL(Self);
end;
end;
procedure TCustomSQLStatement.SetTransaction(AValue: TSQLTransaction);
begin
if FTransaction=AValue then Exit;
UnPrepare;
if Assigned(FTransaction) then
FTransaction.RemoveFreeNotification(Self);
FTransaction:=AValue;
if Assigned(FTransaction) then
begin
FTransaction.FreeNotification(Self);
if Database <> FTransaction.DataBase then
Database := Transaction.Database as TSQLConnection;
end;
end;
procedure TCustomSQLStatement.SetDataSource(AValue: TDataSource);
begin
@ -894,21 +909,6 @@ begin
FSQL.Assign(AValue);
end;
procedure TCustomSQLStatement.SetTransaction(AValue: TSQLTransaction);
begin
if FTransaction=AValue then Exit;
UnPrepare;
if Assigned(FTransaction) then
FTransaction.RemoveFreeNotification(Self);
FTransaction:=AValue;
if Assigned(FTransaction) then
begin
FTransaction.FreeNotification(Self);
If (Database=Nil) then
Database:=Transaction.Database as TSQLConnection;
end;
end;
Procedure TCustomSQLStatement.DoExecute;
begin
FRowsAffected:=-1;
@ -2293,31 +2293,30 @@ end;
procedure TCustomSQLQuery.SetTransaction(Value: TDBTransaction);
begin
if Transaction = Value then Exit;
UnPrepare;
inherited;
If Assigned(FStatement) then
FStatement.Transaction:=TSQLTransaction(Value);
If (Transaction<>Nil) and (Database=Nil) then
Database:=SQLTransaction.Database;
FStatement.Transaction := TSQLTransaction(Value);
If Assigned(Transaction) and (SQLTransaction.DataBase<>Database) then
Database := Transaction.Database;
end;
procedure TCustomSQLQuery.SetDatabase(Value : TDatabase);
var db : tsqlconnection;
var DB : TSQLConnection;
begin
if (Database <> Value) then
begin
if assigned(value) and not (Value is TSQLConnection) then
DatabaseErrorFmt(SErrNotASQLConnection,[value.Name],self);
UnPrepare;
db := TSQLConnection(Value);
If Assigned(FStatement) then
FStatement.Database:=DB;
inherited setdatabase(value);
if assigned(value) and (Transaction = nil) and (Assigned(db.Transaction)) then
transaction := Db.Transaction;
end;
if Database = Value then Exit;
if Assigned(Value) and not (Value is TSQLConnection) then
DatabaseErrorFmt(SErrNotASQLConnection, [Value.Name], Self);
UnPrepare;
DB := TSQLConnection(Value);
If Assigned(FStatement) then
FStatement.Database := DB;
inherited;
if Assigned(DB) and Assigned(DB.Transaction) and (not Assigned(Transaction) or (Transaction.DataBase<>Value)) then
Transaction := DB.Transaction;
end;
function TCustomSQLQuery.IsPrepared: Boolean;