diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 07:29:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 07:29:48 +0000 |
| commit | fb9ca24ce6fbb23f95c9fa739fb3a77a69beb05b (patch) | |
| tree | 710a2c4dd46ef9214048414b497aa781f016f90c /connectivity | |
| parent | 72f7253e03dae18391dd52039aa898a2a2bcc142 (diff) | |
INTEGRATION: CWS oj4 (1.34.26); FILE MERGED
2003/08/28 11:23:30 oj 1.34.26.4: RESYNC: (1.34-1.35); FILE MERGED
2003/08/22 13:12:22 oj 1.34.26.3: #i16265# fixes in column types on numeric calcs
2003/07/07 05:46:17 oj 1.34.26.2: #i14220# change rule for sql_nul token
2003/07/01 12:25:50 oj 1.34.26.1: #i14648# implement numeric and datetime functions as well
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqliterator.cxx | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index d3aabcd12d75..3734e563d002 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sqliterator.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: hjs $ $Date: 2003-08-18 14:47:14 $ + * last change: $Author: obo $ $Date: 2003-09-04 08:29:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -628,6 +628,7 @@ void OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele ::rtl::OUString aColumnAlias(getColumnAlias(pColumnRef)); // kann leer sein ::rtl::OUString aColumnName; ::rtl::OUString aTableRange; + sal_Int32 nType = DataType::VARCHAR; sal_Bool bFkt(sal_False); pColumnRef = pColumnRef->getChild(0); if (SQL_ISRULE(pColumnRef,column_ref)) @@ -652,7 +653,23 @@ void OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele { getColumnTableRange(pColumnRef,aTableRange); } - bFkt = sal_True; + if ( pColumnRef->isRule() ) + { + bFkt = sal_True; + if ( SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term) || SQL_ISRULE(pColumnRef,factor) ) + { + nType = DataType::DOUBLE; + } + else + { + ::rtl::OUString sFunctionName; + if ( SQL_ISRULE(pColumnRef,length_exp) ) + pColumnRef->getChild(0)->getChild(0)->parseNodeToStr(sFunctionName,m_xDatabaseMetaData,NULL,sal_False,sal_False); + else + pColumnRef->getChild(0)->parseNodeToStr(sFunctionName,m_xDatabaseMetaData,NULL,sal_False,sal_False); + nType = ::connectivity::OSQLParser::getFunctionReturnType(sFunctionName,m_pParser ? &m_pParser->getContext() : NULL); + } + } } /* else @@ -663,7 +680,7 @@ void OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele */ if(!aColumnAlias.getLength()) aColumnAlias = aColumnName; - setSelectColumnName(aColumnName,aColumnAlias,aTableRange,bFkt); + setSelectColumnName(aColumnName,aColumnAlias,aTableRange,bFkt,nType); } } @@ -1280,7 +1297,7 @@ void OSQLParseTreeIterator::appendColumns(const ::rtl::OUString& _rTableAlias,co } } //----------------------------------------------------------------------------- -void OSQLParseTreeIterator::setSelectColumnName(const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt) +void OSQLParseTreeIterator::setSelectColumnName(const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType) { if(rColumnName.toChar() == '*' && !rTableRange.getLength()) @@ -1343,7 +1360,7 @@ void OSQLParseTreeIterator::setSelectColumnName(const ::rtl::OUString & rColumnN ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias)); OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(), - ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,sal_False,sal_False,m_aCaseEqual.isCaseSensitive()); + ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,m_aCaseEqual.isCaseSensitive()); pColumn->setFunction(bFkt); pColumn->setRealName(rColumnName); @@ -1364,7 +1381,7 @@ void OSQLParseTreeIterator::setSelectColumnName(const ::rtl::OUString & rColumnN ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias)); OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(), - ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,sal_False,sal_False,m_aCaseEqual.isCaseSensitive()); + ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,m_aCaseEqual.isCaseSensitive()); pColumn->setFunction(sal_True); pColumn->setRealName(rColumnName); pColumn->setTableName(aFind->first); |