Tag: cws_src680_dba202a User: oj Date: 05/11/24 23:40:11 Modified: /dba/dbaccess/source/core/api/ RowSet.cxx, RowSetCache.cxx, SingleSelectQueryComposer.cxx
Log: #i56333# create columns even when no column exists File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.137&r2=1.137.24.1 Delta lines: +3 -4 ------------------- --- RowSet.cxx 23 Sep 2005 14:36:38 -0000 1.137 +++ RowSet.cxx 25 Nov 2005 07:40:07 -0000 1.137.24.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.137 $ + * $Revision: 1.137.24.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 14:36:38 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:40:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1820,7 +1820,6 @@ m_xColumns->getByName(aSeq.getConstArray()[i-1]) >>= xColumn; } } - DBG_ASSERT(xColumn.is(), "ORowSet::execute_NoApprove_NoNewConn: invalid column (NULL)!"); if(bReFetchName && xColumn.is()) xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; aColumnMap.insert(::std::map< Reference<XPropertySet>,int>::value_type(xColumn,0)); File [changed]: RowSetCache.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.cxx?r1=1.78&r2=1.78.26.1 Delta lines: +3 -4 ------------------- --- RowSetCache.cxx 23 Sep 2005 12:03:25 -0000 1.78 +++ RowSetCache.cxx 25 Nov 2005 07:40:08 -0000 1.78.26.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSetCache.cxx,v $ * - * $Revision: 1.78 $ + * $Revision: 1.78.26.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:03:25 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:40:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -224,7 +224,6 @@ if ( xColSup.is() ) { Reference<XNameAccess> xSelColumns = xColSup->getColumns(); - Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); OColumnNamePos aColumnNames(xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers() ? true : false); ::dbaccess::getColumnPositions(xSelColumns,xColumns,aUpdateTableName,aColumnNames); File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.11&r2=1.11.32.1 Delta lines: +12 -9 -------------------- --- SingleSelectQueryComposer.cxx 8 Sep 2005 10:03:23 -0000 1.11 +++ SingleSelectQueryComposer.cxx 25 Nov 2005 07:40:08 -0000 1.11.32.1 @@ -4,9 +4,9 @@ * * $RCSfile: SingleSelectQueryComposer.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.32.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 10:03:23 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:40:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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]
