Remove ModelSQL.default_sequence
review348001
This commit is contained in:
1 parent
0485538910
commit
3a42c2ef49
3 files changed
+5
-21
No files matched your search
@@ -1,3 +1,5 @@
|
||||
* Remove ModelSQL.default_sequence
|
||||
|
||||
Version 2.4.0 - 2012-04-23
|
||||
* Bug fixes (see mercurial logs for details)
|
||||
* Don't allow rpc call on ModelStorage without ModelView (CVE-2012-0215)
|
||||
|
||||
@@ -204,26 +204,6 @@ class ModelSQL(ModelStorage):
|
||||
res.append(error)
|
||||
return res
|
||||
|
||||
def default_sequence(self):
|
||||
'''
|
||||
Return the default value for sequence field.
|
||||
'''
|
||||
pool = Pool()
|
||||
table = self._table
|
||||
if 'sequence' not in self._columns:
|
||||
for model in self._inherits:
|
||||
model_obj = pool.get(model)
|
||||
if 'sequence' in model_obj._columns:
|
||||
table = model_obj._table
|
||||
break
|
||||
cursor = Transaction().cursor
|
||||
cursor.execute('SELECT MAX(sequence) ' \
|
||||
'FROM "' + table + '"')
|
||||
res = cursor.fetchone()
|
||||
if res:
|
||||
return res[0] if res[0] else 0
|
||||
return 0
|
||||
|
||||
def table_query(self):
|
||||
'''
|
||||
Return None if the model is a real table in the database
|
||||
|
||||
@@ -9,7 +9,9 @@ class MPTT(ModelSQL, ModelView):
|
||||
_name = 'test.mptt'
|
||||
_description = __doc__
|
||||
name = fields.Char('Name', required=True)
|
||||
sequence = fields.Integer('Sequence', required=True)
|
||||
sequence = fields.Integer('Sequence',
|
||||
order_field='(%(table)s.sequence IS NULL) %(order)s, '
|
||||
'%(table)s.sequence %(order)s')
|
||||
parent = fields.Many2One('test.mptt', "Parent", select=True,
|
||||
left="left", right="right")
|
||||
left = fields.Integer('Left', required=True, select=True)
|
||||
|
||||
Reference in new issue
Block a user