Skip to content

Fixed bug that caused KeyError in _commit_all_savepoints #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmoiron merged 3 commits into from
Oct 4, 2013
Merged

Fixed bug that caused KeyError in _commit_all_savepoints #34

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3259fd
Fixed bug that caused KeyError in johnny.transaction.TransactionManag…
ashald Oct 4, 2013
5fb2409
Little update in 'is transaction managed' checking logic
ashald Oct 4, 2013
e046ac3
Comment typo fix
ashald Oct 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions johnny/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,15 @@ def _flush(self, commit=True, using=None):
self._clear(using)
self._clear_sid_stack(using)

def _patched(self, original, commit=True):
def _patched(self, original, commit=True, unless_managed=False):
@wraps(original, assigned=available_attrs(original))
def newfun(using=None):
#1.2 version
original(using=using)
self._flush(commit=commit, using=using)
# copying behavior of original func
# if it is an 'unless_managed' version we should do nothing if transaction is managed
if not unless_managed or not self.is_managed(using=using):
self._flush(commit=commit, using=using)

return newfun

Expand Down Expand Up @@ -269,12 +272,18 @@ def patch(self):
"""
if not self._patched_var:
self._originals['rollback'] = self._getreal('rollback')
self._originals['rollback_unless_managed'] = self._getreal('rollback_unless_managed')
self._originals['commit'] = self._getreal('commit')
self._originals['commit_unless_managed'] = self._getreal('commit_unless_managed')
self._originals['savepoint'] = self._getreal('savepoint')
self._originals['savepoint_rollback'] = self._getreal('savepoint_rollback')
self._originals['savepoint_commit'] = self._getreal('savepoint_commit')
django_transaction.rollback = self._patched(django_transaction.rollback, False)
django_transaction.rollback_unless_managed = self._patched(django_transaction.rollback_unless_managed,
False, unless_managed=True)
django_transaction.commit = self._patched(django_transaction.commit, True)
django_transaction.commit_unless_managed = self._patched(django_transaction.commit_unless_managed,
True, unless_managed=True)
django_transaction.savepoint = self._savepoint(django_transaction.savepoint)
django_transaction.savepoint_rollback = self._savepoint_rollback(django_transaction.savepoint_rollback)
django_transaction.savepoint_commit = self._savepoint_commit(django_transaction.savepoint_commit)
Expand Down