Skip to content
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.

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

change IntegrityError to DatabaseError #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion django_uidfield/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import string

from django.db import IntegrityError
from django.db.utils import DatabaseError


def new_uid(max_length, prefix=None,
Expand All @@ -28,6 +29,6 @@ def new_uid(max_length, prefix=None,
)

return prefix + pure_uid
except IntegrityError:
except DatabaseError:
if i >= max_generation_attempts:
raise
3 changes: 2 additions & 1 deletion django_uidfield/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db import models, IntegrityError, transaction
from django.db.utils import DatabaseError

from .fields import UIDField

Expand All @@ -21,7 +22,7 @@ def save(self, *args, **kwargs):
try:
with transaction.atomic():
return super(UIDModel, self).save(*args, **kwargs)
except IntegrityError as e:
except DatabaseError as e:
uid_fields = self.uid_fields()
if not any(field.attname in str(e) for field in uid_fields):
raise
Expand Down