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

CWS-TOOLING: integrate CWS dba32d

Browse Source 
2009-06-30 08:58:13 +0200 fs  r273488 : merging latest changes from CWS dba32c
2009-06-29 11:40:42 +0200 oj  r273459 : #i101652# fix token handling
2009-06-26 09:27:30 +0200 oj  r273394 : #i101994# wrong condition checked
2009-06-22 12:09:04 +0200 fs  r273210 : merging latest changes from CWS dba32c
2009-06-18 11:01:06 +0200 fs  r273108 : merge latest changes from CWS dba32c
2009-06-17 14:19:33 +0200 oj  r273072 : handle images at the correct position
2009-06-17 13:37:19 +0200 oj  r273067 : compile error
2009-06-17 13:35:58 +0200 oj  r273066 : #i102201# handle images
2009-06-17 13:27:21 +0200 oj  r273065 : #i80917# disable checkbox for internal copy
2009-06-17 13:25:38 +0200 oj  r273064 : #i80917# disable checkbox for internal copy
2009-06-15 12:59:16 +0200 fs  r272978 : merging latest changes from CWS dba32c
2009-06-15 10:45:58 +0200 fs  r272967 : CWS-TOOLING: rebase CWS dba32d to trunk@272827 (milestone: DEV300:m50)
2009-06-15 08:41:05 +0200 fs  r272960 : merging changes from CWS dba32c (resulting from rebasing dba32c to m50)
2009-06-03 12:22:32 +0200 fs  r272554 : merging latest changes from CWS dba32c
2009-06-03 11:11:27 +0200 fs  r272549 : #i100818# special treatment for DataAwareness not needed anymore
2009-06-03 11:07:01 +0200 fs  r272548 : #i10000# removed package declaration
2009-06-03 09:21:03 +0200 oj  r272537 : #i93465# save window states
2009-06-03 08:56:25 +0200 oj  r272535 : solve compiler warnings
2009-06-03 08:55:02 +0200 oj  r272534 : #i102295# export shapes i the first cell
2009-06-03 07:35:18 +0200 oj  r272533 : #i101994# check for - and + prefix
2009-06-03 06:51:38 +0200 oj  r272531 : #i101463# use uncomposed table name
2009-06-03 06:33:06 +0200 oj  r272530 : #i102019# word corrected
2009-06-02 14:58:28 +0200 fs  r272507 : #i102443# call initializeParser from LoadFinished
2009-06-02 14:30:10 +0200 oj  r272504 : #i102019# introduce static ints
2009-06-02 13:51:02 +0200 oj  r272501 : #i102439# wrong method used
2009-06-02 13:44:09 +0200 fs  r272500 : #i102440# when tampering with Order/GroupBy, reset the cached columns
2009-06-02 10:53:01 +0200 fs  r272487 : #i102234# preserve the original filter when using a 0=1 filter
2009-06-02 10:21:21 +0200 oj  r272486 : #i100535# handle time values as float
2009-06-02 10:19:07 +0200 fs  r272485 : merging latest changes from CWS dba32c
2009-05-29 16:00:15 +0200 fs  r272467 : merging latest changes from dba32c
2009-05-29 15:31:25 +0200 fs  r272462 : merging latest changes from dba32c
2009-05-29 10:58:03 +0200 oj  r272438 : #101135# export embedded-text
2009-05-29 08:17:57 +0200 oj  r272431 : #i80917# make attribute not optional
2009-05-29 08:17:32 +0200 oj  r272430 : remoe unused token
2009-05-29 07:17:15 +0200 oj  r272429 : #i80917# make attribute not optional
2009-05-28 12:48:14 +0200 oj  r272401 : #i102201# insert images in context menu
2009-05-28 12:47:44 +0200 oj  r272400 : #i80917# add new attribute to handle first line
2009-05-28 12:16:12 +0200 oj  r272397 : #i96134# add / to path when it doesn't exist
2009-05-28 12:11:08 +0200 oj  r272390 : #i80917# add new attribute to handle first line
2009-05-28 11:33:35 +0200 oj  r272388 : #i101652# add new checkbox to handle header line as column names
2009-05-28 11:30:15 +0200 oj  r272387 : #i101652# add localize
2009-05-28 11:15:53 +0200 oj  r272386 : merge from dba32c
2009-05-28 09:08:25 +0200 fs  r272378 : merged a build fix from CWS dba32c
This commit is contained in:
Vladimir Glazounov
2009-07-06 09:00:26 +00:00
parent cb1400a076
commit e200eed28c
18 changed files with 164 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
View File

