Tag: cws_src680_qiq User: fs Date: 2006/06/28 01:45:25 Modified: dba/connectivity/source/drivers/evoab2/NStatement.cxx dba/connectivity/source/drivers/file/FPreparedStatement.cxx dba/connectivity/source/drivers/file/FResultSet.cxx dba/connectivity/source/drivers/file/FStatement.cxx dba/connectivity/source/drivers/mozab/MResultSet.cxx
Log: #i10000# File Changes: Directory: /dba/connectivity/source/drivers/evoab2/ =================================================== File [changed]: NStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab2/NStatement.cxx?r1=1.4&r2=1.4.44.1 Delta lines: +4 -4 ------------------- --- NStatement.cxx 28 Feb 2006 10:34:38 -0000 1.4 +++ NStatement.cxx 28 Jun 2006 08:45:20 -0000 1.4.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: NStatement.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.44.1 $ * - * last change: $Author: kz $ $Date: 2006/02/28 10:34:38 $ + * last change: $Author: fs $ $Date: 2006/06/28 08:45:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -226,7 +226,7 @@ checkDisposed(OStatement_BASE::rBHelper.bDisposed); executeQuery( sql ); - return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT || m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT_COUNT; + return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT; } EBookQuery *OStatement_Base::whereAnalysis( const OSQLParseNode* parseTree ) throw(SQLException, RuntimeException) Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FPreparedStatement.cxx?r1=1.37&r2=1.37.2.1 Delta lines: +4 -4 ------------------- --- FPreparedStatement.cxx 20 Jun 2006 01:25:53 -0000 1.37 +++ FPreparedStatement.cxx 28 Jun 2006 08:45:20 -0000 1.37.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: FPreparedStatement.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.37.2.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 01:25:53 $ + * last change: $Author: fs $ $Date: 2006/06/28 08:45:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -216,7 +216,7 @@ initResultSet(); - return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT || m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT_COUNT; + return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT; } // ------------------------------------------------------------------------- File [changed]: FResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FResultSet.cxx?r1=1.94.92.2&r2=1.94.92.3 Delta lines: +3 -4 ------------------- --- FResultSet.cxx 27 Jun 2006 14:21:41 -0000 1.94.92.2 +++ FResultSet.cxx 28 Jun 2006 08:45:20 -0000 1.94.92.3 @@ -4,9 +4,9 @@ * * $RCSfile: FResultSet.cxx,v $ * - * $Revision: 1.94.92.2 $ + * $Revision: 1.94.92.3 $ * - * last change: $Author: fs $ $Date: 2006/06/27 14:21:41 $ + * last change: $Author: fs $ $Date: 2006/06/28 08:45:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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: File [changed]: FStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FStatement.cxx?r1=1.38.96.3&r2=1.38.96.4 Delta lines: +5 -5 ------------------- --- FStatement.cxx 27 Jun 2006 14:22:04 -0000 1.38.96.3 +++ FStatement.cxx 28 Jun 2006 08:45:20 -0000 1.38.96.4 @@ -4,9 +4,9 @@ * * $RCSfile: FStatement.cxx,v $ * - * $Revision: 1.38.96.3 $ + * $Revision: 1.38.96.4 $ * - * last change: $Author: fs $ $Date: 2006/06/27 14:22:04 $ + * last change: $Author: fs $ $Date: 2006/06/28 08:45:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -336,7 +336,7 @@ executeQuery(sql); - return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT || m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT_COUNT; + return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT; } // ------------------------------------------------------------------------- @@ -508,7 +508,7 @@ static_cast<XWeak*>(this), makeAny( m_aSQLIterator.getErrors() ) ); - if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT || m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT_COUNT) && m_aSQLIterator.getSelectColumns()->empty() ) + if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT) && m_aSQLIterator.getSelectColumns()->empty() ) // SELECT statement without columns -> error throwGenericSQLException( ::rtl::OUString::createFromAscii("The statement is invalid. It contains no valid column names."), static_cast<XWeak*>(this), Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MResultSet.cxx?r1=1.25.26.2&r2=1.25.26.3 Delta lines: +3 -6 ------------------- --- MResultSet.cxx 27 Jun 2006 14:40:38 -0000 1.25.26.2 +++ MResultSet.cxx 28 Jun 2006 08:45:21 -0000 1.25.26.3 @@ -4,9 +4,9 @@ * * $RCSfile: MResultSet.cxx,v $ * - * $Revision: 1.25.26.2 $ + * $Revision: 1.25.26.3 $ * - * last change: $Author: fs $ $Date: 2006/06/27 14:40:38 $ + * last change: $Author: fs $ $Date: 2006/06/28 08:45:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1402,9 +1402,6 @@ } } break; - case SQL_STATEMENT_SELECT_COUNT: - ::dbtools::throwFunctionNotSupportedException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("COUNT() - Driver does not support this function.")), NULL); - break; case SQL_STATEMENT_UPDATE: case SQL_STATEMENT_DELETE: case SQL_STATEMENT_INSERT: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
