User: hr Date: 05/09/23 05:03:28 Modified: /dba/dbaccess/source/core/api/ RowSetCache.cxx
Log: INTEGRATION: CWS dba201b (1.75.38); FILE MERGED 2005/09/21 06:46:13 oj 1.75.38.3: RESYNC: (1.75-1.77); FILE MERGED 2005/07/11 13:36:59 fs 1.75.38.2: merging CWS dba201 into CWS dba201b 2005/06/02 12:15:30 oj 1.75.38.1: #i50181# check if key columns are empty File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetCache.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.cxx?r1=1.77&r2=1.78 Delta lines: +9 -1 ------------------- --- RowSetCache.cxx 8 Sep 2005 10:01:42 -0000 1.77 +++ RowSetCache.cxx 23 Sep 2005 12:03:25 -0000 1.78 @@ -105,6 +105,9 @@ #ifndef _COM_SUN_STAR_SDBCX_COMPAREBOOKMARK_HPP_ #include <com/sun/star/sdbcx/CompareBookmark.hpp> #endif +#ifndef _TOOLS_DEBUG_HXX +#include <tools/debug.hxx> +#endif #include <algorithm> @@ -121,6 +124,7 @@ using namespace ::cppu; using namespace ::osl; +DBG_NAME(ORowSetCache) // ------------------------------------------------------------------------- ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, @@ -149,6 +153,8 @@ ,m_pInsertMatrix(NULL) ,m_pCacheSet(NULL) { + DBG_CTOR(ORowSetCache,NULL); + // check if all keys of the updateable table are fetched sal_Bool bAllKeysFound = sal_False; sal_Int32 nTablesCount = 0; @@ -222,7 +228,7 @@ Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); OColumnNamePos aColumnNames(xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers() ? true : false); ::dbaccess::getColumnPositions(xSelColumns,xColumns,aUpdateTableName,aColumnNames); - bAllKeysFound = sal_Int32(aColumnNames.size()) == xColumns->getElementNames().getLength(); + bAllKeysFound = !aColumnNames.empty() && sal_Int32(aColumnNames.size()) == xColumns->getElementNames().getLength(); } } } @@ -377,6 +383,8 @@ m_xSet = WeakReference< XResultSet>(); m_xMetaData = NULL; m_aUpdateTable = NULL; + + DBG_DTOR(ORowSetCache,NULL); } // ------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
