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

[FIX] Allowing sql keywords as fields(don't use them in order by clause) 

lp bug: https://launchpad.net/bugs/430728 fixed

bzr revid: jvo@tinyerp.com-20091001110641-jks9s9pntnmewvgm
This commit is contained in:
uco(Open ERP) 2009-10-01 16:36:41 +05:30 committed by Jay (Open ERP)
parent 92df67814c
commit 22bb413066
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/osv/orm.py
View File

@ -1773,7 +1773,7 @@ class orm(orm_template):
f_pg_notnull = f_pg_def['attnotnull']
if isinstance(f, fields.function) and not f.store:
logger.notifyChannel('orm', netsvc.LOG_INFO, 'column %s (%s) in table %s removed: converted to a function !\n' % (k, f.string, self._table))
cr.execute('ALTER TABLE %s DROP COLUMN %s'% (self._table, k))
cr.execute('ALTER TABLE "%s" DROP COLUMN "%s"'% (self._table, k))
cr.commit()
f_obj_type = None
else:
@ -1821,7 +1821,7 @@ class orm(orm_template):
default = self._defaults[k](self, cr, 1, {})
if (default is not None):
ss = self._columns[k]._symbol_set
query = 'UPDATE "%s" SET "%s"=%s WHERE %s is NULL' % (self._table, k, ss[0], k)
query = 'UPDATE "%s" SET "%s"=%s WHERE "%s" is NULL' % (self._table, k, ss[0], k)
cr.execute(query, (ss[1](default),))
# add the NOT NULL constraint
cr.commit()