Reset connection when a session is returned to the SessionPool

Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h

@@ -65,6 +65,9 @@ public:
 	void rollback();
 		/// Rollback transaction
 
+	void resetConnection();
+		/// Reset connection with dababase and clears session state, but without disconnecting
+
 	operator MYSQL* ();
 
 private:

Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h

@@ -66,6 +66,9 @@ public:
 
 	void close();
 		/// Closes the connection.
+
+	void resetConnection();
+		/// Reset connection with dababase and clears session state, but without disconnecting
 		
 	bool isConnected() const;
 		/// Returns true if connected, false otherwise.

Data/MySQL/src/SessionHandle.cpp

@@ -176,4 +176,11 @@ void SessionHandle::rollback()
 }
 
 
+void SessionHandle::resetConnection()
+{
+	if (mysql_reset_connection(_pHandle) != 0)
+		throw TransactionException("Reset connection failed.", _pHandle);
+}
+
+
 }}} // Poco::Data::MySQL

Data/MySQL/src/SessionImpl.cpp

@@ -257,6 +257,13 @@ bool SessionImpl::hasTransactionIsolation(Poco::UInt32 ti) const
 }
 
 
+void SessionImpl::resetConnection()
+{
+	if (_connected)
+		_handle.resetConnection();
+}
+
+
 void SessionImpl::close()
 {
 	if (_connected)

Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h

@@ -68,6 +68,9 @@ public:
 	void close();
 		/// Closes the session.
 
+	void resetConnection();
+		/// Do nothing
+
 	bool isConnected() const;
 		/// Returns true if connected, false otherwise.
 

Data/SQLite/src/SessionImpl.cpp

@@ -190,6 +190,12 @@ void SessionImpl::close()
 }
 
 
+void SessionImpl::resetConnection()
+{
+
+}
+
+
 bool SessionImpl::isConnected() const
 {
 	return _connected;

Data/include/Poco/Data/PooledSessionImpl.h

@@ -50,6 +50,7 @@ public:
 	void rollback();
 	void open(const std::string& connect = "");
 	void close();
+	void resetConnection();
 	bool isConnected() const;
 	void setConnectionTimeout(std::size_t timeout);
 	std::size_t getConnectionTimeout() const;

Data/include/Poco/Data/SessionImpl.h

@@ -92,6 +92,9 @@ public:
 	void reconnect();
 		/// Closes the connection and opens it again.
 
+	virtual void resetConnection() = 0;
+		/// Reset connection with dababase and clears session state, but without disconnecting
+
 	virtual void begin() = 0;
 		/// Starts a transaction.
 

Data/src/PooledSessionImpl.cpp

@@ -148,6 +148,12 @@ void PooledSessionImpl::close()
 }
 
 
+void PooledSessionImpl::resetConnection()
+{
+	access()->resetConnection();
+}
+
+
 const std::string& PooledSessionImpl::connectorName() const
 {
 	return access()->connectorName();

Data/src/SessionPool.cpp

@@ -235,6 +235,8 @@ void SessionPool::putBack(PooledSessionHolderPtr pHolder)
 	{
 		if (pHolder->session()->isConnected())
 		{
+			pHolder->session()->resetConnection();
+
 			// reverse settings applied at acquisition time, if any
 			AddPropertyMap::iterator pIt = _addPropertyMap.find(pHolder->session());
 			if (pIt != _addPropertyMap.end())