diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-30 20:28:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-30 20:28:21 +0000 |
| commit | 0ff3fe079aeb853ee08afb757156d4a20d74010f (patch) | |
| tree | 7b787117480f206122a99af294408fec1da550bf /nova/db | |
| parent | be7b8dec431a1960d7a1050fd8cfadd5ee0af170 (diff) | |
| parent | 487384fcc864ef1955f99cdf713cf5c2d77ec023 (diff) | |
Merge "Fix missing wrap_db_error for Session.execute() method"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/session.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 727f79eec..28ec613c5 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -564,6 +564,10 @@ class Session(sqlalchemy.orm.session.Session): def flush(self, *args, **kwargs): return super(Session, self).flush(*args, **kwargs) + @wrap_db_error + def execute(self, *args, **kwargs): + return super(Session, self).execute(*args, **kwargs) + def get_maker(engine, autocommit=True, expire_on_commit=False): """Return a SQLAlchemy sessionmaker using the given engine.""" |
