* Activated Action for TSQLTransaction

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@24702 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 12 insertions, 2 deletions

diff --git a/packages/fcl-db/src/sqldb/sqldb.pp b/packages/fcl-db/src/sqldb/sqldb.pp
index df07ff214a..00d68a3f80 100644
--- a/packages/fcl-db/src/sqldb/sqldb.pp
+++ b/packages/fcl-db/src/sqldb/sqldb.pp
@@ -1111,7 +1111,17 @@ end;
 procedure TSQLTransaction.EndTransaction;
 
 begin
-  rollback;
+  Case Action of
+    caNone : ;
+    caCommit :
+      Commit;
+    caCommitRetaining :
+      CommitRetaining;
+    caRollback :
+      RollBack;
+    caRollbackRetaining :
+      RollbackRetaining;
+  end;
 end;
 
 procedure TSQLTransaction.SetParams(const AValue: TStringList);
@@ -1203,7 +1213,7 @@ end;
 
 destructor TSQLTransaction.Destroy;
 begin
-  Rollback;
+  EndTransaction;
   FreeAndNil(FParams);
   inherited Destroy;
 end;