From kde-commits  Mon Feb 29 23:12:20 2016
From: Jaroslaw Staniek <staniek () kde ! org>
Date: Mon, 29 Feb 2016 23:12:20 +0000
To: kde-commits
Subject: [kexi] src/plugins/queries: Query Designer: support queries having the same field name used in multi
Message-Id: <E1aaWzE-0000sv-Ak () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=145678896329945

Git commit 1bb1df8f9bc51fed8cd77d304623ae133bbfda8c by Jaroslaw Staniek.
Committed on 29/02/2016 at 23:07.
Pushed by staniek into branch 'master'.

Query Designer: support queries having the same field name used in multiple=
 tables

BUG:340056
FIXED-IN:2.9.11

(from calligra.git)

M  +2    -1    src/plugins/queries/kexiquerydesignerguieditor.cpp

http://commits.kde.org/kexi/1bb1df8f9bc51fed8cd77d304623ae133bbfda8c

diff --git a/src/plugins/queries/kexiquerydesignerguieditor.cpp b/src/plugi=
ns/queries/kexiquerydesignerguieditor.cpp
index d4e1848..f14c050 100644
--- a/src/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/src/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -510,7 +510,8 @@ KexiQueryDesignerGuiEditor::buildSchema(QString *errMsg)
                         qDebug() << "invisible field with sorting: do not =
add it to the fields list";
                         continue;
                     }
-                    if (!temp->query()->addField(currentField, fieldVisibl=
e)) {
+                    const int tablePosition =3D temp->query()->tablePositi=
on(t->name());
+                    if (!temp->query()->addField(currentField, tablePositi=
on, fieldVisible)) {
                         return false;
                     }
                     if (fieldVisible)