diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:17:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 08:17:59 +0000 |
| commit | 272567fbbc18279b7ad08f21af40ed96e6afbe15 (patch) | |
| tree | 573ebd9a1fae066564e477e4197390cbb58df1c7 /connectivity | |
| parent | 645d0a03cb4c9c4f81534db16a443f3c5e6adc4b (diff) | |
INTEGRATION: CWS dba31a (1.55.8); FILE MERGED
2008/07/30 12:03:27 fs 1.55.8.2: RESYNC: (1.55-1.56); FILE MERGED
2008/07/02 13:20:08 fs 1.55.8.1: #i91192#
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index dd4c6ba714..3fdce7b186 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sqlnode.cxx,v $ - * $Revision: 1.56 $ + * $Revision: 1.57 $ * * This file is part of OpenOffice.org. * @@ -1953,19 +1953,20 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B } else if(bNegate && (SQL_ISRULE(pSearchCondition,test_for_null) || SQL_ISRULE(pSearchCondition,in_predicate) || - SQL_ISRULE(pSearchCondition,like_predicate) || SQL_ISRULE(pSearchCondition,between_predicate) || - SQL_ISRULE(pSearchCondition,boolean_test) )) + SQL_ISRULE(pSearchCondition,between_predicate) || SQL_ISRULE(pSearchCondition,boolean_test) )) { sal_uInt32 nNotPos = 0; // row_value_constructor not SQL_TOKEN_IN in_predicate_value - // row_value_constructor not SQL_TOKEN_LIKE num_value_exp opt_escape // row_value_constructor not SQL_TOKEN_BETWEEN row_value_constructor SQL_TOKEN_AND row_value_constructor - if(SQL_ISRULE(pSearchCondition,in_predicate) || SQL_ISRULE(pSearchCondition,like_predicate) || - SQL_ISRULE(pSearchCondition,between_predicate)) + if ( SQL_ISRULE( pSearchCondition, in_predicate ) + || SQL_ISRULE( pSearchCondition, between_predicate ) + ) nNotPos = 1; // row_value_constructor SQL_TOKEN_IS not SQL_TOKEN_NULL // boolean_primary SQL_TOKEN_IS not truth_value - else if(SQL_ISRULE(pSearchCondition,test_for_null) || SQL_ISRULE(pSearchCondition,boolean_test)) + else if ( SQL_ISRULE( pSearchCondition, test_for_null ) + || SQL_ISRULE( pSearchCondition, boolean_test ) + ) nNotPos = 2; OSQLParseNode* pNot = pSearchCondition->getChild(nNotPos); @@ -1977,6 +1978,17 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B pSearchCondition->replace(pNot, pNotNot); delete pNot; } + else if(bNegate && (SQL_ISRULE(pSearchCondition,like_predicate))) + { + OSQLParseNode* pCheckForNOT = pSearchCondition->getChild( 1 ); + if ( pCheckForNOT->getNodeType() == SQL_TOKEN_NOT ) + delete pSearchCondition->removeAt( 1 ); + else + { + OSQLParseNode* pNot = new OSQLParseNode( ::rtl::OUString::createFromAscii( "NOT" ), SQL_NODE_KEYWORD, SQL_TOKEN_NOT ); + pSearchCondition->insert( 1, pNot ); + } + } } //----------------------------------------------------------------------------- void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition) |