User: obo Date: 2006/07/10 07:26:52 Modified: dba/connectivity/source/drivers/file/FResultSet.cxx
Log: INTEGRATION: CWS qiq (1.94.92); FILE MERGED 2006/07/04 07:15:24 fs 1.94.92.4: during #i51143#: HY000 string superseded by getStandardSQLState 2006/06/28 08:45:20 fs 1.94.92.3: #i10000# 2006/06/27 14:21:41 fs 1.94.92.2: RESYNC: (1.94-1.95); FILE MERGED 2006/05/10 10:51:22 fs 1.94.92.1: #i51443# changed API of the OSQLParseIterator File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FResultSet.cxx?r1=1.95&r2=1.96 Delta lines: +8 -9 ------------------- --- FResultSet.cxx 20 Jun 2006 01:26:07 -0000 1.95 +++ FResultSet.cxx 10 Jul 2006 14:26:49 -0000 1.96 @@ -644,7 +644,7 @@ checkDisposed(OResultSet_BASE::rBHelper.bDisposed); if(!m_pTable || m_pTable->isReadOnly()) - throw SQLException(::rtl::OUString::createFromAscii("Table is readonly!"),*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); + ::dbtools::throwGenericSQLException( ::rtl::OUString::createFromAscii( "Table is readonly."), *this ); m_bRowUpdated = m_pTable->UpdateRow(m_aInsertRow.getBody(), m_aRow,Reference<XIndexAccess>(m_xColNames,UNO_QUERY)); *(*m_aInsertRow)[0] = (sal_Int32)(*m_aRow)[0]->getValue(); @@ -658,11 +658,11 @@ if(!m_pTable || m_pTable->isReadOnly()) - throw SQLException(::rtl::OUString::createFromAscii("Table is readonly!"),*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); + ::dbtools::throwGenericSQLException( ::rtl::OUString::createFromAscii( "Table is readonly." ), *this ); if (m_bShowDeleted) - throw SQLException(::rtl::OUString::createFromAscii("Row could not be deleted. The option \"Display inactive records\" is set!"),*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); + ::dbtools::throwGenericSQLException( ::rtl::OUString::createFromAscii( "Row could not be deleted. The option \"Display inactive records\" is set."), *this ); if(m_aRow->isDeleted()) - throw SQLException(::rtl::OUString::createFromAscii("Row was already deleted!"),*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); + ::dbtools::throwGenericSQLException( ::rtl::OUString::createFromAscii( "Row was already deleted."), *this ); sal_Int32 nPos = (sal_Int32)(*m_aRow)[0]->getValue(); m_bRowDeleted = m_pTable->DeleteRow(m_xColumns.getBody()); @@ -703,7 +703,7 @@ checkDisposed(OResultSet_BASE::rBHelper.bDisposed); if(!m_pTable || m_pTable->isReadOnly()) - throw SQLException(::rtl::OUString::createFromAscii("Table is readonly!"),*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any()); + ::dbtools::throwGenericSQLException( ::rtl::OUString::createFromAscii( "Table is readonly!" ), *this ); m_bInserted = sal_True; @@ -1210,12 +1210,12 @@ if ((xTabs.begin() == xTabs.end()) || !xTabs.begin()->second.is()) throwGenericSQLException( ::rtl::OUString::createFromAscii("The statement is invalid."), static_cast<XWeak*>(this), - makeAny(m_aSQLIterator.getWarning()) + makeAny( m_aSQLIterator.getErrors() ) ); - if ( xTabs.size() > 1 || m_aSQLIterator.getWarning().Message.getLength() ) + if ( xTabs.size() > 1 || m_aSQLIterator.hasErrors() ) throwGenericSQLException( ::rtl::OUString::createFromAscii("The statement is invalid. it contains more than one table."), static_cast<XWeak*>(this), - makeAny(m_aSQLIterator.getWarning())); + makeAny( m_aSQLIterator.getErrors() ) ); OSQLTable xTable = xTabs.begin()->second; m_xColumns = m_aSQLIterator.getSelectColumns(); @@ -1524,7 +1524,6 @@ } } break; - case SQL_STATEMENT_SELECT_COUNT: case SQL_STATEMENT_UPDATE: case SQL_STATEMENT_DELETE: // waehrend der Bearbeitung die Anzahl der bearbeiteten Rows zaehlen: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
