openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Added a thrown exception when a transaction fails to be applied

Browse Source
This commit is contained in:
timmartin19
2014-10-08 17:11:19 -04:00
parent 44a5181009
commit f9874c7787
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -45,3 +45,6 @@ docs/_build
#iPython #iPython
*.ipynb *.ipynb
cqlengine/tests/*
cqlengine/tests*

1
cqlengine/exceptions.py
View File

@@ -2,5 +2,6 @@
class CQLEngineException(Exception): pass class CQLEngineException(Exception): pass
class ModelException(CQLEngineException): pass class ModelException(CQLEngineException): pass
class ValidationError(CQLEngineException): pass class ValidationError(CQLEngineException): pass
class TransactionException(CQLEngineException): pass
class UndefinedKeyspaceException(CQLEngineException): pass class UndefinedKeyspaceException(CQLEngineException): pass

8
cqlengine/query.py
View File

@@ -6,7 +6,7 @@ from cqlengine.columns import Counter, List, Set
from cqlengine.connection import execute from cqlengine.connection import execute
from cqlengine.exceptions import CQLEngineException, ValidationError from cqlengine.exceptions import CQLEngineException, ValidationError, TransactionException
from cqlengine.functions import Token, BaseQueryFunction, QueryValue, UnicodeMixin from cqlengine.functions import Token, BaseQueryFunction, QueryValue, UnicodeMixin
#CQL 3 reference: #CQL 3 reference:
@@ -836,6 +836,12 @@ class DMLQuery(object):
return self._batch.add_query(q) return self._batch.add_query(q)
else: else:
tmp = execute(q, consistency_level=self._consistency) tmp = execute(q, consistency_level=self._consistency)
if tmp and tmp[0].get('[applied]', True) is False:
tmp[0].pop('[applied]')
expected = ', '.join('{0}={1}'.format(t.field, t.value) for t in q.transactions)
actual = ', '.join('{0}={1}'.format(f, v) for f, v in tmp[0].items())
message = 'Transaction statement failed: Expected: {0} Actual: {1}'.format(expected, actual)
raise TransactionException(message)
return tmp return tmp
def batch(self, batch_obj): def batch(self, batch_obj):