Tag: cws_src680_dba30 User: fs Date: 06/03/21 10:22:00 Modified: /dba/dbaccess/source/core/api/ SingleSelectQueryComposer.cxx
Log: RESYNC: (1.11-1.12); FILE MERGED 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.10.2.4&r2=1.10.2.5 Delta lines: +12 -9 -------------------- --- SingleSelectQueryComposer.cxx 2 Jan 2006 09:17:07 -0000 1.10.2.4 +++ SingleSelectQueryComposer.cxx 21 Mar 2006 18:21:57 -0000 1.10.2.5 @@ -729,13 +729,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; @@ -829,12 +832,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->supportsMixedCaseQuotedIdentifiers(),*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]
