Date: Wednesday, January 11, 2006 @ 12:04:42
Author: zsolt
Path: /cvsroot/carob/carob
Modified: include/Connection.hpp (1.45 -> 1.46)
include/ParameterStatement.hpp (1.4 -> 1.5) src/Connection.cpp
(1.52 -> 1.53) src/ParameterStatement.cpp (1.2 -> 1.3)
Modified Connection::preparedStatementGetMetaData(),
Connection::receiveResultSet(), ParameterStatement::getMetaData() to throw
BackendException. This happens when for a non query statement the metadata is
requested.
--------------------------------+
include/Connection.hpp | 6 +++---
include/ParameterStatement.hpp | 4 ++--
src/Connection.cpp | 6 +++---
src/ParameterStatement.cpp | 3 ++-
4 files changed, 10 insertions(+), 9 deletions(-)
Index: carob/include/Connection.hpp
diff -u carob/include/Connection.hpp:1.45 carob/include/Connection.hpp:1.46
--- carob/include/Connection.hpp:1.45 Wed Jan 11 10:21:29 2006
+++ carob/include/Connection.hpp Wed Jan 11 12:04:42 2006
@@ -348,7 +348,7 @@
* @param sqlTemplate sql template of the PreparedStatement
*/
DriverResultSet *preparedStatementGetMetaData(const std::wstring
&sqlTemplate)
- throw (SocketIOException, ProtocolException,
+ throw (SocketIOException, BackendException,
ProtocolException,
NotImplementedException, UnexpectedException);
private:
@@ -482,8 +482,8 @@
* @throws CarobException received from the controller
*/
DriverResultSet* receiveResultSet() throw (SocketIOException,
- ProtocolException, NotImplementedException,
- UnexpectedException);
+ BackendException, ProtocolException,
+ NotImplementedException, UnexpectedException);
/**
* Checks if the given query already executed or not on the controller we are
* currently connected to.
Index: carob/include/ParameterStatement.hpp
diff -u carob/include/ParameterStatement.hpp:1.4
carob/include/ParameterStatement.hpp:1.5
--- carob/include/ParameterStatement.hpp:1.4 Wed Jan 11 10:21:29 2006
+++ carob/include/ParameterStatement.hpp Wed Jan 11 12:04:42 2006
@@ -263,8 +263,8 @@
* Returns the metadata of the statement.
* @return a pointer to a ResultSetMetaData
*/
- ResultSetMetaData *ParameterStatement::getMetaData()
- throw (SocketIOException, ProtocolException,
+ ResultSetMetaData *getMetaData()
+ throw (SocketIOException, BackendException,
ProtocolException,
NotImplementedException, UnexpectedException);
protected:
Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.52 carob/src/Connection.cpp:1.53
--- carob/src/Connection.cpp:1.52 Wed Jan 11 10:21:29 2006
+++ carob/src/Connection.cpp Wed Jan 11 12:04:42 2006
@@ -486,7 +486,7 @@
}
DriverResultSet *Connection::preparedStatementGetMetaData(const wstring
&sqlTemplate)
- throw (SocketIOException, ProtocolException, NotImplementedException,
+ throw (SocketIOException, BackendException, ProtocolException,
NotImplementedException,
UnexpectedException)
{
checkIfConnected();
@@ -812,8 +812,8 @@
}
DriverResultSet* Connection::receiveResultSet()
- throw (SocketIOException, ProtocolException, NotImplementedException,
- UnexpectedException)
+ throw (SocketIOException, BackendException, ProtocolException,
+ NotImplementedException, UnexpectedException)
{
TypeTag tag(*driverSocketPtr);
Index: carob/src/ParameterStatement.cpp
diff -u carob/src/ParameterStatement.cpp:1.2
carob/src/ParameterStatement.cpp:1.3
--- carob/src/ParameterStatement.cpp:1.2 Wed Jan 11 10:21:29 2006
+++ carob/src/ParameterStatement.cpp Wed Jan 11 12:04:42 2006
@@ -185,7 +185,8 @@
}
ResultSetMetaData *ParameterStatement::getMetaData()
- throw (SocketIOException, ProtocolException, NotImplementedException,
UnexpectedException)
+ throw (SocketIOException, BackendException, ProtocolException,
NotImplementedException,
+ UnexpectedException)
{
if (!rsMetaData)
{
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
