[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kexi] src/plugins/queries: Query Designer: support queries having the same field name used in multi
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2016-02-29 23:12:20
Message-ID: E1aaWzE-0000sv-Ak () scm ! kde ! org
[Download RAW message or body]

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/plugins/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, fieldVisible)) {
+                    const int tablePosition = \
temp->query()->tablePosition(t->name()); +                    if \
(!temp->query()->addField(currentField, tablePosition, fieldVisible)) {  return \
false;  }
                     if (fieldVisible)


[prev in list] [next in list] [prev in thread] [next in thread]