User: obo Date: 2006/07/10 08:01:38 Modified: dba/dbaccess/source/core/api/CacheSet.cxx
Log: INTEGRATION: CWS qiq (1.40.118); FILE MERGED 2006/06/30 13:23:35 fs 1.40.118.3: during #i51143#: PROPERTY_ID_HY0000 superseded by StandardSQLState.SQL_GENERAL_ERROR 2006/06/27 11:53:24 fs 1.40.118.2: RESYNC: (1.40-1.41); FILE MERGED 2006/05/24 06:40:18 fs 1.40.118.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143# File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: CacheSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CacheSet.cxx?r1=1.41&r2=1.42 Delta lines: +3 -3 ------------------- --- CacheSet.cxx 20 Jun 2006 02:34:29 -0000 1.41 +++ CacheSet.cxx 10 Jul 2006 15:01:35 -0000 1.42 @@ -183,11 +183,10 @@ if(!m_aComposedTableName.getLength() && _xTable.is() ) { Reference<XDatabaseMetaData> xMeta(m_xConnection->getMetaData()); - composeTableName(xMeta + m_aComposedTableName = composeTableName(xMeta ,comphelper::getString(_xTable->getPropertyValue(PROPERTY_CATALOGNAME)) ,comphelper::getString(_xTable->getPropertyValue(PROPERTY_SCHEMANAME)) ,comphelper::getString(_xTable->getPropertyValue(PROPERTY_NAME)) - ,m_aComposedTableName ,sal_True ,::dbtools::eInDataManipulation); } @@ -380,7 +379,8 @@ aSql += aCondition; } else - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_UPDATE_MISSING_CONDITION),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HY000")),1000,Any()); + ::dbtools::throwSQLException( + DBACORE_RESSTRING( RID_STR_NO_UPDATE_MISSING_CONDITION ), SQL_GENERAL_ERROR, *this ); // now create end execute the prepared statement Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
