Kaydet (Commit) b63547c8 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

not all OrCriteria have three children

and some contain a column in the second child

Change-Id: Ifd69758336233ed0233120b3315d4f33655fa994
üst 063105b4
...@@ -1305,10 +1305,12 @@ namespace ...@@ -1305,10 +1305,12 @@ namespace
{ {
bool bRet = true; bool bRet = true;
::connectivity::OSQLParseNode* pFirstColumnRef = _pFirstColumnRef; ::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); 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); bRet = CheckOrCriteria(pChild,pFirstColumnRef);
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment