User: obo Date: 2006/07/13 08:14:53 Modified: dba/connectivity/source/parse/sqlnode.cxx
Log: INTEGRATION: CWS dba204a (1.38.58); FILE MERGED 2006/07/13 06:49:50 fs 1.38.58.4: RESYNC: (1.39-1.40); FILE MERGED 2006/07/06 05:54:43 oj 1.38.58.3: default inserted 2006/07/05 08:54:57 oj 1.38.58.2: RESYNC: (1.38-1.39); FILE MERGED 2006/05/22 10:51:46 oj 1.38.58.1: #i50910# refactoring and recognize between in predicate check File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqlnode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.40&r2=1.41 Delta lines: +229 -176 ----------------------- --- sqlnode.cxx 10 Jul 2006 14:39:02 -0000 1.40 +++ sqlnode.cxx 13 Jul 2006 15:14:51 -0000 1.41 @@ -543,6 +543,8 @@ if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i < (nCount - 1))) aStringPara += ::rtl::OUString::createFromAscii(","); } + else + i++; } aStringPara.trim(); rString += aStringPara; @@ -849,36 +851,39 @@ return _rTable.getLength() != 0; } // ----------------------------------------------------------------------------- -sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare) +void OSQLParser::killThousandSeparator(OSQLParseNode* pLiteral) { - sal_Int16 nErg = 0; - if (m_xField.is()) + if ( pLiteral ) { - sal_Int32 nType = 0; - try - { - Any aValue; + if ( s_xLocaleData->getLocaleItem(*m_pLocale).decimalSeparator.toChar() == ',' ) { - aValue = m_xField->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)); - aValue >>= nType; - } + pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace('.', sal_Unicode()); + // and replace decimal + pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace(',', '.'); } - catch( Exception& ) - { - return nErg; + else + pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace(',', sal_Unicode()); } +} +// ----------------------------------------------------------------------------- +OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral) +{ + if ( !pLiteral ) + return NULL; + + OSQLParseNode* pReturn = pLiteral; - if (pLiteral->isRule() && !SQL_ISRULE(pLiteral,value_exp)) + if ( pLiteral->isRule() && !SQL_ISRULE(pLiteral,value_exp)) { switch(nType) { case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: - if(!SQL_ISRULE(pLiteral,char_value_exp) && !buildStringNodes(pLiteral)) - break; + if ( !SQL_ISRULE(pReturn,char_value_exp) && !buildStringNodes(pReturn) ) + pReturn = NULL; default: - nErg = buildNode(pAppend,pLiteral,pCompare); + break; } } else @@ -891,16 +896,12 @@ case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: - nErg = buildNode(pAppend,pLiteral,pCompare); break; case DataType::DATE: case DataType::TIME: case DataType::TIMESTAMP: if (m_xFormatter.is()) - nErg = buildDate( nType, pAppend, pLiteral, pCompare ); - else - nErg = buildNode(pAppend,pLiteral,pCompare); - + pReturn = buildDate( nType, pReturn); break; default: m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_INVALID_COMPARE); @@ -913,9 +914,8 @@ case DataType::DATE: case DataType::TIME: case DataType::TIMESTAMP: - nErg = -1; - if (m_xFormatter.is()) - nErg = buildDate( nType, pAppend, pLiteral, pCompare ); + if ( m_xFormatter.is() ) + pReturn = buildDate( nType, pReturn); else m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_INVALID_DATE_COMPARE); break; @@ -938,20 +938,12 @@ case DataType::REAL: case DataType::DOUBLE: // kill thousand seperators if any - if (s_xLocaleData->getLocaleItem(*m_pLocale).decimalSeparator.toChar() == ',' ) - { - pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace('.', sal_Unicode()); - // and replace decimal - pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace(',', '.'); - } - else - pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace(',', sal_Unicode()); - nErg = buildNode(pAppend,pLiteral,pCompare); + killThousandSeparator(pReturn); break; case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: - nErg = buildNode_STR_NUM(pAppend,pLiteral,pCompare); + pReturn = buildNode_STR_NUM(pReturn); break; default: m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_INVALID_INT_COMPARE); @@ -966,24 +958,13 @@ case DataType::FLOAT: case DataType::REAL: case DataType::DOUBLE: - if (inPredicateCheck()) - { // kill thousand seperators if any - if (s_xLocaleData->getLocaleItem(*m_pLocale).decimalSeparator.toChar() == ',' ) - { - pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace('.', sal_Unicode()); - // and replace decimal - pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace(',', '.'); - } - else - pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace(',', sal_Unicode()); - } - nErg = buildNode(pAppend,pLiteral,pCompare); + killThousandSeparator(pReturn); break; case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: - nErg = buildNode_STR_NUM(pAppend,pLiteral,pCompare); + pReturn = buildNode_STR_NUM(pReturn); break; case DataType::INTEGER: default: @@ -992,12 +973,35 @@ } break; default: - OSL_ENSURE( false, "OSQLParser::buildComparsionRule: unexpected node type!" ); - break; + OSL_ENSURE(0,"Not handled!"); } } - if (!nErg) - --nErg; + return pReturn; +} +// ----------------------------------------------------------------------------- +sal_Int16 OSQLParser::buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare,OSQLParseNode* pLiteral2) +{ + OSL_ENSURE(inPredicateCheck(),"Only in predicate check allowed!"); + sal_Int16 nErg = 0; + if ( m_xField.is() ) + { + sal_Int32 nType = 0; + try + { + m_xField->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; + } + catch( Exception& ) + { + return nErg; + } + + OSQLParseNode* pNode1 = convertNode(nType,pLiteral); + if ( pNode1 ) + { + OSQLParseNode* pNode2 = convertNode(nType,pLiteral2); + if ( !m_sErrorMessage.getLength() ) + nErg = buildNode(pAppend,pCompare,pNode1,pNode2); + } } if (!pCompare->getParent()) // I have no parent so I was not used and I must die :-) delete pCompare; @@ -1077,40 +1081,83 @@ } return nErg; } -// ----------------------------------------------------------------------------- -sal_Int16 OSQLParser::buildNode_STR_NUM(OSQLParseNode*& pAppend,OSQLParseNode*& pLiteral,OSQLParseNode*& pCompare) +//----------------------------------------------------------------------------- +OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) { - static ::rtl::OUString aEmptyString; - OSQLParseNode* pColumnRef = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::column_ref)); - pColumnRef->append(new OSQLInternalNode(m_sFieldName,SQL_NODE_NAME)); - OSQLParseNode* pComp = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::comparison_predicate)); - pComp->append(pColumnRef); - pComp->append(pCompare); + ::rtl::OUString aEmptyString; + OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::set_fct_spec)); + pNewNode->append(new OSQLInternalNode(::rtl::OUString::createFromAscii("{"), SQL_NODE_PUNCTUATION)); + OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec)); + pNewNode->append(pDateNode); + pNewNode->append(new OSQLInternalNode(::rtl::OUString::createFromAscii("}"), SQL_NODE_PUNCTUATION)); + + switch (nType) + { + case DataType::DATE: + { + Date aDate = DBTypeConversion::toDate(fValue,DBTypeConversion::getNULLDate(m_xFormatter->getNumberFormatsSupplier())); + ::rtl::OUString aString = DBTypeConversion::toDateString(aDate); + pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_D)); + pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); + break; + } + case DataType::TIME: + { + Time aTime = DBTypeConversion::toTime(fValue); + ::rtl::OUString aString = DBTypeConversion::toTimeString(aTime); + pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_T)); + pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); + break; + } + case DataType::TIMESTAMP: + { + DateTime aDateTime = DBTypeConversion::toDateTime(fValue,DBTypeConversion::getNULLDate(m_xFormatter->getNumberFormatsSupplier())); + if (aDateTime.Seconds || aDateTime.Minutes || aDateTime.Hours) + { + ::rtl::OUString aString = DBTypeConversion::toDateTimeString(aDateTime); + pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_TS)); + pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_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)); + } + break; + } + } + return pNewNode; +} +// ----------------------------------------------------------------------------- +OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral) +{ + OSQLParseNode* pReturn = NULL; + if ( _pLiteral ) + { if (m_nFormatKey) { sal_Int16 nScale = 0; ::rtl::OUString aDec; try { - Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString::createFromAscii("Decimals") ); + Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Decimals")) ); aValue >>= nScale; } catch( Exception& ) { } - pComp->append(new OSQLInternalNode(stringToDouble(pLiteral->getTokenValue(),nScale),SQL_NODE_STRING)); + pReturn = new OSQLInternalNode(stringToDouble(_pLiteral->getTokenValue(),nScale),SQL_NODE_STRING); } else - pComp->append(new OSQLInternalNode(pLiteral->getTokenValue(),SQL_NODE_STRING)); - - pAppend->append(pComp); - - delete pLiteral; - pLiteral = NULL; + pReturn = new OSQLInternalNode(_pLiteral->getTokenValue(),SQL_NODE_STRING); - return 1; + delete _pLiteral; + _pLiteral = NULL; + } + return pReturn; } // ----------------------------------------------------------------------------- ::rtl::OUString OSQLParser::stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale) @@ -1486,14 +1533,9 @@ } } - // ----------------------------------------------------------------------------- -sal_Int16 OSQLParser::buildDate(sal_Int32 _nType,OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare) +bool OSQLParser::extractDate(OSQLParseNode* pLiteral,double& _rfValue) { - sal_Int16 nErg = -1; - double fValue = 0.0; - ::rtl::OUString sValue = pLiteral->getTokenValue(); - Reference< XNumberFormatsSupplier > xFormatSup = m_xFormatter->getNumberFormatsSupplier(); Reference< XNumberFormatTypes > xFormatTypes; if ( xFormatSup.is() ) @@ -1506,10 +1548,9 @@ m_nFormatKey = ::dbtools::getDefaultNumberFormat( m_xField, xFormatTypes, *m_pLocale ); } catch( Exception& ) { } - - // try converting the string into a date, according to our format key + ::rtl::OUString sValue = pLiteral->getTokenValue(); sal_Int32 nTryFormat = m_nFormatKey; - bool bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, fValue ); + bool bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, _rfValue ); // If our format key didn't do, try the default date format for our locale. if ( !bSuccess && xFormatTypes.is() ) @@ -1519,7 +1560,7 @@ nTryFormat = xFormatTypes->getStandardFormat( NumberFormat::DATE, *m_pLocale ); } catch( Exception& ) { } - bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, fValue ); + bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, _rfValue ); } // if this also didn't do, try ISO format @@ -1530,22 +1571,34 @@ nTryFormat = xFormatTypes->getFormatIndex( NumberFormatIndex::DATE_DIN_YYYYMMDD, *m_pLocale ); } catch( Exception& ) { } - bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, fValue ); + bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, _rfValue ); } // if this also didn't do, try fallback date format (en-US) if ( !bSuccess ) { nTryFormat = m_nDateFormatKey; - bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, fValue ); + bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, _rfValue ); } + return bSuccess; +} +// ----------------------------------------------------------------------------- +OSQLParseNode* OSQLParser::buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral) +{ + // try converting the string into a date, according to our format key + double fValue = 0.0; + OSQLParseNode* pFCTNode = NULL; - if ( bSuccess ) - nErg = buildNode_Date( fValue, _nType, pAppend, pLiteral, pCompare ); - else + if ( extractDate(pLiteral,fValue) ) + pFCTNode = buildNode_Date( fValue, _nType); + + delete pLiteral; + pLiteral = NULL; + + if ( !pFCTNode ) m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_INVALID_DATE_COMPARE); - return nErg; + return pFCTNode; } // ----------------------------------------------------------------------------- //----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
