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

[MERGE] osv: db_name changed to dbname. 

bzr revid: vmt@openerp.com-20110615073142-t97lwikzrpe1g5js
This commit is contained in:
Vo Minh Thu 2011-06-15 09:31:42 +02:00
parent d9527bc6e4 522b77fdfa
commit 23dec280c7
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/osv.py
View File

@ -79,7 +79,7 @@ class object_proxy(netsvc.Service):
# We open a *new* cursor here, one reason is that failed SQL
# queries (as in IntegrityError) will invalidate the current one.
cr = False
if hasattr(src, '__call__'):
# callable. We need to find the right parameters to call
# the orm._sql_message(self, cr, uid, ids, context) function,
@ -92,18 +92,18 @@ class object_proxy(netsvc.Service):
ids = args[3]
else:
ids = []
cr = sql_db.db_connect(db_name).cursor()
cr = sql_db.db_connect(dbname).cursor()
return src(obj, cr, uid, ids, context=(ctx or {}))
except Exception:
pass
finally:
if cr: cr.close()
return False # so that the original SQL error will
# be returned, it is the best we have.
try:
cr = sql_db.db_connect(db_name).cursor()
cr = sql_db.db_connect(dbname).cursor()
res = translate(cr, name=False, source_type=ttype,
lang=lang, source=src)
if res: