From 21e409d7eaaa6e9853dea017524abc1fc1ea0141 Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Mon, 13 Apr 2015 14:20:30 -0700 Subject: [PATCH] Removed hack. 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 --- storyboard/db/api/base.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/storyboard/db/api/base.py b/storyboard/db/api/base.py index f9ccf2bd..63822d54 100644 --- a/storyboard/db/api/base.py +++ b/storyboard/db/api/base.py @@ -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')