diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-25 12:28:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-25 13:50:26 +0200 |
| commit | 960d4ebf76d3e7c757d2625a1e52a22556da9d40 (patch) | |
| tree | bdf4a9368addb03388969d626df92934583d4952 | |
| parent | aa0a20bdccda8576163d763a81a0d7135114c17d (diff) | |
convert SQLNodeType to scoped enum
Change-Id: I622e55622d38e6017993c8bc52625c85d0f74d74
21 files changed, 488 insertions, 488 deletions
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 7de98df961df..63446ed0b859 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -399,7 +399,7 @@ namespace dbtools else { OSQLParseNode* pValueNode = pOdbcSpec->getChild(1); - if ( SQL_NODE_STRING == pValueNode->getNodeType() ) + if ( SQLNodeType::String == pValueNode->getNodeType() ) sReturn = pValueNode->getTokenValue(); else pValueNode->parseNodeToStr(sReturn, m_xConnection, &m_aParser.getContext()); @@ -419,7 +419,7 @@ namespace dbtools assert(pValueNode && "OPredicateInputController::getPredicateValue: invalid node child!"); if ( !_bForStatementUse ) { - if ( SQL_NODE_STRING == pValueNode->getNodeType() ) + if ( SQLNodeType::String == pValueNode->getNodeType() ) sReturn = pValueNode->getTokenValue(); else pValueNode->parseNodeToStr( diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 1546e27741c8..5fc031bd1e8e 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -459,11 +459,11 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode, OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQL_NODE_PUNCTUATION,0); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQLNodeType::Punctuation,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); OUString sParameterName = _sDefaultName; sParameterName += OUString::number(++_rParameterCount); - pChildNode->append(new OSQLParseNode( sParameterName,SQL_NODE_NAME,0)); + pChildNode->append(new OSQLParseNode( sParameterName,SQLNodeType::Name,0)); } else replaceParameterNodeName(pChildNode,_sDefaultName,_rParameterCount); diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 1c5a4c4256c1..0731d0d18a99 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -289,33 +289,33 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) OSQLParseNode* pRHS = parseTree->getChild( 2 ); if ( ( !( SQL_ISRULE( pLHS, column_ref ) ) // on the LHS, we accept a column or a constant int value - && ( pLHS->getNodeType() != SQL_NODE_INTNUM ) + && ( pLHS->getNodeType() != SQLNodeType::IntNum ) ) - || ( ( pRHS->getNodeType() != SQL_NODE_STRING ) // on the RHS, certain literals are acceptable - && ( pRHS->getNodeType() != SQL_NODE_INTNUM ) - && ( pRHS->getNodeType() != SQL_NODE_APPROXNUM ) + || ( ( pRHS->getNodeType() != SQLNodeType::String ) // on the RHS, certain literals are acceptable + && ( pRHS->getNodeType() != SQLNodeType::IntNum ) + && ( pRHS->getNodeType() != SQLNodeType::ApproxNum ) && !( SQL_ISTOKEN( pRHS, TRUE ) ) && !( SQL_ISTOKEN( pRHS, FALSE ) ) ) - || ( ( pLHS->getNodeType() == SQL_NODE_INTNUM ) // an int on LHS requires an int on RHS - && ( pRHS->getNodeType() != SQL_NODE_INTNUM ) + || ( ( pLHS->getNodeType() == SQLNodeType::IntNum ) // an int on LHS requires an int on RHS + && ( pRHS->getNodeType() != SQLNodeType::IntNum ) ) ) { m_pConnection->throwGenericSQLException( STR_QUERY_TOO_COMPLEX, *this ); } - if ( ( pPrec->getNodeType() != SQL_NODE_EQUAL ) - && ( pPrec->getNodeType() != SQL_NODE_NOTEQUAL ) + if ( ( pPrec->getNodeType() != SQLNodeType::Equal ) + && ( pPrec->getNodeType() != SQLNodeType::NotEqual ) ) { m_pConnection->throwGenericSQLException( STR_OPERATOR_TOO_COMPLEX, *this ); } // recognize the special "0 = 1" condition - if ( ( pLHS->getNodeType() == SQL_NODE_INTNUM ) - && ( pRHS->getNodeType() == SQL_NODE_INTNUM ) - && ( pPrec->getNodeType() == SQL_NODE_EQUAL ) + if ( ( pLHS->getNodeType() == SQLNodeType::IntNum ) + && ( pRHS->getNodeType() == SQLNodeType::IntNum ) + && ( pPrec->getNodeType() == SQLNodeType::Equal ) ) { const sal_Int32 nLHS = pLHS->getTokenValue().toInt64(); @@ -333,7 +333,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) pResult = createTest( aColumnName, E_BOOK_QUERY_IS, aMatchString ); - if ( pResult && ( pPrec->getNodeType() == SQL_NODE_NOTEQUAL ) ) + if ( pResult && ( pPrec->getNodeType() == SQLNodeType::NotEqual ) ) pResult = e_book_query_not( pResult, TRUE ); } // SQL like @@ -350,11 +350,11 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) OSQLParseNode *pAtom = pPart2->getChild( pPart2->count() - 2 ); // Match String bool bNotLike = pPart2->getChild(0)->isToken(); - if( !( pAtom->getNodeType() == SQL_NODE_STRING || - pAtom->getNodeType() == SQL_NODE_NAME || + if( !( pAtom->getNodeType() == SQLNodeType::String || + pAtom->getNodeType() == SQLNodeType::Name || SQL_ISRULE( pAtom,parameter ) || - ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_NAME ) || - ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_STRING ) ) ) + ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQLNodeType::Name ) || + ( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQLNodeType::String ) ) ) { SAL_INFO( "connectivity.evoab2", diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx index e60b24c3a0d5..ed6fbc911af0 100644 --- a/connectivity/source/drivers/file/FNoException.cxx +++ b/connectivity/source/drivers/file/FNoException.cxx @@ -75,7 +75,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< if (SQL_ISRULE(pParseNode,parameter)) { DBG_ASSERT(pParseNode->count() >= 1,"OResultSet: Parse Tree fehlerhaft"); - DBG_ASSERT(pParseNode->getChild(0)->getNodeType() == SQL_NODE_PUNCTUATION,"OResultSet: Parse Tree fehlerhaft"); + DBG_ASSERT(pParseNode->getChild(0)->getNodeType() == SQLNodeType::Punctuation,"OResultSet: Parse Tree fehlerhaft"); _rParaNodes.push_back(pParseNode); // Further descend not necessary diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 1f43f59b9354..f61c06e33875 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -625,7 +625,7 @@ void OStatement_Base::GetAssignValues() OSQLParseNode * pComp = pAssignment->getChild(1); OSL_ENSURE(pComp != nullptr,"OResultSet: pComp == NULL"); - OSL_ENSURE(pComp->getNodeType() == SQL_NODE_EQUAL,"OResultSet: pComp->getNodeType() != SQL_NODE_COMPARISON"); + OSL_ENSURE(pComp->getNodeType() == SQLNodeType::Equal,"OResultSet: pComp->getNodeType() != SQLNodeType::Comparison"); if (pComp->getTokenValue().toChar() != '=') { throwFunctionSequenceException(*this); @@ -647,9 +647,9 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnN OSL_ENSURE(aColumnName.getLength() > 0,"OResultSet: Column-Name nicht gefunden"); OSL_ENSURE(pRow_Value_Constructor_Elem != nullptr,"OResultSet: pRow_Value_Constructor_Elem darf nicht NULL sein!"); - if (pRow_Value_Constructor_Elem->getNodeType() == SQL_NODE_STRING || - pRow_Value_Constructor_Elem->getNodeType() == SQL_NODE_INTNUM || - pRow_Value_Constructor_Elem->getNodeType() == SQL_NODE_APPROXNUM) + if (pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::String || + pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::IntNum || + pRow_Value_Constructor_Elem->getNodeType() == SQLNodeType::ApproxNum) { // set value: SetAssignValue(aColumnName, pRow_Value_Constructor_Elem->getTokenValue()); diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index fe134b1803ec..151f70b8dc8b 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -93,7 +93,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode) if ( SQL_ISPUNCTUATION( pColumnRef, "*" ) || ( SQL_ISRULE( pColumnRef, column_ref ) && ( pColumnRef->count() == 3 ) - && ( pColumnRef->getChild(0)->getNodeType() == SQL_NODE_NAME ) + && ( pColumnRef->getChild(0)->getNodeType() == SQLNodeType::Name ) && SQL_ISPUNCTUATION( pColumnRef->getChild(1), "." ) && SQL_ISRULE( pColumnRef->getChild(2), column_val ) && SQL_ISPUNCTUATION( pColumnRef->getChild(2)->getChild(0), "*" ) diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index df70e20f9e79..071ff80be9af 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -112,13 +112,13 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS { switch (rColumnRef.getNodeType()) { - case SQL_NODE_STRING: + case SQLNodeType::String: m_aValue = aStrValue; m_eDBType = DataType::VARCHAR; m_aValue.setBound(true); return; - case SQL_NODE_INTNUM: - case SQL_NODE_APPROXNUM: + case SQLNodeType::IntNum: + case SQLNodeType::ApproxNum: m_aValue = aStrValue.toDouble(); m_eDBType = DataType::DOUBLE; m_aValue.setBound(true); diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 182c55032b71..4133b4ca2d74 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -226,9 +226,9 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) th DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree"); if ( !(SQL_ISRULE(pPredicateNode->getChild(0),column_ref) || - pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_STRING || - pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_INTNUM || - pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_APPROXNUM || + pPredicateNode->getChild(2)->getNodeType() == SQLNodeType::String || + pPredicateNode->getChild(2)->getNodeType() == SQLNodeType::IntNum || + pPredicateNode->getChild(2)->getNodeType() == SQLNodeType::ApproxNum || SQL_ISTOKEN(pPredicateNode->getChild(2),TRUE) || SQL_ISTOKEN(pPredicateNode->getChild(2),FALSE) || SQL_ISRULE(pPredicateNode->getChild(2),parameter) || @@ -246,17 +246,17 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) th sal_Int32 ePredicateType( SQLFilterOperator::EQUAL ); OSQLParseNode *pPrec = pPredicateNode->getChild(1); - if (pPrec->getNodeType() == SQL_NODE_EQUAL) + if (pPrec->getNodeType() == SQLNodeType::Equal) ePredicateType = SQLFilterOperator::EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL) + else if (pPrec->getNodeType() == SQLNodeType::NotEqual) ePredicateType = SQLFilterOperator::NOT_EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_LESS) + else if (pPrec->getNodeType() == SQLNodeType::Less) ePredicateType = SQLFilterOperator::LESS; - else if (pPrec->getNodeType() == SQL_NODE_LESSEQ) + else if (pPrec->getNodeType() == SQLNodeType::LessEq) ePredicateType = SQLFilterOperator::LESS_EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_GREATEQ) + else if (pPrec->getNodeType() == SQLNodeType::GreatEq) ePredicateType = SQLFilterOperator::GREATER_EQUAL; - else if (pPrec->getNodeType() == SQL_NODE_GREAT) + else if (pPrec->getNodeType() == SQLNodeType::Great) ePredicateType = SQLFilterOperator::GREATER; else OSL_FAIL( "OPredicateCompiler::execute_COMPARE: unexpected node type!" ); @@ -280,7 +280,7 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw( OSQLParseNode* pAtom = pPart2->getChild(pPart2->count()-2); OSQLParseNode* pOptEscape = pPart2->getChild(pPart2->count()-1); - if (!(pAtom->getNodeType() == SQL_NODE_STRING || + if (!(pAtom->getNodeType() == SQLNodeType::String || SQL_ISRULE(pAtom,parameter) || // odbc date SQL_ISRULE(pAtom,set_fct_spec) || @@ -300,7 +300,7 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw( m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,nullptr); } OSQLParseNode *pEscNode = pOptEscape->getChild(1); - if (pEscNode->getNodeType() != SQL_NODE_STRING) + if (pEscNode->getNodeType() != SQLNodeType::String) { m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,nullptr); } @@ -329,8 +329,8 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr OSQLParseNode* p2ndtValue = pPart2->getChild(4); if ( - !(p1stValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p1stValue,parameter)) - && !(p2ndtValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p2ndtValue,parameter)) + !(p1stValue->getNodeType() == SQLNodeType::String || SQL_ISRULE(p1stValue,parameter)) + && !(p2ndtValue->getNodeType() == SQLNodeType::String || SQL_ISRULE(p2ndtValue,parameter)) ) { m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_BETWEEN,nullptr); @@ -470,10 +470,10 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr { pOperand = new OOperandParam(pPredicateNode, ++m_nParamCounter); } - else if (pPredicateNode->getNodeType() == SQL_NODE_STRING || - pPredicateNode->getNodeType() == SQL_NODE_INTNUM || - pPredicateNode->getNodeType() == SQL_NODE_APPROXNUM || - pPredicateNode->getNodeType() == SQL_NODE_NAME || + else if (pPredicateNode->getNodeType() == SQLNodeType::String || + pPredicateNode->getNodeType() == SQLNodeType::IntNum || + pPredicateNode->getNodeType() == SQLNodeType::ApproxNum || + pPredicateNode->getNodeType() == SQLNodeType::Name || SQL_ISTOKEN(pPredicateNode,TRUE) || SQL_ISTOKEN(pPredicateNode,FALSE) || SQL_ISRULE(pPredicateNode,parameter)) @@ -482,7 +482,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr } else if((pPredicateNode->count() == 2) && (SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) && - pPredicateNode->getChild(1)->getNodeType() == SQL_NODE_INTNUM) + pPredicateNode->getChild(1)->getNodeType() == SQLNodeType::IntNum) { // if -1 or +1 is there OUString aValue(pPredicateNode->getChild(0)->getTokenValue()); aValue += pPredicateNode->getChild(1)->getTokenValue(); @@ -494,7 +494,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr const OSQLParseNode* pODBCNodeChild = pODBCNode->getChild(0); // Odbc Date or time - if (pODBCNodeChild->getNodeType() == SQL_NODE_KEYWORD && ( + if (pODBCNodeChild->getNodeType() == SQLNodeType::Keyword && ( SQL_ISTOKEN(pODBCNodeChild,D) || SQL_ISTOKEN(pODBCNodeChild,T) || SQL_ISTOKEN(pODBCNodeChild,TS) )) diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index a25d857e7c0e..1c5f494e083f 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -110,11 +110,11 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse { switch (pMiddle->getNodeType()) { - case SQL_NODE_EQUAL: + case SQLNodeType::Equal: // WHERE 0 = 1 return new KabConditionConstant(pLeft->getTokenValue() == pRight->getTokenValue()); - case SQL_NODE_NOTEQUAL: + case SQLNodeType::NotEqual: // WHERE 0 <> 1 // (might not be correct SQL... don't care, handling anyway) return new KabConditionConstant(pLeft->getTokenValue() != pRight->getTokenValue()); @@ -141,11 +141,11 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse switch (pMiddle->getNodeType()) { - case SQL_NODE_EQUAL: + case SQLNodeType::Equal: // WHERE Name = 'Smith' return new KabConditionEqual(sColumnName, sMatchString); - case SQL_NODE_NOTEQUAL: + case SQLNodeType::NotEqual: // WHERE Name <> 'Jones' return new KabConditionDifferent(sColumnName, sMatchString); diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 0cacb2d67dfe..ec11b22bf801 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -112,11 +112,11 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP { switch (pMiddle->getNodeType()) { - case SQL_NODE_EQUAL: + case SQLNodeType::Equal: // WHERE 0 = 1 return new MacabConditionConstant(pLeft->getTokenValue() == pRight->getTokenValue()); - case SQL_NODE_NOTEQUAL: + case SQLNodeType::NotEqual: // WHERE 0 <> 1 // (might not be correct SQL... don't care, handling anyway) return new MacabConditionConstant(pLeft->getTokenValue() != pRight->getTokenValue()); @@ -143,11 +143,11 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP switch (pMiddle->getNodeType()) { - case SQL_NODE_EQUAL: + case SQLNodeType::Equal: // WHERE Name = 'Smith' return new MacabConditionEqual(m_pHeader, sColumnName, sMatchString); - case SQL_NODE_NOTEQUAL: + case SQLNodeType::NotEqual: // WHERE Name <> 'Jones' return new MacabConditionDifferent(m_pHeader, sColumnName, sMatchString); diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 99b8d7ff894b..2591cda606ec 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -466,7 +466,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< if (SQL_ISRULE(pParseNode,parameter)) { OSL_ENSURE(pParseNode->count() >= 1,"OResultSet: Faulty Parse Tree"); - OSL_ENSURE(pParseNode->getChild(0)->getNodeType() == SQL_NODE_PUNCTUATION,"OResultSet: Faulty Parse Tree"); + OSL_ENSURE(pParseNode->getChild(0)->getNodeType() == SQLNodeType::Punctuation,"OResultSet: Faulty Parse Tree"); _rParaNodes.push_back(pParseNode); // further search isn't necessary diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index c00e34e97c13..a05037d65e0d 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -805,9 +805,9 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT { OSL_ENSURE(parseTree->count() == 3, "Error parsing COMPARE predicate"); if (!(SQL_ISRULE(parseTree->getChild(0),column_ref) || - parseTree->getChild(2)->getNodeType() == SQL_NODE_STRING || - parseTree->getChild(2)->getNodeType() == SQL_NODE_INTNUM || - parseTree->getChild(2)->getNodeType() == SQL_NODE_APPROXNUM || + parseTree->getChild(2)->getNodeType() == SQLNodeType::String || + parseTree->getChild(2)->getNodeType() == SQLNodeType::IntNum || + parseTree->getChild(2)->getNodeType() == SQLNodeType::ApproxNum || SQL_ISTOKEN(parseTree->getChild(2),TRUE) || SQL_ISTOKEN(parseTree->getChild(2),FALSE) || SQL_ISRULE(parseTree->getChild(2),parameter) || @@ -818,9 +818,9 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } OSQLParseNode *pPrec = parseTree->getChild(1); - if (pPrec->getNodeType() == SQL_NODE_EQUAL) + if (pPrec->getNodeType() == SQLNodeType::Equal) op = MQueryOp::Is; - else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL) + else if (pPrec->getNodeType() == SQLNodeType::NotEqual) op = MQueryOp::IsNot; OUString sTableRange; @@ -864,11 +864,11 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT (void)pOptEscape; const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT); - if (!(pAtom->getNodeType() == SQL_NODE_STRING || - pAtom->getNodeType() == SQL_NODE_NAME || + if (!(pAtom->getNodeType() == SQLNodeType::String || + pAtom->getNodeType() == SQLNodeType::Name || SQL_ISRULE(pAtom,parameter) || - ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQL_NODE_NAME ) || - ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQL_NODE_STRING ) + ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQLNodeType::Name ) || + ( pAtom->getChild(0) && pAtom->getChild(0)->getNodeType() == SQLNodeType::String ) ) ) { OSL_TRACE("analyseSQL : pAtom->count() = %zu", pAtom->count() ); diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 2c34608b142c..b5289df1792a 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -71,9 +71,9 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _NewValue, // yyi is the internal number of the rule that is currently being reduced // This can be mapped to external rule number via the yyrmap. -#define SQL_NEW_RULE newNode("", SQL_NODE_RULE, yyr1[yyn]) -#define SQL_NEW_LISTRULE newNode("", SQL_NODE_LISTRULE, yyr1[yyn]) -#define SQL_NEW_COMMALISTRULE newNode("", SQL_NODE_COMMALISTRULE, yyr1[yyn]) +#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn]) +#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn]) +#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn]) extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; @@ -298,7 +298,7 @@ op_schema: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($3); } ; @@ -343,9 +343,9 @@ base_table_def: $$->append($1); $$->append($2); $$->append($3); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} ; base_table_element_commalist: @@ -418,9 +418,9 @@ column_def_opt: | SQL_TOKEN_CHECK '(' search_condition ')' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} | SQL_TOKEN_REFERENCES table_node {$$ = SQL_NEW_RULE; $$->append($1); @@ -429,53 +429,53 @@ column_def_opt: {$$ = SQL_NEW_RULE; $$->append($1); $$->append($2); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} ; table_constraint_def: unique_spec '(' column_commalist ')' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} | SQL_TOKEN_FOREIGN SQL_TOKEN_KEY '(' column_commalist ')' SQL_TOKEN_REFERENCES table_node {$$ = SQL_NEW_RULE; $$->append($1); $$->append($2); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($6); $$->append($7);} | SQL_TOKEN_FOREIGN SQL_TOKEN_KEY '(' column_commalist ')' SQL_TOKEN_REFERENCES table_node '(' column_commalist ')' {$$ = SQL_NEW_RULE; $$->append($1); $$->append($2); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($6); $$->append($7); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($9); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} | SQL_TOKEN_CHECK '(' search_condition ')' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} ; op_column_commalist: /* empty */ {$$ = SQL_NEW_RULE;} | '(' column_commalist ')' {$$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; column_commalist: @@ -512,9 +512,9 @@ opt_column_commalist: /* empty */ {$$ = SQL_NEW_RULE;} | '(' column_commalist ')' {$$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} ; privilege_def: @@ -666,9 +666,9 @@ manipulative_statement: | '{' odbc_call_spec '}' { $$ = SQL_NEW_RULE; - $$->append(newNode("{", SQL_NODE_PUNCTUATION)); + $$->append(newNode("{", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode("}", SQL_NODE_PUNCTUATION)); + $$->append(newNode("}", SQLNodeType::Punctuation)); } ; @@ -733,9 +733,9 @@ values_or_query_spec: SQL_TOKEN_VALUES '(' table_value_const_list ')' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; @@ -762,9 +762,9 @@ row_value_constructor: /* | '(' row_value_const_list ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } */ ; @@ -888,7 +888,7 @@ selection: '*' { $$ = SQL_NEW_RULE; - $$->append(newNode("*", SQL_NODE_PUNCTUATION)); + $$->append(newNode("*", SQLNodeType::Punctuation)); } | scalar_exp_commalist ; @@ -1030,17 +1030,17 @@ table_ref: | '{' SQL_TOKEN_OJ joined_table '}' { $$ = SQL_NEW_RULE; - $$->append(newNode("{", SQL_NODE_PUNCTUATION)); + $$->append(newNode("{", SQLNodeType::Punctuation)); $$->append($2); $$->append($3); - $$->append(newNode("}", SQL_NODE_PUNCTUATION)); + $$->append(newNode("}", SQLNodeType::Punctuation)); } | '(' joined_table ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; where_clause: @@ -1088,9 +1088,9 @@ boolean_primary: | '(' search_condition ')' { // boolean_primary: rule 2 $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | row_value_constructor_elem /*[^')' ',']*/ { @@ -1100,15 +1100,15 @@ boolean_primary: sal_Int16 nErg = 0; if ( SQL_ISTOKEN( $1, NULL)) { - OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME)); - OSQLParseNode* pTFN = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::test_for_null)); + OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref)); + pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name)); + OSQLParseNode* pTFN = new OSQLInternalNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::test_for_null)); pTFN->append(pColumnRef); - OSQLParseNode* pNPP2 = new OSQLInternalNode("", SQL_NODE_RULE, OSQLParser::RuleID(OSQLParseNode::null_predicate_part_2)); - pNPP2->append(new OSQLInternalNode("", SQL_NODE_KEYWORD, SQL_TOKEN_IS)); - pNPP2->append(new OSQLInternalNode("", SQL_NODE_RULE, OSQLParser::RuleID(OSQLParseNode::sql_not))); - pNPP2->append(new OSQLInternalNode("", SQL_NODE_KEYWORD, SQL_TOKEN_NULL)); + OSQLParseNode* pNPP2 = new OSQLInternalNode("", SQLNodeType::Rule, OSQLParser::RuleID(OSQLParseNode::null_predicate_part_2)); + pNPP2->append(new OSQLInternalNode("", SQLNodeType::Keyword, SQL_TOKEN_IS)); + pNPP2->append(new OSQLInternalNode("", SQLNodeType::Rule, OSQLParser::RuleID(OSQLParseNode::sql_not))); + pNPP2->append(new OSQLInternalNode("", SQLNodeType::Keyword, SQL_TOKEN_NULL)); pTFN->append(pNPP2); $$->append(pTFN); @@ -1142,9 +1142,9 @@ parenthesized_boolean_value_expression: '(' search_condition ')' { // boolean_primary: rule 2 $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; boolean_factor: @@ -1261,7 +1261,7 @@ between_predicate_part_2: $$ = pTemp->removeAt((sal_uInt32)0); OSQLParseNode* pColumnRef = $$->removeAt((sal_uInt32)0); $$->insert(0,$1); - OSQLParseNode* pBetween_predicate = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::between_predicate)); + OSQLParseNode* pBetween_predicate = new OSQLInternalNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::between_predicate)); pBetween_predicate->append(pColumnRef); pBetween_predicate->append($$); $$ = pBetween_predicate; @@ -1331,8 +1331,8 @@ like_predicate: { if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) // like_predicate: rule 5 { - OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME)); + OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref)); + pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name)); $$ = SQL_NEW_RULE; $$->append(pColumnRef); @@ -1353,8 +1353,8 @@ like_predicate: { if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) // like_predicate: rule 6 { - OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME)); + OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref)); + pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name)); $$ = SQL_NEW_RULE; $$->append(pColumnRef); @@ -1382,10 +1382,10 @@ opt_escape: | '{' SQL_TOKEN_ESCAPE SQL_TOKEN_STRING '}' { $$ = SQL_NEW_RULE; - $$->append(newNode("{", SQL_NODE_PUNCTUATION)); + $$->append(newNode("{", SQLNodeType::Punctuation)); $$->append($2); $$->append($3); - $$->append(newNode("}", SQL_NODE_PUNCTUATION)); + $$->append(newNode("}", SQLNodeType::Punctuation)); } ; @@ -1416,8 +1416,8 @@ test_for_null: { if (xxx_pGLOBAL_SQLPARSER->inPredicateCheck())// test_for_null: rule 2 { - OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME)); + OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref)); + pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name)); $$ = SQL_NEW_RULE; $$->append(pColumnRef); @@ -1434,9 +1434,9 @@ in_predicate_value: } | '(' value_exp_commalist ')' {$$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; in_predicate_part_2: @@ -1459,8 +1459,8 @@ in_predicate: { if ( xxx_pGLOBAL_SQLPARSER->inPredicateCheck() )// in_predicate: rule 2 { - OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME)); + OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref)); + pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name)); $$ = SQL_NEW_RULE; $$->append(pColumnRef); @@ -1490,8 +1490,8 @@ all_or_any_predicate: { if(xxx_pGLOBAL_SQLPARSER->inPredicateCheck()) { - OSQLParseNode* pColumnRef = newNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQL_NODE_NAME)); + OSQLParseNode* pColumnRef = newNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref)); + pColumnRef->append(newNode(xxx_pGLOBAL_SQLPARSER->getFieldName(),SQLNodeType::Name)); $$ = SQL_NEW_RULE; $$->append(pColumnRef); @@ -1523,9 +1523,9 @@ unique_test: subquery: '(' query_exp ')' {$$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION));} + $$->append(newNode(")", SQLNodeType::Punctuation));} ; /* scalar expressions */ @@ -1546,8 +1546,8 @@ select_sublist: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); - $$->append(newNode("*", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); + $$->append(newNode("*", SQLNodeType::Punctuation)); } */ derived_column @@ -1562,24 +1562,24 @@ parameter_ref: op_like: '*' { - $$ = newNode("*", SQL_NODE_PUNCTUATION); + $$ = newNode("*", SQLNodeType::Punctuation); } | '?' { - $$ = newNode("?", SQL_NODE_PUNCTUATION); + $$ = newNode("?", SQLNodeType::Punctuation); } | op_like '*' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("*", SQL_NODE_PUNCTUATION)); + $$->append(newNode("*", SQLNodeType::Punctuation)); xxx_pGLOBAL_SQLPARSER->reduceLiteral($$, sal_False); } | op_like '?' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("?", SQL_NODE_PUNCTUATION)); + $$->append(newNode("?", SQLNodeType::Punctuation)); xxx_pGLOBAL_SQLPARSER->reduceLiteral($$, sal_False); } ; @@ -1659,19 +1659,19 @@ position_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_POSITION '(' value_exp_commalist ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; num_value_fct: @@ -1684,17 +1684,17 @@ char_length_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_SQL_TOKEN_INTNUM '(' value_exp ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; @@ -1703,9 +1703,9 @@ octet_length_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; bit_length_exp: @@ -1713,9 +1713,9 @@ bit_length_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; length_exp: @@ -1769,11 +1769,11 @@ extract_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; unsigned_value_spec: @@ -1801,63 +1801,63 @@ set_fct_spec: | '{' odbc_fct_spec '}' { $$ = SQL_NEW_RULE; - $$->append(newNode("{", SQL_NODE_PUNCTUATION)); + $$->append(newNode("{", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode("}", SQL_NODE_PUNCTUATION)); + $$->append(newNode("}", SQLNodeType::Punctuation)); } | function_name '(' ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | function_name0 '(' ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | function_name1 '(' function_arg ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | function_name2 '(' function_arg_commalist2 ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | function_name3 '(' function_arg_commalist3 ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | string_function_4Argument '(' function_arg_commalist4 ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | function_name '(' function_args_commalist ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | function_name12 '(' function_args_commalist ')' { @@ -1865,9 +1865,9 @@ set_fct_spec: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } else YYERROR; @@ -1878,9 +1878,9 @@ set_fct_spec: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } else YYERROR; @@ -2020,15 +2020,15 @@ window_function_type : { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_ROW_NUMBER '(' ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | general_set_fct | ntile_function @@ -2041,9 +2041,9 @@ ntile_function : { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; dynamic_parameter_specification: @@ -2061,15 +2061,15 @@ opt_lead_or_lag_function: | ',' offset { $$ = SQL_NEW_RULE; - $$->append(newNode(",", SQL_NODE_PUNCTUATION)); + $$->append(newNode(",", SQLNodeType::Punctuation)); $$->append($2); } | ',' offset ',' default_expression { $$ = SQL_NEW_RULE; - $$->append(newNode(",", SQL_NODE_PUNCTUATION)); + $$->append(newNode(",", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(",", SQL_NODE_PUNCTUATION)); + $$->append(newNode(",", SQLNodeType::Punctuation)); $$->append($4); } ; @@ -2083,10 +2083,10 @@ lead_or_lag_function: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($6); } ; @@ -2112,9 +2112,9 @@ first_or_last_value_function: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($5); } ; @@ -2131,11 +2131,11 @@ nth_value_function: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(",", SQL_NODE_PUNCTUATION)); + $$->append(newNode(",", SQLNodeType::Punctuation)); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($7); $$->append($8); } @@ -2204,9 +2204,9 @@ window_specification: '(' window_specification_details ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; opt_existing_window_name: @@ -2366,7 +2366,7 @@ op_parameter: | '?' SQL_EQUAL { $$ = SQL_NEW_RULE; - $$->append(newNode("?", SQL_NODE_PUNCTUATION)); + $$->append(newNode("?", SQLNodeType::Punctuation)); $$->append($2); } ; @@ -2386,9 +2386,9 @@ op_odbc_call_parameter: | '(' odbc_parameter_commalist ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; @@ -2434,27 +2434,27 @@ general_set_fct: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_COUNT '(' '*' ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); - $$->append(newNode("*", SQL_NODE_PUNCTUATION)); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); + $$->append(newNode("*", SQLNodeType::Punctuation)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_COUNT '(' opt_all_distinct function_arg ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | ordered_set_function | array_aggregate_function @@ -2485,20 +2485,20 @@ hypothetical_set_function: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($5); } | rank_function_type '(' hypothetical_set_function_value_expression_list SQL_TOKEN_BY value_exp_commalist ')' within_group_specification { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($7); } ; @@ -2512,9 +2512,9 @@ within_group_specification: $$ = SQL_NEW_RULE; $$->append($1); $$->append($2); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; hypothetical_set_function_value_expression_list: @@ -2526,9 +2526,9 @@ inverse_distribution_function: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; inverse_distribution_function_argument: @@ -2544,10 +2544,10 @@ array_aggregate_function: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; @@ -2642,9 +2642,9 @@ named_columns_join: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; simple_table: @@ -2657,9 +2657,9 @@ non_join_query_primary: | '(' non_join_query_exp ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; non_join_query_term: @@ -2717,11 +2717,11 @@ cast_spec: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; value_exp_primary: @@ -2734,9 +2734,9 @@ value_exp_primary: | '(' value_exp ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | cast_spec ; @@ -2750,13 +2750,13 @@ factor: | '-' num_primary %prec SQL_TOKEN_UMINUS { $$ = SQL_NEW_RULE; - $$->append(newNode("-", SQL_NODE_PUNCTUATION)); + $$->append(newNode("-", SQLNodeType::Punctuation)); $$->append($2); } | '+' num_primary %prec SQL_TOKEN_UMINUS { $$ = SQL_NEW_RULE; - $$->append(newNode("+", SQL_NODE_PUNCTUATION)); + $$->append(newNode("+", SQLNodeType::Punctuation)); $$->append($2); } ; @@ -2767,14 +2767,14 @@ term: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("*", SQL_NODE_PUNCTUATION)); + $$->append(newNode("*", SQLNodeType::Punctuation)); $$->append($3); } | term '/' factor { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("/", SQL_NODE_PUNCTUATION)); + $$->append(newNode("/", SQLNodeType::Punctuation)); $$->append($3); } ; @@ -2785,14 +2785,14 @@ num_value_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("+", SQL_NODE_PUNCTUATION)); + $$->append(newNode("+", SQLNodeType::Punctuation)); $$->append($3); } | num_value_exp '-' term { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("-", SQL_NODE_PUNCTUATION)); + $$->append(newNode("-", SQLNodeType::Punctuation)); $$->append($3); } ; @@ -2874,14 +2874,14 @@ interval_term: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("*", SQL_NODE_PUNCTUATION)); + $$->append(newNode("*", SQLNodeType::Punctuation)); $$->append($3); } | interval_term '/' factor { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("/", SQL_NODE_PUNCTUATION)); + $$->append(newNode("/", SQLNodeType::Punctuation)); $$->append($3); } ; @@ -2896,21 +2896,21 @@ datetime_value_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("+", SQL_NODE_PUNCTUATION)); + $$->append(newNode("+", SQLNodeType::Punctuation)); $$->append($3); } | datetime_value_exp '+' interval_term { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("+", SQL_NODE_PUNCTUATION)); + $$->append(newNode("+", SQLNodeType::Punctuation)); $$->append($3); } | datetime_value_exp '-' interval_term { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("-", SQL_NODE_PUNCTUATION)); + $$->append(newNode("-", SQLNodeType::Punctuation)); $$->append($3); } */ ; @@ -2925,24 +2925,24 @@ interval_value_exp: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("+", SQL_NODE_PUNCTUATION)); + $$->append(newNode("+", SQLNodeType::Punctuation)); $$->append($3); } | interval_value_exp '-' interval_term { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("-", SQL_NODE_PUNCTUATION)); + $$->append(newNode("-", SQLNodeType::Punctuation)); $$->append($3); } | '(' datetime_value_exp '-' datetime_term ')' interval_qualifier { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode("-", SQL_NODE_PUNCTUATION)); + $$->append(newNode("-", SQLNodeType::Punctuation)); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); $$->append($6); } ; @@ -3113,7 +3113,7 @@ concatenation: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("+", SQL_NODE_PUNCTUATION)); + $$->append(newNode("+", SQLNodeType::Punctuation)); $$->append($3); } | value_exp SQL_CONCAT value_exp @@ -3162,12 +3162,12 @@ bit_substring_fct: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); $$->append($6); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; bit_value_exp: @@ -3189,7 +3189,7 @@ bit_concatenation: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("+", SQL_NODE_PUNCTUATION)); + $$->append(newNode("+", SQLNodeType::Punctuation)); $$->append($3); } ; @@ -3247,20 +3247,20 @@ char_substring_fct: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); $$->append($6); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_SUBSTRING '(' value_exp_commalist ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; upper_lower: @@ -3272,9 +3272,9 @@ fold: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; form_conversion: @@ -3282,21 +3282,21 @@ form_conversion: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_CONVERT '(' cast_operand ',' cast_target ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(",", SQL_NODE_PUNCTUATION)); + $$->append(newNode(",", SQLNodeType::Punctuation)); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; char_translation: @@ -3304,11 +3304,11 @@ char_translation: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); $$->append($4); $$->append($5); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; trim_fct: @@ -3316,9 +3316,9 @@ trim_fct: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; trim_operands: @@ -3378,14 +3378,14 @@ catalog_name: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($3); } | SQL_TOKEN_NAME ':' schema_name { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(":", SQL_NODE_PUNCTUATION)); + $$->append(newNode(":", SQLNodeType::Punctuation)); $$->append($3); } ; @@ -3394,7 +3394,7 @@ schema_name: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($3); } ; @@ -3412,50 +3412,50 @@ column_ref: /* | table_node '.' column_val %prec '.' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($3);} */ | SQL_TOKEN_NAME '.' column_val %prec '.' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($3); } | SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val %prec '.' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($5);} | SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val %prec '.' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($5); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($7); } | SQL_TOKEN_NAME ':' SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val %prec '.' {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(":", SQL_NODE_PUNCTUATION)); + $$->append(newNode(":", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($5); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($7); } /* | SQL_TOKEN_NAME ';' SQL_TOKEN_NAME '.' SQL_TOKEN_NAME '.' column_val {$$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode(";", SQL_NODE_PUNCTUATION)); + $$->append(newNode(";", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($5); - $$->append(newNode(".", SQL_NODE_PUNCTUATION)); + $$->append(newNode(".", SQLNodeType::Punctuation)); $$->append($7); } */ ; @@ -3468,7 +3468,7 @@ column_val: | '*' { $$ = SQL_NEW_RULE; - $$->append(newNode("*", SQL_NODE_PUNCTUATION)); + $$->append(newNode("*", SQLNodeType::Punctuation)); } ; data_type: @@ -3551,9 +3551,9 @@ paren_char_length: '(' SQL_TOKEN_INTNUM ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; opt_paren_char_large_length: @@ -3564,9 +3564,9 @@ paren_character_large_object_length: '(' large_object_length ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; @@ -3583,27 +3583,27 @@ opt_multiplier: | 'K' { $$ = SQL_NEW_RULE; - $$->append(newNode("K", SQL_NODE_PUNCTUATION)); + $$->append(newNode("K", SQLNodeType::Punctuation)); } | 'M' { $$ = SQL_NEW_RULE; - $$->append(newNode("M", SQL_NODE_PUNCTUATION)); + $$->append(newNode("M", SQLNodeType::Punctuation)); } | 'G' { $$ = SQL_NEW_RULE; - $$->append(newNode("G", SQL_NODE_PUNCTUATION)); + $$->append(newNode("G", SQLNodeType::Punctuation)); } | 'T' { $$ = SQL_NEW_RULE; - $$->append(newNode("T", SQL_NODE_PUNCTUATION)); + $$->append(newNode("T", SQLNodeType::Punctuation)); } | 'P' { $$ = SQL_NEW_RULE; - $$->append(newNode("P", SQL_NODE_PUNCTUATION)); + $$->append(newNode("P", SQLNodeType::Punctuation)); } ; character_large_object_type: @@ -3748,18 +3748,18 @@ opt_paren_precision_scale: | '(' SQL_TOKEN_INTNUM ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | '(' SQL_TOKEN_INTNUM ',' SQL_TOKEN_INTNUM ')' { $$ = SQL_NEW_RULE; - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode(",", SQL_NODE_PUNCTUATION)); + $$->append(newNode(",", SQLNodeType::Punctuation)); $$->append($4); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; exact_numeric_type: @@ -3791,9 +3791,9 @@ approximate_numeric_type: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_FLOAT | SQL_TOKEN_REAL @@ -3858,19 +3858,19 @@ column: { sal_uInt32 nNod = $$->getRuleID(); delete $$; - $$ = newNode(xxx_pGLOBAL_SQLPARSER->TokenIDToStr(nNod), SQL_NODE_NAME); + $$ = newNode(xxx_pGLOBAL_SQLPARSER->TokenIDToStr(nNod), SQLNodeType::Name); } | SQL_TOKEN_CHAR_LENGTH { sal_uInt32 nNod = $$->getRuleID(); delete $$; - $$ = newNode(xxx_pGLOBAL_SQLPARSER->TokenIDToStr(nNod), SQL_NODE_NAME); + $$ = newNode(xxx_pGLOBAL_SQLPARSER->TokenIDToStr(nNod), SQLNodeType::Name); } | SQL_TOKEN_EXTRACT { sal_uInt32 nNod = $$->getRuleID(); delete $$; - $$ = newNode(xxx_pGLOBAL_SQLPARSER->TokenIDToStr(nNod), SQL_NODE_NAME); + $$ = newNode(xxx_pGLOBAL_SQLPARSER->TokenIDToStr(nNod), SQLNodeType::Name); } ; case_expression: @@ -3882,25 +3882,25 @@ case_abbreviation: { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_COALESCE '(' value_exp ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } | SQL_TOKEN_COALESCE '(' value_exp_commalist ')' { $$ = SQL_NEW_RULE; $$->append($1); - $$->append(newNode("(", SQL_NODE_PUNCTUATION)); + $$->append(newNode("(", SQLNodeType::Punctuation)); $$->append($3); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } ; case_specification: @@ -4022,16 +4022,16 @@ module: SQL_TOKEN_NAME parameter: ':' SQL_TOKEN_NAME {$$ = SQL_NEW_RULE; - $$->append(newNode(":", SQL_NODE_PUNCTUATION)); + $$->append(newNode(":", SQLNodeType::Punctuation)); $$->append($2);} | '?' {$$ = SQL_NEW_RULE; // test - $$->append(newNode("?", SQL_NODE_PUNCTUATION));} + $$->append(newNode("?", SQLNodeType::Punctuation));} | '[' SQL_TOKEN_NAME ']' {$$ = SQL_NEW_RULE; - $$->append(newNode("[", SQL_NODE_PUNCTUATION)); + $$->append(newNode("[", SQLNodeType::Punctuation)); $$->append($2); - $$->append(newNode("]", SQL_NODE_PUNCTUATION));} + $$->append(newNode("]", SQLNodeType::Punctuation));} ; /*** @@ -4062,8 +4062,8 @@ sql: $$ = $1; if ( SQL_ISRULE($$,search_condition) ) { - $$->insert(0,newNode("(", SQL_NODE_PUNCTUATION)); - $$->append(newNode(")", SQL_NODE_PUNCTUATION)); + $$->insert(0,newNode("(", SQLNodeType::Punctuation)); + $$->append(newNode(")", SQLNodeType::Punctuation)); } } else @@ -4175,7 +4175,7 @@ triggered_SQL_statement: $$->append($1); $$->append($2); $$->append($3); - $$->append(newNode(";", SQL_NODE_PUNCTUATION)); + $$->append(newNode(";", SQLNodeType::Punctuation)); $$->append($5); } ; @@ -4700,20 +4700,20 @@ sal_uInt32 OSQLParser::RuleID(OSQLParseNode::Rule eRule) sal_Int16 OSQLParser::buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,OSQLParseNode* pLiteral,OSQLParseNode* pLiteral2) { - OSQLParseNode* pColumnRef = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(new OSQLInternalNode(m_sFieldName,SQL_NODE_NAME)); + OSQLParseNode* pColumnRef = new OSQLInternalNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::column_ref)); + pColumnRef->append(new OSQLInternalNode(m_sFieldName,SQLNodeType::Name)); OSQLParseNode* pComp = NULL; if ( SQL_ISTOKEN( pCompare, BETWEEN) && pLiteral2 ) - pComp = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::between_predicate_part_2)); + pComp = new OSQLInternalNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::between_predicate_part_2)); else - pComp = new OSQLInternalNode("", SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::comparison_predicate)); + pComp = new OSQLInternalNode("", SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::comparison_predicate)); pComp->append(pColumnRef); pComp->append(pCompare); pComp->append(pLiteral); if ( pLiteral2 ) { - pComp->append(new OSQLInternalNode("", SQL_NODE_KEYWORD,SQL_TOKEN_AND)); + pComp->append(new OSQLInternalNode("", SQLNodeType::Keyword,SQL_TOKEN_AND)); pComp->append(pLiteral2); } pAppend->append(pComp); @@ -4729,11 +4729,11 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral) || SQL_ISRULE(pLiteral,subquery)) return 1; // here I have a function that I can't transform into a string - if(pLiteral->getNodeType() == SQL_NODE_INTNUM || pLiteral->getNodeType() == SQL_NODE_APPROXNUM || pLiteral->getNodeType() == SQL_NODE_ACCESS_DATE) + if(pLiteral->getNodeType() == SQLNodeType::IntNum || pLiteral->getNodeType() == SQLNodeType::ApproxNum || pLiteral->getNodeType() == SQLNodeType::AccessDate) { OSQLParseNode* pParent = pLiteral->getParent(); - OSQLParseNode* pNewNode = new OSQLInternalNode(pLiteral->getTokenValue(), SQL_NODE_STRING); + OSQLParseNode* pNewNode = new OSQLInternalNode(pLiteral->getTokenValue(), SQLNodeType::String); pParent->replace(pLiteral, pNewNode); delete pLiteral; pLiteral = NULL; @@ -4755,7 +4755,7 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral) sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral) { - OSQLParseNode* pComp = new OSQLInternalNode("=", SQL_NODE_EQUAL); + OSQLParseNode* pComp = new OSQLInternalNode("=", SQLNodeType::Equal); return buildPredicateRule(pAppend,pLiteral,pComp); } @@ -4774,7 +4774,7 @@ void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, bool bAppendBlank) aValue.append(pLiteral->getChild(1)->getTokenValue()); - pLiteral = new OSQLInternalNode(aValue.makeStringAndClear(),SQL_NODE_STRING); + pLiteral = new OSQLInternalNode(aValue.makeStringAndClear(),SQLNodeType::String); delete pTemp; } diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 84aa790032cb..2a81812c95ab 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -72,11 +72,11 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL; SQLyylval.pParseNode = new OSQLInternalNode(text, token); #define SQL_NEW_KEYWORD(token) \ - SQLyylval.pParseNode = new OSQLInternalNode("", SQL_NODE_KEYWORD, (token)); return token; + SQLyylval.pParseNode = new OSQLInternalNode("", SQLNodeType::Keyword, (token)); return token; -#define SQL_NEW_INTNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_INTNUM); return SQL_TOKEN_INTNUM; -#define SQL_NEW_APPROXNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_APPROXNUM); return SQL_TOKEN_APPROXNUM; -#define SQL_NEW_DATE SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_ACCESS_DATE); return SQL_TOKEN_ACCESS_DATE; +#define SQL_NEW_INTNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::IntNum); return SQL_TOKEN_INTNUM; +#define SQL_NEW_APPROXNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::ApproxNum); return SQL_TOKEN_APPROXNUM; +#define SQL_NEW_DATE SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; #define YY_INPUT(buf,result,max_size) \ { \ @@ -403,14 +403,14 @@ YEAR {SQL_NEW_KEYWORD(SQL_TOKEN_YEAR); } ZONE {SQL_NEW_KEYWORD(SQL_TOKEN_ZONE); } -"<" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_LESS);return SQL_LESS;} -">" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_GREAT);return SQL_GREAT;} -"=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_EQUAL);return SQL_EQUAL;} -"<=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_LESSEQ);return SQL_LESSEQ;} -">=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_GREATEQ);return SQL_GREATEQ;} -"<>" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_NOTEQUAL);return SQL_NOTEQUAL;} -"!=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_NOTEQUAL);return SQL_NOTEQUAL;} -"||" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_CONCAT);return SQL_CONCAT;} +"<" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Less);return SQL_LESS;} +">" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Great);return SQL_GREAT;} +"=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Equal);return SQL_EQUAL;} +"<=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::LessEq);return SQL_LESSEQ;} +">=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::GreatEq);return SQL_GREATEQ;} +"<>" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} +"!=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} +"||" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Concat);return SQL_CONCAT;} [-+*/:(),.;?{}] { return SQLyytext[0]; } @@ -497,9 +497,9 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; } * Valid strings: * '' 'a string' 'quote '' within string' * "" "a string" "quote "" within string" - * nTyp == 0 -> SQL_NODE_NAME - * nTyp == 1 -> SQL_NODE_STRING - * nTyp == 2 -> SQL_NODE_ACCESS_DATE + * nTyp == 0 -> SQLNodeType::Name + * nTyp == 1 -> SQLNodeType::String + * nTyp == 2 -> SQLNodeType::AccessDate */ sal_Int32 gatherString(int delim, sal_Int32 nTyp) { @@ -518,13 +518,13 @@ sal_Int32 gatherString(int delim, sal_Int32 nTyp) switch(nTyp) { case 0: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQL_NODE_NAME); + SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); return SQL_TOKEN_NAME; case 1: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQL_NODE_STRING); + SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::String); return SQL_TOKEN_STRING; case 2: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQL_NODE_ACCESS_DATE); + SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; } } @@ -619,7 +619,7 @@ sal_Int32 gatherName(const sal_Char* text) SQL_NEW_KEYWORD(nToken); break; default: - SQL_NEW_NODE(::rtl::OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQL_NODE_NAME); + SQL_NEW_NODE(::rtl::OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); return SQL_TOKEN_NAME; } } @@ -670,12 +670,12 @@ sal_Int32 gatherNamePre(const sal_Char* text) sal_Int32 nPos = xxx_pGLOBAL_SQLSCAN->GetCurrentPos() - nLength - 2; if (sStmt.getStr()[nPos] == ':') { - SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQL_NODE_NAME); + SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::Name); nToken = SQL_TOKEN_NAME; } else { - SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQL_NODE_STRING); + SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::String); nToken = SQL_TOKEN_STRING; } } diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index c9572ea3d66e..64942d33c116 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -484,7 +484,7 @@ void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoin OSL_ENSURE(i_pJoinCondition->count() == 3,"OQueryDesignView::InsertJoinConnection: error in the parse tree"); if (SQL_ISRULE(i_pJoinCondition->getChild(0),column_ref) && SQL_ISRULE(i_pJoinCondition->getChild(2),column_ref) && - i_pJoinCondition->getChild(1)->getNodeType() == SQL_NODE_EQUAL) + i_pJoinCondition->getChild(1)->getNodeType() == SQLNodeType::Equal) { m_pImpl->m_aJoinConditions.push_back( TNodePair(i_pJoinCondition->getChild(0),i_pJoinCondition->getChild(2)) ); } @@ -755,7 +755,7 @@ namespace { // Function _pColumnRef->parseNodeToStr( _out_rColumnName, _rxConnection ); } - else if(_pColumnRef->getNodeType() == SQL_NODE_NAME) + else if(_pColumnRef->getNodeType() == SQLNodeType::Name) _out_rColumnName = _pColumnRef->getTokenValue(); } } @@ -892,7 +892,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo (void)nLen; } } - else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD) + else if(pDatatype && pDatatype->getNodeType() == SQLNodeType::Keyword) { aTypeName = "VARCHAR"; } @@ -1172,7 +1172,7 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode) lcl_generateParameterName( *pParent, *_pNode ); } } - else if ( pParent->getNodeType() == SQL_NODE_COMMALISTRULE ) + else if ( pParent->getNodeType() == SQLNodeType::CommaListRule ) { lcl_generateParameterName( *pParent, *_pNode ); } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 3cddde3044bd..57db13ec1158 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -481,7 +481,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const pSubTree->impl_parseNodeToString_throw( aStringPara, aNewParam, false ); // In the comma lists, put commas in-between all subtrees - if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i < (nCount - 1))) + if ((m_eNodeType == SQLNodeType::CommaListRule) && (i < (nCount - 1))) aStringPara.append(","); } else @@ -546,7 +546,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const if(i != m_aChildren.end()) { pSubTree = *i; - if (pSubTree && pSubTree->getNodeType() == SQL_NODE_EQUAL) + if (pSubTree && pSubTree->getNodeType() == SQLNodeType::Equal) ++i; } } @@ -557,7 +557,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const ++i; // In the comma lists, put commas in-between all subtrees - if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i != m_aChildren.end())) + if ((m_eNodeType == SQLNodeType::CommaListRule) && (i != m_aChildren.end())) rString.append(","); } } @@ -567,7 +567,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const ++i; // In the comma lists, put commas in-between all subtrees - if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i != m_aChildren.end())) + if ((m_eNodeType == SQLNodeType::CommaListRule) && (i != m_aChildren.end())) { if (SQL_ISRULE(this,value_exp_commalist) && rParam.bPredicate) rString.append(";"); @@ -834,7 +834,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType, OSQLParseNode* pLiteral) { switch(pLiteral->getNodeType()) { - case SQL_NODE_STRING: + case SQLNodeType::String: switch(nType) { case DataType::CHAR: @@ -853,7 +853,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType, OSQLParseNode* pLiteral) break; } break; - case SQL_NODE_ACCESS_DATE: + case SQLNodeType::AccessDate: switch(nType) { case DataType::DATE: @@ -869,7 +869,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType, OSQLParseNode* pLiteral) break; } break; - case SQL_NODE_INTNUM: + case SQLNodeType::IntNum: switch(nType) { case DataType::BIT: @@ -897,7 +897,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType, OSQLParseNode* pLiteral) break; } break; - case SQL_NODE_APPROXNUM: + case SQLNodeType::ApproxNum: switch(nType) { case DataType::DECIMAL: @@ -991,12 +991,12 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode* pAppend, OSQLParseNode*& pLit { switch(pLiteral->getNodeType()) { - case SQL_NODE_STRING: + case SQLNodeType::String: pLiteral->m_aNodeValue = ConvertLikeToken(pLiteral, pEscape, false); pAppend->append(pLiteral); nErg = 1; break; - case SQL_NODE_APPROXNUM: + case SQLNodeType::ApproxNum: if (m_xFormatter.is() && m_nFormatKey) { sal_Int16 nScale = 0; @@ -1009,10 +1009,10 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode* pAppend, OSQLParseNode*& pLit { } - pAppend->append(new OSQLInternalNode(stringToDouble(pLiteral->getTokenValue(),nScale),SQL_NODE_STRING)); + pAppend->append(new OSQLInternalNode(stringToDouble(pLiteral->getTokenValue(),nScale),SQLNodeType::String)); } else - pAppend->append(new OSQLInternalNode(pLiteral->getTokenValue(),SQL_NODE_STRING)); + pAppend->append(new OSQLInternalNode(pLiteral->getTokenValue(),SQLNodeType::String)); delete pLiteral; nErg = 1; @@ -1034,11 +1034,11 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode* pAppend, OSQLParseNode*& pLit OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) { OUString aEmptyString; - OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::set_fct_spec)); - pNewNode->append(new OSQLInternalNode(OUString("{"), SQL_NODE_PUNCTUATION)); - OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec)); + OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::set_fct_spec)); + pNewNode->append(new OSQLInternalNode(OUString("{"), SQLNodeType::Punctuation)); + OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec)); pNewNode->append(pDateNode); - pNewNode->append(new OSQLInternalNode(OUString("}"), SQL_NODE_PUNCTUATION)); + pNewNode->append(new OSQLInternalNode(OUString("}"), SQLNodeType::Punctuation)); switch (nType) { @@ -1046,16 +1046,16 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) { Date aDate = DBTypeConversion::toDate(fValue,DBTypeConversion::getNULLDate(m_xFormatter->getNumberFormatsSupplier())); OUString aString = DBTypeConversion::toDateString(aDate); - pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_D)); - pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); + pDateNode->append(new OSQLInternalNode(aEmptyString, SQLNodeType::Keyword, SQL_TOKEN_D)); + pDateNode->append(new OSQLInternalNode(aString, SQLNodeType::String)); break; } case DataType::TIME: { css::util::Time aTime = DBTypeConversion::toTime(fValue); OUString aString = DBTypeConversion::toTimeString(aTime); - pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_T)); - pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); + pDateNode->append(new OSQLInternalNode(aEmptyString, SQLNodeType::Keyword, SQL_TOKEN_T)); + pDateNode->append(new OSQLInternalNode(aString, SQLNodeType::String)); break; } case DataType::TIMESTAMP: @@ -1064,14 +1064,14 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) if (aDateTime.Seconds || aDateTime.Minutes || aDateTime.Hours) { OUString aString = DBTypeConversion::toDateTimeString(aDateTime); - pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_TS)); - pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); + pDateNode->append(new OSQLInternalNode(aEmptyString, SQLNodeType::Keyword, SQL_TOKEN_TS)); + pDateNode->append(new OSQLInternalNode(aString, SQLNodeType::String)); } else { Date aDate(aDateTime.Day,aDateTime.Month,aDateTime.Year); - pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_D)); - pDateNode->append(new OSQLInternalNode(DBTypeConversion::toDateString(aDate), SQL_NODE_STRING)); + pDateNode->append(new OSQLInternalNode(aEmptyString, SQLNodeType::Keyword, SQL_TOKEN_D)); + pDateNode->append(new OSQLInternalNode(DBTypeConversion::toDateString(aDate), SQLNodeType::String)); } break; } @@ -1097,10 +1097,10 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral) { } - pReturn = new OSQLInternalNode(stringToDouble(_pLiteral->getTokenValue(),nScale),SQL_NODE_STRING); + pReturn = new OSQLInternalNode(stringToDouble(_pLiteral->getTokenValue(),nScale),SQLNodeType::String); } else - pReturn = new OSQLInternalNode(_pLiteral->getTokenValue(),SQL_NODE_STRING); + pReturn = new OSQLInternalNode(_pLiteral->getTokenValue(),SQLNodeType::String); delete _pLiteral; _pLiteral = nullptr; @@ -1495,7 +1495,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode) OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() > 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString("?") ,SQL_NODE_PUNCTUATION,0); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString("?") ,SQLNodeType::Punctuation,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); sal_Int32 nChildCount = pChildNode->count(); for(sal_Int32 j=1;j < nChildCount;++j) @@ -1583,7 +1583,7 @@ OSQLParseNode::OSQLParseNode(const sal_Char * pNewValue, ,m_eNodeType(eNewNodeType) ,m_nNodeID(nNewNodeID) { - OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType"); + OSL_ENSURE(m_eNodeType >= SQLNodeType::Rule && m_eNodeType <= SQLNodeType::Concat,"OSQLParseNode: created with invalid NodeType"); } OSQLParseNode::OSQLParseNode(const OString &_rNewValue, @@ -1594,7 +1594,7 @@ OSQLParseNode::OSQLParseNode(const OString &_rNewValue, ,m_eNodeType(eNewNodeType) ,m_nNodeID(nNewNodeID) { - OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType"); + OSL_ENSURE(m_eNodeType >= SQLNodeType::Rule && m_eNodeType <= SQLNodeType::Concat,"OSQLParseNode: created with invalid NodeType"); } OSQLParseNode::OSQLParseNode(const OUString &_rNewValue, @@ -1605,7 +1605,7 @@ OSQLParseNode::OSQLParseNode(const OUString &_rNewValue, ,m_eNodeType(eNewNodeType) ,m_nNodeID(nNewNodeID) { - OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType"); + OSL_ENSURE(m_eNodeType >= SQLNodeType::Rule && m_eNodeType <= SQLNodeType::Concat,"OSQLParseNode: created with invalid NodeType"); } OSQLParseNode::OSQLParseNode(const OSQLParseNode& rParseNode) @@ -1703,7 +1703,7 @@ bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodePara const OSQLParseNode* pODBCNode = m_aChildren[1]; const OSQLParseNode* pODBCNodeChild = pODBCNode->m_aChildren[0]; - if (pODBCNodeChild->getNodeType() == SQL_NODE_KEYWORD && ( + if (pODBCNodeChild->getNodeType() == SQLNodeType::Keyword && ( SQL_ISTOKEN(pODBCNodeChild, D) || SQL_ISTOKEN(pODBCNodeChild, T) || SQL_ISTOKEN(pODBCNodeChild, TS) )) @@ -1755,8 +1755,8 @@ void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString if (SQL_ISRULE(this,column_ref) && count() == 1 && getChild(0)->getTokenValue() == rColumnName) { OSQLParseNode * pCol = removeAt((sal_uInt32)0); - append(new OSQLParseNode(rTableAlias,SQL_NODE_NAME)); - append(new OSQLParseNode(OUString("."),SQL_NODE_PUNCTUATION)); + append(new OSQLParseNode(rTableAlias,SQLNodeType::Name)); + append(new OSQLParseNode(OUString("."),SQLNodeType::Punctuation)); append(pCol); } else @@ -1780,18 +1780,18 @@ OSQLParseNode* OSQLParseNode::getByRule(OSQLParseNode::Rule eRule) const OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term)); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term)); pNewNode->append(pLeftLeaf); - pNewNode->append(new OSQLParseNode(OUString("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND)); pNewNode->append(pRightLeaf); return pNewNode; } OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition)); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pLeftLeaf); - pNewNode->append(new OSQLParseNode(OUString("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR)); pNewNode->append(pRightLeaf); return pNewNode; } @@ -1889,9 +1889,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pRight = pSearchCondition->getChild(2); if(bNegate) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term)); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(OUString("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1909,9 +1909,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pRight = pSearchCondition->getChild(2); if(bNegate) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition)); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(OUString("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1949,11 +1949,11 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pComparison->getChild(1); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) // no NOT token (empty rule) - pNotNot = new OSQLParseNode(OUString("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); else { assert(SQL_ISTOKEN(pNot,NOT)); - pNotNot = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not)); + pNotNot = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::sql_not)); } pComparison->replace(pNot, pNotNot); delete pNot; @@ -1966,23 +1966,23 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool default: assert(false && "OSQLParseNode::negateSearchCondition: unexpected node type!"); // fall-through - case SQL_NODE_EQUAL: - pNewComparison = new OSQLParseNode(OUString("<>"),SQL_NODE_NOTEQUAL,SQL_NOTEQUAL); + case SQLNodeType::Equal: + pNewComparison = new OSQLParseNode(OUString("<>"),SQLNodeType::NotEqual,SQL_NOTEQUAL); break; - case SQL_NODE_LESS: - pNewComparison = new OSQLParseNode(OUString(">="),SQL_NODE_GREATEQ,SQL_GREATEQ); + case SQLNodeType::Less: + pNewComparison = new OSQLParseNode(OUString(">="),SQLNodeType::GreatEq,SQL_GREATEQ); break; - case SQL_NODE_GREAT: - pNewComparison = new OSQLParseNode(OUString("<="),SQL_NODE_LESSEQ,SQL_LESSEQ); + case SQLNodeType::Great: + pNewComparison = new OSQLParseNode(OUString("<="),SQLNodeType::LessEq,SQL_LESSEQ); break; - case SQL_NODE_LESSEQ: - pNewComparison = new OSQLParseNode(OUString(">"),SQL_NODE_GREAT,SQL_GREAT); + case SQLNodeType::LessEq: + pNewComparison = new OSQLParseNode(OUString(">"),SQLNodeType::Great,SQL_GREAT); break; - case SQL_NODE_GREATEQ: - pNewComparison = new OSQLParseNode(OUString("<"),SQL_NODE_LESS,SQL_LESS); + case SQLNodeType::GreatEq: + pNewComparison = new OSQLParseNode(OUString("<"),SQLNodeType::Less,SQL_LESS); break; - case SQL_NODE_NOTEQUAL: - pNewComparison = new OSQLParseNode(OUString("="),SQL_NODE_EQUAL,SQL_EQUAL); + case SQLNodeType::NotEqual: + pNewComparison = new OSQLParseNode(OUString("="),SQLNodeType::Equal,SQL_EQUAL); break; } pSearchCondition->replace(pComparison, pNewComparison); @@ -2002,11 +2002,11 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pPart2->getChild(nNotPos); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) // no NOT token (empty rule) - pNotNot = new OSQLParseNode(OUString("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); else { assert(SQL_ISTOKEN(pNot,NOT)); - pNotNot = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not)); + pNotNot = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::sql_not)); } pPart2->replace(pNot, pNotNot); delete pNot; @@ -2016,9 +2016,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 ); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) - pNotNot = new OSQLParseNode(OUString("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); else - pNotNot = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not)); + pNotNot = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::sql_not)); pSearchCondition->getChild( 1 )->replace(pNot, pNotNot); delete pNot; } @@ -2105,10 +2105,10 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition) OSQLParseNode* p1stAnd = MakeANDNode(pA,pB); OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC); pNewNode = MakeORNode(p1stAnd,p2ndAnd); - OSQLParseNode* pNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNode->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNode->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); pNode->append(pNewNode); - pNode->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); + pNode->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(p1stAnd); OSQLParseNode::eraseBraces(p2ndAnd); replaceAndReset(pSearchCondition,pNode); @@ -2184,10 +2184,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt(2); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2201,10 +2201,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt(2); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2218,10 +2218,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt((sal_uInt32)0); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2235,10 +2235,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt((sal_uInt32)0); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2286,19 +2286,19 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL switch (m_eNodeType) { - case SQL_NODE_KEYWORD: + case SQLNodeType::Keyword: _inout_rBuffer.appendAscii( "SQL_KEYWORD: " ); _inout_rBuffer.append( OStringToOUString( OSQLParser::TokenIDToStr( getTokenID() ), RTL_TEXTENCODING_UTF8 ) ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_COMPARISON: + case SQLNodeType::Comparison: _inout_rBuffer.appendAscii( "SQL_COMPARISON: " ); _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_NAME: + case SQLNodeType::Name: _inout_rBuffer.appendAscii( "SQL_NAME: " ); _inout_rBuffer.append( '"' ); _inout_rBuffer.append( m_aNodeValue ); @@ -2306,7 +2306,7 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_STRING: + case SQLNodeType::String: _inout_rBuffer.appendAscii( "SQL_STRING: " ); _inout_rBuffer.append( '\'' ); _inout_rBuffer.append( m_aNodeValue ); @@ -2314,53 +2314,53 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_INTNUM: + case SQLNodeType::IntNum: _inout_rBuffer.appendAscii( "SQL_INTNUM: " ); _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_APPROXNUM: + case SQLNodeType::ApproxNum: _inout_rBuffer.appendAscii( "SQL_APPROXNUM: " ); _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_PUNCTUATION: + case SQLNodeType::Punctuation: _inout_rBuffer.appendAscii( "SQL_PUNCTUATION: " ); _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_AMMSC: + case SQLNodeType::AMMSC: _inout_rBuffer.appendAscii( "SQL_AMMSC: " ); _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_EQUAL: - case SQL_NODE_LESS: - case SQL_NODE_GREAT: - case SQL_NODE_LESSEQ: - case SQL_NODE_GREATEQ: - case SQL_NODE_NOTEQUAL: + case SQLNodeType::Equal: + case SQLNodeType::Less: + case SQLNodeType::Great: + case SQLNodeType::LessEq: + case SQLNodeType::GreatEq: + case SQLNodeType::NotEqual: _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_ACCESS_DATE: + case SQLNodeType::AccessDate: _inout_rBuffer.appendAscii( "SQL_ACCESS_DATE: " ); _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_DATE: + case SQLNodeType::Date: _inout_rBuffer.appendAscii( "SQL_DATE: " ); _inout_rBuffer.append( m_aNodeValue ); _inout_rBuffer.append( '\n' ); break; - case SQL_NODE_CONCAT: + case SQLNodeType::Concat: _inout_rBuffer.appendAscii( "||" ); _inout_rBuffer.append( '\n' ); break; @@ -2423,7 +2423,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet // Append content to the output string switch (m_eNodeType) { - case SQL_NODE_KEYWORD: + case SQLNodeType::Keyword: { if (!rString.isEmpty()) rString.append(" "); @@ -2431,12 +2431,12 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet const OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.bInternational ? &rParam.m_rContext : nullptr); rString.append(OStringToOUString(sT,RTL_TEXTENCODING_UTF8)); } break; - case SQL_NODE_STRING: + case SQLNodeType::String: if (!rString.isEmpty()) rString.append(" "); rString.append(SetQuotation(m_aNodeValue,"\'","\'\'")); break; - case SQL_NODE_NAME: + case SQLNodeType::Name: if (!rString.isEmpty()) { switch(rString[rString.getLength()-1]) @@ -2466,7 +2466,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet else rString.append(m_aNodeValue); break; - case SQL_NODE_ACCESS_DATE: + case SQLNodeType::AccessDate: if (!rString.isEmpty()) rString.append(" "); rString.append("#"); @@ -2474,8 +2474,8 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet rString.append("#"); break; - case SQL_NODE_INTNUM: - case SQL_NODE_APPROXNUM: + case SQLNodeType::IntNum: + case SQLNodeType::ApproxNum: { OUString aTmp = m_aNodeValue; if (rParam.bInternational && rParam.bPredicate && rParam.cDecSep != '.') @@ -2486,7 +2486,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet rString.append(aTmp); } break; - case SQL_NODE_PUNCTUATION: + case SQLNodeType::Punctuation: if ( getParent() && SQL_ISRULE(getParent(),cast_spec) && m_aNodeValue.toChar() == '(' ) // no spaces in front of '(' { rString.append(m_aNodeValue); diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 81316864ea04..69d388c22347 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -1541,7 +1541,7 @@ bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,con OSL_ENSURE(pNode->count() == 3,"checkInnerJoin: Fehler im Parse Tree"); if (!(SQL_ISRULE(pNode->getChild(0),column_ref) && SQL_ISRULE(pNode->getChild(2),column_ref) && - pNode->getChild(1)->getNodeType() == SQL_NODE_EQUAL)) + pNode->getChild(1)->getNodeType() == SQLNodeType::Equal)) { bOk = false; } diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 7a667400a66a..4da4c7068bc1 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1089,22 +1089,22 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica sal_Int32 nPredicate = SQLFilterOperator::EQUAL; switch (_pPredicate->getNodeType()) { - case SQL_NODE_EQUAL: + case SQLNodeType::Equal: nPredicate = SQLFilterOperator::EQUAL; break; - case SQL_NODE_NOTEQUAL: + case SQLNodeType::NotEqual: nPredicate = SQLFilterOperator::NOT_EQUAL; break; - case SQL_NODE_LESS: + case SQLNodeType::Less: nPredicate = SQLFilterOperator::LESS; break; - case SQL_NODE_LESSEQ: + case SQLNodeType::LessEq: nPredicate = SQLFilterOperator::LESS_EQUAL; break; - case SQL_NODE_GREAT: + case SQLNodeType::Great: nPredicate = SQLFilterOperator::GREATER; break; - case SQL_NODE_GREATEQ: + case SQLNodeType::GreatEq: nPredicate = SQLFilterOperator::GREATER_EQUAL; break; default: @@ -1130,7 +1130,7 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pConditi aItem.Handle = getPredicateType(pCondition->getChild(i)); // don't display the equal - if (pCondition->getChild(i)->getNodeType() == SQL_NODE_EQUAL) + if (pCondition->getChild(i)->getNodeType() == SQLNodeType::Equal) i++; // go forward @@ -1145,34 +1145,34 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pConditi sal_Int32 i = pCondition->count() - 2; switch (pCondition->getChild(i)->getNodeType()) { - case SQL_NODE_EQUAL: + case SQLNodeType::Equal: // don't display the equal i--; aItem.Handle = SQLFilterOperator::EQUAL; break; - case SQL_NODE_NOTEQUAL: + case SQLNodeType::NotEqual: i--; aItem.Handle = SQLFilterOperator::NOT_EQUAL; break; - case SQL_NODE_LESS: + case SQLNodeType::Less: // take the opposite as we change the order i--; aValue = ">="; aItem.Handle = SQLFilterOperator::GREATER_EQUAL; break; - case SQL_NODE_LESSEQ: + case SQLNodeType::LessEq: // take the opposite as we change the order i--; aValue = ">"; aItem.Handle = SQLFilterOperator::GREATER; break; - case SQL_NODE_GREAT: + case SQLNodeType::Great: // take the opposite as we change the order i--; aValue = "<="; aItem.Handle = SQLFilterOperator::LESS_EQUAL; break; - case SQL_NODE_GREATEQ: + case SQLNodeType::GreatEq: // take the opposite as we change the order i--; aValue = "<"; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index ba937e1f6c62..00d4b662fab3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -570,7 +570,7 @@ namespace OSL_ENSURE(pNode->count() == 3,"OQueryDesignView::InsertJoinConnection: Error in Parse Tree"); if (!(SQL_ISRULE(pNode->getChild(0),column_ref) && SQL_ISRULE(pNode->getChild(2),column_ref) && - pNode->getChild(1)->getNodeType() == SQL_NODE_EQUAL)) + pNode->getChild(1)->getNodeType() == SQLNodeType::Equal)) { OUString sError(ModuleRes(STR_QRY_JOIN_COLUMN_COMPARE)); _pView->getController().appendError( sError ); @@ -1630,7 +1630,7 @@ namespace sal_uInt32 i=1; // don't display the equal - if (pCondition->getChild(i)->getNodeType() == SQL_NODE_EQUAL) + if (pCondition->getChild(i)->getNodeType() == SQLNodeType::Equal) i++; // Bedingung parsen @@ -1647,26 +1647,26 @@ namespace sal_Int32 i = static_cast<sal_Int32>(pCondition->count() - 2); switch (pCondition->getChild(i)->getNodeType()) { - case SQL_NODE_EQUAL: + case SQLNodeType::Equal: // don't display the equal i--; break; - case SQL_NODE_LESS: + case SQLNodeType::Less: // take the opposite as we change the order i--; aCondition += ">"; break; - case SQL_NODE_LESSEQ: + case SQLNodeType::LessEq: // take the opposite as we change the order i--; aCondition += ">="; break; - case SQL_NODE_GREAT: + case SQLNodeType::Great: // take the opposite as we change the order i--; aCondition += "<"; break; - case SQL_NODE_GREATEQ: + case SQLNodeType::GreatEq: // take the opposite as we change the order i--; aCondition += "<="; @@ -3256,38 +3256,38 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p sal_Int32 nDataType = DataType::DOUBLE; switch(pNode->getNodeType()) { - case SQL_NODE_CONCAT: - case SQL_NODE_STRING: + case SQLNodeType::Concat: + case SQLNodeType::String: nDataType = DataType::VARCHAR; break; - case SQL_NODE_INTNUM: + case SQLNodeType::IntNum: nDataType = DataType::INTEGER; break; - case SQL_NODE_APPROXNUM: + case SQLNodeType::ApproxNum: nDataType = DataType::DOUBLE; break; - case SQL_NODE_DATE: - case SQL_NODE_ACCESS_DATE: + case SQLNodeType::Date: + case SQLNodeType::AccessDate: nDataType = DataType::TIMESTAMP; break; - case SQL_NODE_COMPARISON: - case SQL_NODE_EQUAL: - case SQL_NODE_LESS: - case SQL_NODE_GREAT: - case SQL_NODE_LESSEQ: - case SQL_NODE_GREATEQ: - case SQL_NODE_NOTEQUAL: + case SQLNodeType::Comparison: + case SQLNodeType::Equal: + case SQLNodeType::Less: + case SQLNodeType::Great: + case SQLNodeType::LessEq: + case SQLNodeType::GreatEq: + case SQLNodeType::NotEqual: nDataType = DataType::BOOLEAN; break; - case SQL_NODE_NAME: - case SQL_NODE_LISTRULE: - case SQL_NODE_COMMALISTRULE: - case SQL_NODE_KEYWORD: - case SQL_NODE_AMMSC: //?? - case SQL_NODE_PUNCTUATION: + case SQLNodeType::Name: + case SQLNodeType::ListRule: + case SQLNodeType::CommaListRule: + case SQLNodeType::Keyword: + case SQLNodeType::AMMSC: //?? + case SQLNodeType::Punctuation: OSL_FAIL("Unexpected SQL Node Type"); break; - case SQL_NODE_RULE: + case SQLNodeType::Rule: switch(pNode->getKnownRuleID()) { case OSQLParseNode::select_statement: diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 9374ef3de951..05b8bde2c3ba 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -166,45 +166,45 @@ namespace dbaui switch (_pNode->getNodeType()) { - case SQL_NODE_KEYWORD: + case SQLNodeType::Keyword: { rString += "SQL_KEYWORD:"; OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID()); rString += OStringToOUString(sT, RTL_TEXTENCODING_UTF8); break;} - case SQL_NODE_COMPARISON: + case SQLNodeType::Comparison: { rString += "SQL_COMPARISON:" + _pNode->getTokenValue(); // append Nodevalue // and start new line break;} - case SQL_NODE_NAME: + case SQLNodeType::Name: { rString += "SQL_NAME:\"" + _pNode->getTokenValue() + "\""; break;} - case SQL_NODE_STRING: + case SQLNodeType::String: { rString += "SQL_STRING:'" + _pNode->getTokenValue(); break;} - case SQL_NODE_INTNUM: + case SQLNodeType::IntNum: { rString += "SQL_INTNUM:" + _pNode->getTokenValue(); break;} - case SQL_NODE_APPROXNUM: + case SQLNodeType::ApproxNum: { rString += "SQL_APPROXNUM:" + _pNode->getTokenValue(); break;} - case SQL_NODE_PUNCTUATION: + case SQLNodeType::Punctuation: { rString += "SQL_PUNCTUATION:" + _pNode->getTokenValue(); // append Nodevalue break;} - case SQL_NODE_AMMSC: + case SQLNodeType::AMMSC: { rString += "SQL_AMMSC:" + _pNode->getTokenValue(); // append Nodevalue break;} diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index b50e5f4c807d..cb750e53d2a3 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -64,11 +64,11 @@ namespace connectivity typedef ::std::vector< OSQLParseNode* > OSQLParseNodes; - enum SQLNodeType {SQL_NODE_RULE, SQL_NODE_LISTRULE, SQL_NODE_COMMALISTRULE, - SQL_NODE_KEYWORD, SQL_NODE_COMPARISON, SQL_NODE_NAME, - SQL_NODE_STRING, SQL_NODE_INTNUM, SQL_NODE_APPROXNUM, - SQL_NODE_EQUAL,SQL_NODE_LESS,SQL_NODE_GREAT,SQL_NODE_LESSEQ,SQL_NODE_GREATEQ,SQL_NODE_NOTEQUAL, - SQL_NODE_PUNCTUATION, SQL_NODE_AMMSC, SQL_NODE_ACCESS_DATE,SQL_NODE_DATE,SQL_NODE_CONCAT}; + enum class SQLNodeType { Rule, ListRule, CommaListRule, + Keyword, Comparison, Name, + String, IntNum, ApproxNum, + Equal, Less, Great, LessEq, GreatEq, NotEqual, + Punctuation, AMMSC, AccessDate, Date, Concat}; typedef ::std::set< OUString > QueryNameSet; @@ -360,8 +360,8 @@ namespace connectivity // IsRule tests whether a node is a rule (NonTerminal) // ATTENTION: rules can be leaves, for example empty lists bool isRule() const - { return (m_eNodeType == SQL_NODE_RULE) || (m_eNodeType == SQL_NODE_LISTRULE) - || (m_eNodeType == SQL_NODE_COMMALISTRULE);} + { return (m_eNodeType == SQLNodeType::Rule) || (m_eNodeType == SQLNodeType::ListRule) + || (m_eNodeType == SQLNodeType::CommaListRule);} // IsToken tests whether a Node is a Token (Terminal but not a rule) bool isToken() const {return !isRule();} @@ -458,7 +458,7 @@ namespace connectivity #define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token) #define SQL_ISTOKENOR2(pParseNode, tok0, tok1) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 )) #define SQL_ISTOKENOR3(pParseNode, tok0, tok1, tok2) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok2 )) - #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && (pParseNode)->getTokenValue() == (aString)) + #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQLNodeType::Punctuation && (pParseNode)->getTokenValue() == (aString)) } #endif // INCLUDED_CONNECTIVITY_SQLNODE_HXX |