odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] savepoint rollbacks after error transformation/logging of pg errors to still have original query on cursor 

bzr revid: xmo@openerp.com-20121112084202-4nl94x2omlb4w2jr
This commit is contained in:
Xavier Morel 2012-11-12 09:42:02 +01:00
parent 04a53fa3cc
commit 35c44e7e20
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/osv/orm.py
View File

@ -1354,16 +1354,16 @@ class BaseModel(object):
cr.execute('RELEASE SAVEPOINT model_load_save')
except psycopg2.Warning, e:
_logger.exception('Failed to import record %s', record)
cr.execute('ROLLBACK TO SAVEPOINT model_load_save')
messages.append(dict(info, type='warning', message=str(e)))
cr.execute('ROLLBACK TO SAVEPOINT model_load_save')
except psycopg2.Error, e:
_logger.exception('Failed to import record %s', record)
# Failed to write, log to messages, rollback savepoint (to
# avoid broken transaction) and keep going
cr.execute('ROLLBACK TO SAVEPOINT model_load_save')
messages.append(dict(
info, type='error',
**PGERROR_TO_OE[e.pgcode](self, fg, info, e)))
# Failed to write, log to messages, rollback savepoint (to
# avoid broken transaction) and keep going
cr.execute('ROLLBACK TO SAVEPOINT model_load_save')
if any(message['type'] == 'error' for message in messages):
cr.execute('ROLLBACK TO SAVEPOINT model_load')
ids = False