From 566351406dd64ad65916238a74b4ebc18401a19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 6 Jul 2011 13:53:28 +0200 Subject: [PATCH] Add missing double quote on JOIN for field name review48006 --- trytond/model/modelsql.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py index 30e3fef8e2..17160f8855 100644 --- a/trytond/model/modelsql.py +++ b/trytond/model/modelsql.py @@ -1357,7 +1357,7 @@ class ModelSQL(ModelStorage): table_query = '(' + table_query + ') AS ' table_join = 'LEFT JOIN ' + table_query + \ '"' + itable._table + '" ON ' \ - '"%s".id = "%s".%s' % (itable._table, self._table, + '"%s".id = "%s"."%s"' % (itable._table, self._table, self._inherits[itable._name]) if table_join not in tables: tables.append(table_join) @@ -1850,7 +1850,7 @@ class ModelSQL(ModelStorage): otype) table_join = 'LEFT JOIN "' + table_name + '" AS ' \ '"' + table_name + '.' + link_field + '" ON ' \ - '"%s.%s".id = "%s".%s' % (table_name, link_field, + '"%s.%s".id = "%s"."%s"' % (table_name, link_field, self._table, link_field) for i in range(len(order_by)): if table_name in order_by[i]: @@ -1886,7 +1886,7 @@ class ModelSQL(ModelStorage): table_join = 'LEFT JOIN "' + table_name + '" AS ' \ '"' + table_name + '.' + link_field + '" ON ' \ - '"%s.%s".id = "%s".%s' % \ + '"%s.%s".id = "%s"."%s"' % \ (table_name, link_field, self._table, link_field) for i in range(len(order_by)): if table_name in order_by[i]: @@ -1905,7 +1905,7 @@ class ModelSQL(ModelStorage): table_join2 = 'LEFT JOIN "' + table_name2 + '" AS ' \ '"' + table_name2 + '.' + link_field2 + '" ON ' \ - '"%s.%s".id = "%s.%s".%s' % \ + '"%s.%s".id = "%s.%s"."%s"' % \ (table_name2, link_field2, table_name, link_field, link_field2) for i in range(len(order_by)): @@ -2013,7 +2013,7 @@ class ModelSQL(ModelStorage): link_field = self._inherits[obj._name] order_by, tables, tables_args = obj._order_calc(field, otype) table_join = 'LEFT JOIN "' + table_name + '" ON ' \ - '"%s".id = "%s".%s' % \ + '"%s".id = "%s"."%s"' % \ (table_name, self._table, link_field) if table_join not in tables: tables.insert(0, table_join)