opendev/storyboard
Code Issues Proposed changes

Removed hack.

Browse Source 
A db exception hack was added due to a bug in upstream oslo_db. This
removes the hack, since the version of oslo_db is now up to date.

Change-Id: If660c3bda0c2471c4a51f12bfb29183a259de546
This commit is contained in:
Michael Krotscheck 2015-04-13 14:20:30 -07:00
parent 2c0bd07e58
commit 21e409d7ea
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
storyboard/db/api/base.py
View File

@ -276,6 +276,9 @@ def entity_create(kls, values, session=None):
except db_exc.DBDuplicateEntry as de:
raise exc.DBDuplicateEntry(object_name=kls.__name__,
value=de.value)
except db_exc.DBReferenceError as re:
raise exc.DBReferenceError(object_name=kls.__name__,
value=re.constraint, key=re.key)
except db_exc.DBConnectionError:
raise exc.DBConnectionError()
except db_exc.ColumnError:
@ -284,11 +287,6 @@ def entity_create(kls, values, session=None):
raise exc.DBDeadLock()
except db_exc.DBInvalidUnicodeParameter:
raise exc.DBInvalidUnicodeParameter
# XXX(greghaynes) Due to a bug in oslo_db + PyMySQL reference errors
# are not properly raised.
except db_exc.DBError:
raise exc.DBReferenceError(object_name=kls.__name__,
value='unknown', key='unknown')
return entity
@ -313,6 +311,9 @@ def entity_update(kls, entity_id, values, session=None):
except db_exc.DBDuplicateEntry as de:
raise exc.DBDuplicateEntry(object_name=kls.__name__,
value=de.value)
except db_exc.DBReferenceError as re:
raise exc.DBReferenceError(object_name=kls.__name__,
value=re.constraint, key=re.key)
except db_exc.DBConnectionError:
raise exc.DBConnectionError()
except db_exc.ColumnError:
@ -321,11 +322,6 @@ def entity_update(kls, entity_id, values, session=None):
raise exc.DBDeadLock()
except db_exc.DBInvalidUnicodeParameter:
raise exc.DBInvalidUnicodeParameter
# XXX(greghaynes) Due to a bug in oslo_db + PyMySQL reference errors
# are not properly raised.
except db_exc.DBError:
raise exc.DBReferenceError(object_name=kls.__name__,
value='error', key='error')
session = get_session()
entity = __entity_get(kls, entity_id, session)
@ -346,6 +342,9 @@ def entity_hard_delete(kls, entity_id):
session.delete(entity)
except db_exc.DBReferenceError as re:
raise exc.DBReferenceError(object_name=kls.__name__,
value=re.constraint, key=re.key)
except db_exc.DBConnectionError:
raise exc.DBConnectionError()
except db_exc.ColumnError:
@ -354,8 +353,3 @@ def entity_hard_delete(kls, entity_id):
raise exc.DBDeadLock()
except db_exc.DBInvalidUnicodeParameter:
raise exc.DBInvalidUnicodeParameter()
# XXX(greghaynes) Due to a bug in oslo_db + PyMySQL reference errors
# are not properly raised.
except db_exc.DBError:
raise exc.DBReferenceError(object_name=kls.__name__,
value='unkonwn', key='unknonwn')