INTEGRATION: CWS dba20 (1.34.8); FILE MERGED

2004/11/23 10:24:37 oj 1.34.8.1: #i36207# check type of statement
This commit is contained in:
Oliver Bolte 2005-01-05 10:59:50 +00:00
parent 7e11a62a87
commit 8f07d11117

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: FStatement.cxx,v $ * $RCSfile: FStatement.cxx,v $
* *
* $Revision: 1.34 $ * $Revision: 1.35 $
* *
* last change: $Author: rt $ $Date: 2004-10-22 08:44:11 $ * last change: $Author: obo $ $Date: 2005-01-05 11:59:50 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -527,7 +527,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException,
static_cast<XWeak*>(this), static_cast<XWeak*>(this),
makeAny(m_aSQLIterator.getWarning())); makeAny(m_aSQLIterator.getWarning()));
if ( m_aSQLIterator.getSelectColumns()->empty() ) if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT || m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT_COUNT) && m_aSQLIterator.getSelectColumns()->empty() )
throwGenericSQLException( ::rtl::OUString::createFromAscii("The statement is invalid. It contains no valid column names."), throwGenericSQLException( ::rtl::OUString::createFromAscii("The statement is invalid. It contains no valid column names."),
static_cast<XWeak*>(this), static_cast<XWeak*>(this),
makeAny(m_aSQLIterator.getWarning())); makeAny(m_aSQLIterator.getWarning()));