strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS insight01 (1.2.2); FILE MERGED

Browse source 
2004/07/06 09:36:55 oj 1.2.2.4: RESYNC: (1.3-1.4); FILE MERGED
2004/05/12 12:03:22 oj 1.2.2.3: #i27455# order function
2004/04/05 10:11:51 oj 1.2.2.2: #i27286# add group by clause but without the having clause
2004/03/15 13:28:34 oj 1.2.2.1: #111075# ongoing work
This commit is contained in:
Jens-Heiner Rechtien 2004-08-02 14:01:24 +00:00
parent c1daf4cd81
commit 2b99b7b2a2
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: SingleSelectQueryComposer.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: obo $ $Date: 2004-06-01 10:09:41 $
* last change: $Author: hr $ $Date: 2004-08-02 15:01:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -389,22 +389,35 @@ void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference<
m_aCurrentColumns[SelectColumns]->getByName(aName) >>= xColumn;
OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME),"Property REALNAME not available!");
OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_TABLENAME),"Property TABLENAME not available!");
OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))),"Property FUNCTION not available!");
::rtl::OUString sRealName,sTableName;
xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
if(sTableName.indexOf('.',0) != -1)
sal_Bool bFunction = sal_False;
xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))) >>= bFunction;
if ( sRealName == aName )
{
::rtl::OUString aCatlog,aSchema,aTable;
::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::eInDataManipulation);
::dbtools::composeTableName(m_xMetaData,aCatlog,aSchema,aTable,sTableName,sal_True,::dbtools::eInDataManipulation);
if ( bFunction )
aAppendOrder += aName;
else
{
if(sTableName.indexOf('.',0) != -1)
{
::rtl::OUString aCatlog,aSchema,aTable;
::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::eInDataManipulation);
::dbtools::composeTableName(m_xMetaData,aCatlog,aSchema,aTable,sTableName,sal_True,::dbtools::eInDataManipulation);
}
else
sTableName = ::dbtools::quoteName(aQuote,sTableName);
aAppendOrder = sTableName;
aAppendOrder += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
aAppendOrder += ::dbtools::quoteName(aQuote,sRealName);
}
}
else
sTableName = ::dbtools::quoteName(aQuote,sTableName);
aAppendOrder = sTableName;
aAppendOrder += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
aAppendOrder += ::dbtools::quoteName(aQuote,sRealName);
aAppendOrder += ::dbtools::quoteName(aQuote,aName);
}
else
aAppendOrder = getTableAlias(column) + ::dbtools::quoteName(aQuote,aName);
@ -595,7 +608,10 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
{
::rtl::OUString sSql = m_aWorkSql;
sSql += STR_WHERE;
sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" 0 = 1"));
sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" 0 = 1 "));
::rtl::OUString sGroupBy = getSQLPart(Group);
if ( sGroupBy.getLength() )
sSql += sGroupBy;
Reference<XResultSetMetaDataSupplier> xResMetaDataSup;
xResMetaDataSup = Reference<XResultSetMetaDataSupplier>(xStmt->executeQuery(sSql),UNO_QUERY);