Proper transactions

tox.ini

@@ -18,6 +18,8 @@ envlist =
     pypy3-twisted15
 
 [testenv]
+passenv = DBTYPE
+sitepackages = True
 deps =
     coverage
     twisted>=15.0, <16.0

twistar/dbconfig/base.py

@@ -8,6 +8,7 @@
 from twistar.registry import Registry
 from twistar.exceptions import ImaginaryTableError, CannotRefreshError
 from twistar.utils import joinWheres
+from twistar.transaction import TransactionGuard
 
 
 class InteractionBase(object):
@@ -25,7 +26,7 @@ class InteractionBase(object):
 
 
     def __init__(self):
-        self.txn = None
+        self.txnGuard = TransactionGuard()
 
 
     def logEncode(self, s, encoding='utf-8'):
@@ -156,7 +157,6 @@ def _doselect(self, txn, q, args, tablename, one=False, cacheable=True):
             results.append(vals)
         return results
 
-
     def insertArgsToString(self, vals):
         """
         Convert C{{'name': value}} to an insert "values" string like C{"(%s,%s,%s)"}.
@@ -327,8 +327,8 @@ def getSchema(self, tablename, txn=None):
 
 
     def runInteraction(self, interaction, *args, **kwargs):
-        if self.txn is not None:
-            return defer.succeed(interaction(self.txn, *args, **kwargs))
+        if self.txnGuard.txn is not None:
+            return defer.succeed(interaction(self.txnGuard.txn, *args, **kwargs))
         return Registry.DBPOOL.runInteraction(interaction, *args, **kwargs)
 
 
@@ -345,8 +345,7 @@ def _doinsert(txn):
             if len(cols) == 0:
                 raise ImaginaryTableError("Table %s does not exist." % tablename)
             vals = obj.toHash(cols, includeBlank=self.__class__.includeBlankInInsert, exclude=['id'])
-            self.insert(tablename, vals, txn)
-            obj.id = self.getLastInsertID(txn)
+            obj.id = self.insert(tablename, vals, txn)
             return obj
 
         return self.runInteraction(_doinsert)

twistar/dbobject.py

@@ -6,7 +6,8 @@
 from twistar.registry import Registry
 from twistar.relationships import Relationship
 from twistar.exceptions import InvalidRelationshipError, DBObjectSaveError, ReferenceNotSavedError
-from twistar.utils import createInstances, deferredDict, dictToWhere, transaction
+from twistar.utils import createInstances, deferredDict, dictToWhere
+from twistar.transaction import transaction
 from twistar.validation import Validator, Errors
 
 from BermiInflector.Inflector import Inflector