From: Zane Bitter <zbitter@redhat.com>
Date: Mon, 25 Jun 2012 13:03:17 +0000 (+0200)
Subject: Get rid of _wrap_db_error()
X-Git-Tag: 2014.1~1666^2~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4bff543367b5283037b21da1b1de34a90e572343;p=openstack-build%2Fheat-build.git

Get rid of _wrap_db_error()

This was causing recursion depth errors, and the exceptions in question are
never being specifically caught anywhere anyway.

Fixes #137

Change-Id: Iebd2693bb1418392ebb041fbbb788bef28aae581
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/db/sqlalchemy/session.py b/heat/db/sqlalchemy/session.py
index caa9feca..dcdd6efb 100644
--- a/heat/db/sqlalchemy/session.py
+++ b/heat/db/sqlalchemy/session.py
@@ -27,30 +27,6 @@ _ENGINE = None
 _MAKER = None
 
 
-class Error(Exception):
-    pass
-
-
-class DBError(Error):
-    """Wraps an implementation specific exception."""
-    def __init__(self, inner_exception=None):
-        self.inner_exception = inner_exception
-        super(DBError, self).__init__(str(inner_exception))
-
-
-def _wrap_db_error(f):
-    def _wrap(*args, **kwargs):
-        try:
-            return f(*args, **kwargs)
-        except UnicodeEncodeError:
-            raise InvalidUnicodeParameter()
-        except Exception, e:
-            logger.exception(_('DB exception wrapped.'))
-            raise DBError(e)
-    _wrap.func_name = f.func_name
-    return _wrap
-
-
 def get_session(autocommit=True, expire_on_commit=False):
     """Return a SQLAlchemy session."""
     global _ENGINE, _MAKER
@@ -58,10 +34,7 @@ def get_session(autocommit=True, expire_on_commit=False):
     if _MAKER is None or _ENGINE is None:
         _ENGINE = get_engine()
         _MAKER = get_maker(_ENGINE, autocommit, expire_on_commit)
-    session = _MAKER()
-    session.query = _wrap_db_error(session.query)
-    session.flush = _wrap_db_error(session.flush)
-    return session
+    return _MAKER()
 
 
 class SynchronousSwitchListener(sqlalchemy.interfaces.PoolListener):