not all OrCriteria have three children

and some contain a column in the second child Change-Id: Ifd69758336233ed0233120b3315d4f33655fa994

not all OrCriteria have three children
and some contain a column in the second child Change-Id: Ifd69758336233ed0233120b3315d4f33655fa994
b63547c8 · Lionel Elie Mamane · 063105b4 · b63547c8
Kaydet (Commit) b63547c8 authored Ock 28, 2015 tarafından Lionel Elie Mamane
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

QueryDesignView.cxx dbaccess/source/ui/querydesign/QueryDesignView.cxx +4 -2

No files found.
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1305,10 +1305,12 @@ namespace
    {
        bool bRet = true;
        ::connectivity::OSQLParseNode* pFirstColumnRef = _pFirstColumnRef;
-        for (int i = 0; i < 3 && bRet; i+=2)
+        for (size_t i = 0; bRet && i < _pCondition->count() && bRet; ++i)
        {
            const  ::connectivity::OSQLParseNode* pChild = _pCondition->getChild(i);
-            if ( SQL_ISRULE(pChild,search_condition) )
+            if ( pChild->isToken() )
+                continue;
+            else if ( SQL_ISRULE(pChild,search_condition) )
                bRet = CheckOrCriteria(pChild,pFirstColumnRef);
            else
            {