mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS oj4 (1.34.26); FILE MERGED

Browse Source 
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
This commit is contained in:
Oliver Bolte
2003-09-04 07:29:48 +00:00
parent 72f7253e03
commit fb9ca24ce6
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
connectivity/source/parse/sqliterator.cxx
View File

@@ -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);