Tag: cws_dev300_dba30c User: oj Date: 2008-05-06 10:32:31+0000 Modified: dba/connectivity/source/drivers/file/fcomp.cxx
Log: #i75557# accept functions where column name may be used File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: fcomp.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/fcomp.cxx?r1=1.29&r2=1.29.10.1 Delta lines: +5 -32 -------------------- --- fcomp.cxx 2008-04-10 09:06:27+0000 1.29 +++ fcomp.cxx 2008-05-06 10:32:28+0000 1.29.10.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fcomp.cxx,v $ - * $Revision: 1.29 $ + * $Revision: 1.29.10.1 $ * * This file is part of OpenOffice.org. * @@ -325,24 +325,15 @@ { DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree"); - if (!SQL_ISRULE(pPredicateNode->getChild(0),column_ref)) - { - ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Invalid Statement"),NULL); - return NULL; - } - sal_Int32 ePredicateType; - OSQLParseNode *pAtom; - OSQLParseNode *pOptEscape; sal_Unicode cEscape = L'\0'; - if (pPredicateNode->count() == 5) ePredicateType = SQLFilterOperator::NOT_LIKE; else ePredicateType = SQLFilterOperator::LIKE; - pAtom = pPredicateNode->getChild(pPredicateNode->count()-2); - pOptEscape = pPredicateNode->getChild(pPredicateNode->count()-1); + OSQLParseNode* pAtom = pPredicateNode->getChild(pPredicateNode->count()-2); + OSQLParseNode* pOptEscape = pPredicateNode->getChild(pPredicateNode->count()-1); if (!(pAtom->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(pAtom,parameter))) { @@ -381,12 +372,6 @@ { DBG_ASSERT(pPredicateNode->count() == 6,"OFILECursor: Fehler im Parse Tree"); - if (!SQL_ISRULE(pPredicateNode->getChild(0),column_ref)) - { - ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Invalid Statement"),NULL); - return NULL; - } - OSQLParseNode* pColumn = pPredicateNode->getChild(0); OSQLParseNode* p1stValue = pPredicateNode->getChild(3); OSQLParseNode* p2ndtValue = pPredicateNode->getChild(5); @@ -465,12 +450,6 @@ //------------------------------------------------------------------ OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) { - if (!SQL_ISRULE(pPredicateNode->getChild(0),column_ref)) - { - ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Invalid Statement"),NULL); - return NULL; - } - DBG_ASSERT(pPredicateNode->count() >= 3,"OFILECursor: Fehler im Parse Tree"); DBG_ASSERT(SQL_ISTOKEN(pPredicateNode->getChild(1),IS),"OFILECursor: Fehler im Parse Tree") @@ -665,12 +644,6 @@ // ----------------------------------------------------------------------------- OOperand* OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) { - /*if (!SQL_ISRULE(pPredicateNode->getChild(0),column_ref)) - { - ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Invalid Statement"),NULL); - return NULL; - }*/ - DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree"); sal_Bool bUpper = SQL_ISTOKEN(pPredicateNode->getChild(0),UPPER); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
