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

[IMP] remove size inference for selection lists with str|unicode value choices, simplify selection pg_type selection 

* if the first element of the choices list is an integer, use int4
* if the field has a size, use that size
* else use an unrestricted varchar

bzr revid: xmo@openerp.com-20110909152307-ralzt1g8l1b3e46x
This commit is contained in:
Xavier Morel 2011-09-09 17:23:07 +02:00
parent 8668ad7ed3
commit 7a3960f736
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openerp/osv/orm.py
View File

@ -518,18 +518,10 @@ def get_pg_type(f, type_override=None):
elif isinstance(f, (fields.char, fields.reference)):
f_type = ('varchar', pg_varchar(f.size))
elif isinstance(f, fields.selection):
if isinstance(f.selection, list) and isinstance(f.selection[0][0], (str, unicode)):
f_size = reduce(lambda x, y: max(x, len(y[0])), f.selection, f.size)
elif isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
f_size = -1
else:
f_size = getattr(f, 'size', None)
if f_size == -1:
if isinstance(f.selection, list) and isinstance(f.selection[0][0], int):
f_type = ('int4', 'INTEGER')
else:
f_type = ('varchar', pg_varchar(f_size))
f_type = ('varchar', pg_varchar(getattr(f, 'size', None)))
elif isinstance(f, fields.function):
if f._type = 'selection':
f_type = ('varchar', pg_varchar())