[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/parse/sqliterator.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3d2f55bbc3067b0da9cf2d8e8f321765e74af6b4
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Jul 10 00:50:11 2013 +0200

    fdo#58644 fix handling of subqueries
    
    don't remove parentheses around subqueries
    (without the parentheses, it is not valid SQL)
    
    Change-Id: I4e9c55cea0276f10b0f97e31bc329949aba5b989
    Reviewed-on: https://gerrit.libreoffice.org/4790
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 9e51296..6007eb9 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -966,6 +966,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
                 sal_Bool bFkt(sal_False);
                 pColumnRef = pColumnRef->getChild(0);
                 if (
+                        pColumnRef->getKnownRuleID() != OSQLParseNode::subquery &&
                         pColumnRef->count() == 3 &&
                         SQL_ISPUNCTUATION(pColumnRef->getChild(0),"(") &&
                         SQL_ISPUNCTUATION(pColumnRef->getChild(2),")")