Changeset 2033

Timestamp:

05/04/10 13:29:00 (4 months ago)

Author:

x.pechoultres@…

Message:

fix Database transaction : best transaction support, with Database::autoStartTransaction? slot

Location:

trunk/modules

Files:

• Db/source/database.cl (modified) (2 diffs)
• Db/source/model.cl (modified) (1 diff)
• Dbo/source/update.cl (modified) (2 diffs)

trunk/modules/Db/source/database.cl

@@ -312 +312 @@
 // commit all queries in a definitive way whereas rollbackTransaction(self) would
 // left the database unchanged in addition to end the transaction.
-[beginTransaction(self:Database) : void -> dbBeginTransaction(self)]
+[beginTransaction(self:Database) : void -> 
+        if (self.onTransaction?) commitTransaction(self),
+        self.onTransaction? := true,
+        dbBeginTransaction(self)]
 
 // @doc Transaction
 // commitTransaction(self) commits all queries that have been executed since
 // the call to beginTransaction(self) and ends the current transaction.
-[commitTransaction(self:Database) : void -> dbCommitTransaction(self)]
+[commitTransaction(self:Database) : void -> 
+        if self.onTransaction?
+                (self.onTransaction? := false,
+                dbCommitTransaction(self))
+        else //[1] warning : call dbCommitTransaction(~S) without starting transaction // self
+]
 
 // @doc Transaction
 // rollbackTransaction(self) cancel all queries that have been executed since
 // the call to beginTransaction(self) and ends the current transaction.
-[rollbackTransaction(self:Database) : void -> dbRollbackTransaction(self)]
-
-
+[rollbackTransaction(self:Database) : void -> 
+        if self.onTransaction?
+                (self.onTransaction? := false,
+                dbRollbackTransaction(self))
+        else //[1] warning : call dbCommitTransaction(~S) without starting transaction // self
+]
+                
 
 // @cat Disconnection
@@ -339 +351 @@
  -> //[2] disconnect(DataBase = ~S) // self,
         while self.queries free(self.queries[length(self.queries)]),
+        if self.onTransaction? commitTransaction(self),
         dbDisconnect(self)]
 

trunk/modules/Db/source/model.cl

@@ -115 +115 @@
                                 private/firstQuery:Query,       // chained queries start here
                                 private/currentQuery:Query,     // the current working query
-                                private/autoCommit?:boolean)
+                                private/autoCommit?:boolean,
+                                onTransaction?:boolean = false,
+                                autoStartTransaction?:boolean = false)
 
 (inverse(queries) := database)

trunk/modules/Dbo/source/update.cl

@@ -4 +4 @@
 [dbUpdate(db:Db/Database, self:object, lp:list[dbProperty]) : boolean ->
         //[DBOJECTS] dbUpdate(object = ~S, lp = (~A)) // self, lp,
+        if (db.Db/autoStartTransaction? & not(db.Db/onTransaction?)) Db/beginTransaction(db),
         let idProp := getIdProperty(self), nParam := 1, Params := list<any>(),
                 prepare? := (db.shouldPrepare? &
@@ -41 +42 @@
 
 -> //[DBOJECTS] dbUpdate(self = ~S,values = (~A), wheres = (~A)) // cl,values,wheres,
+        if (db.Db/autoStartTransaction? & not(db.Db/onTransaction?)) Db/beginTransaction(db),
         let tmp:boolean := false,
                 n := 0, nParam := 1, Params := list<any>(),