From e4546c345907320d45d558fa3c6bdbd724f3e131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 1 Jul 2015 19:34:48 +0200 Subject: [PATCH] Add missing alias on selected columns This is required by python-sql, if the rownum limit flavor is used, to retrieve only the selected columns. issue4838 review12231002 --- trytond/model/modelsql.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py index ca5c524c1d..902a5b0a68 100644 --- a/trytond/model/modelsql.py +++ b/trytond/model/modelsql.py @@ -1105,7 +1105,7 @@ class ModelSQL(ModelStorage): columns.append(Coalesce( main_table.write_date, main_table.create_date).as_('_datetime')) - columns.append(Column(main_table, '__id')) + columns.append(Column(main_table, '__id').as_('__id')) if not query: columns += [f.sql_column(main_table).as_(n) for n, f in cls._fields.iteritems() @@ -1150,7 +1150,9 @@ class ModelSQL(ModelStorage): history = cls.__table_history__() for sub_ids in grouped_slice([r['id'] for r in rows]): where = reduce_ids(history.id, sub_ids) - cursor.execute(*history.select(history.id, history.write_date, + cursor.execute(*history.select( + history.id.as_('id'), + history.write_date.as_('write_date'), where=where & (history.write_date != Null) & (history.create_date == Null)