Reviewers: ,
Please review this at http://codereview.tryton.org/48006/
Affected files:
M trytond/model/modelsql.py
Index: trytond/model/modelsql.py
===================================================================
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -1357,7 +1357,7 @@
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 @@
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 @@
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 @@
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 @@
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)
--
[email protected] mailing list