@@ -579,8 +579,13 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
// set the query
setQuery_Impl(aSql.makeStringAndClear());
// parameters may also have changed
clearParametersCollection();
// clear column collections which (might) have changed
clearColumns( ParameterColumns );
if ( _ePart == Order )
clearColumns( OrderColumns );
if ( _ePart == Group )
clearColumns( GroupByColumns );
// also, since the "additive filter" change, we need to rebuild our "additive" statement
aSql = m_aPureSelectSQL;
@@ -676,26 +681,42 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
bCase = m_xMetaData->supportsMixedCaseQuotedIdentifiers();
aSelectColumns = m_aSqlIterator.getSelectColumns();
::rtl::OUString sSql = m_aPureSelectSQL;
sSql += STR_WHERE;
sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" 0 = 1 "));
::rtl::OUString sGroupBy = getSQLPart(Group,m_aSqlIterator,sal_True);
if ( sGroupBy.getLength() )
sSql += sGroupBy;
::rtl::OUStringBuffer aSQL;
aSQL.append( m_aPureSelectSQL );
aSQL.append( STR_WHERE );
// preserve the original WHERE clause
// #i102234# / 2009-06-02 / frank.schoenheit@sun.com
::rtl::OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator, sal_False );
if ( sOriginalWhereClause.getLength() )
{
aSQL.appendAscii( " ( 0 = 1 ) AND ( " );
aSQL.append( sOriginalWhereClause );
aSQL.appendAscii( " ) " );
}
else
{
aSQL.appendAscii( " ( 0 = 1 ) " );
}
::rtl::OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
if ( sGroupBy.getLength() )
aSQL.append( sGroupBy );
::rtl::OUString sSQL( aSQL.makeStringAndClear() );
// normalize the statement so that it doesn't contain any application-level features anymore
::rtl::OUString sError;
const ::std::auto_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSql, false ) );
const ::std::auto_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL, false ) );
DBG_ASSERT( pStatementTree.get(), "OSingleSelectQueryComposer::getColumns: could not parse the column retrieval statement!" );
if ( pStatementTree.get() )
if ( !pStatementTree->parseNodeToExecutableStatement( sSql, m_xConnection, m_aSqlParser, NULL ) )
if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, m_xConnection, m_aSqlParser, NULL ) )
break;
Reference< XResultSetMetaData > xResultSetMeta;
Reference< XResultSetMetaDataSupplier > xResMetaDataSup;
try
{
xPreparedStatement.set( m_xConnection->prepareStatement( sSql ), UNO_QUERY_THROW );
xPreparedStatement.set( m_xConnection->prepareStatement( sSQL ), UNO_QUERY_THROW );
xResMetaDataSup.set( xPreparedStatement, UNO_QUERY_THROW );
xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
}
@@ -707,7 +728,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
Reference< XPropertySet > xStatementProps( xStatement, UNO_QUERY_THROW );
try { xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( sal_False ) ); }
catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
xResMetaDataSup.set( xStatement->executeQuery( sSql ), UNO_QUERY_THROW );
xResMetaDataSup.set( xStatement->executeQuery( sSQL ), UNO_QUERY_THROW );
xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
}
@@ -1243,14 +1264,15 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( )
return m_aCurrentColumns[ParameterColumns];
}
// -----------------------------------------------------------------------------
void OSingleSelectQueryComposer::clearParametersCollection()
void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::clearParametersCollection" );
if ( m_aCurrentColumns[ParameterColumns] )
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::clearColumns" );
OPrivateColumns* pColumns = m_aCurrentColumns[ _eType ];
if ( pColumns != NULL )
{
m_aCurrentColumns[ParameterColumns]->disposing();
m_aColumnsCollection.push_back(m_aCurrentColumns[ParameterColumns]);
m_aCurrentColumns[ParameterColumns] = NULL;
pColumns->disposing();
m_aColumnsCollection.push_back( pColumns );
m_aCurrentColumns[ _eType ] = NULL;
}
}
// -----------------------------------------------------------------------------