User: obo Date: 05/12/21 05:34:22 Modified: /dba/dbaccess/source/core/api/ SingleSelectQueryComposer.cxx
Log: INTEGRATION: CWS dba202a (1.11.32); FILE MERGED 2005/11/25 07:40:08 oj 1.11.32.1: #i56333# create columns even when no column exists File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.11&r2=1.12 Delta lines: +9 -6 ------------------- --- SingleSelectQueryComposer.cxx 8 Sep 2005 10:03:23 -0000 1.11 +++ SingleSelectQueryComposer.cxx 21 Dec 2005 13:34:19 -0000 1.12 @@ -728,13 +728,16 @@ ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_aCurrentColumns[SelectColumns] ) + { + ::std::vector< ::rtl::OUString> aNames; + ::vos::ORef< OSQLColumns> aCols; + sal_Bool bCase = sal_True; try { + bCase = m_xMetaData->storesMixedCaseQuotedIdentifiers(); + aCols = m_aSqlIterator.getSelectColumns(); // now set the columns we have to look if the order of the columns is correct Reference<XStatement> xStmt = m_xConnection->createStatement(); - - ::std::vector< ::rtl::OUString> aNames; - ::vos::ORef< OSQLColumns> aCols = m_aSqlIterator.getSelectColumns(); if ( xStmt.is() ) { ::rtl::OUString sSql = m_aPureSelectSQL; @@ -828,12 +831,12 @@ for(OSQLColumns::const_iterator aIter = aCols->begin(); aIter != aCols->end();++aIter) aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME))); } - - m_aCurrentColumns[SelectColumns] = new OPrivateColumns(aCols,m_xMetaData->storesMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames); } catch(Exception&) { } + m_aCurrentColumns[SelectColumns] = new OPrivateColumns(aCols,bCase,*this,m_aMutex,aNames); + } return m_aCurrentColumns[SelectColumns]; } // ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
