diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h index ad94f1d13..53140b39e 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h +++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h @@ -65,7 +65,7 @@ public: void rollback(); /// Rollback transaction - void resetConnection(); + void reset(); /// Reset connection with dababase and clears session state, but without disconnecting operator MYSQL* (); diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h index e991c2a52..b1df70310 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h +++ b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h @@ -67,7 +67,7 @@ public: void close(); /// Closes the connection. - void resetConnection(); + void reset(); /// Reset connection with dababase and clears session state, but without disconnecting bool isConnected() const; diff --git a/Data/MySQL/src/SessionHandle.cpp b/Data/MySQL/src/SessionHandle.cpp index dd4321f57..21f5db8a2 100644 --- a/Data/MySQL/src/SessionHandle.cpp +++ b/Data/MySQL/src/SessionHandle.cpp @@ -176,7 +176,7 @@ void SessionHandle::rollback() } -void SessionHandle::resetConnection() +void SessionHandle::reset() { if (mysql_reset_connection(_pHandle) != 0) throw TransactionException("Reset connection failed.", _pHandle); diff --git a/Data/MySQL/src/SessionImpl.cpp b/Data/MySQL/src/SessionImpl.cpp index c143ff000..601d043da 100644 --- a/Data/MySQL/src/SessionImpl.cpp +++ b/Data/MySQL/src/SessionImpl.cpp @@ -257,10 +257,10 @@ bool SessionImpl::hasTransactionIsolation(Poco::UInt32 ti) const } -void SessionImpl::resetConnection() +void SessionImpl::reset() { if (_connected) - _handle.resetConnection(); + _handle.reset(); } diff --git a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h index 759b2c193..893e1a9a1 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h @@ -68,7 +68,7 @@ public: void close(); /// Closes the session. - void resetConnection(); + void reset(); /// Do nothing bool isConnected() const; diff --git a/Data/SQLite/src/SessionImpl.cpp b/Data/SQLite/src/SessionImpl.cpp index f7fb75a16..1146d403b 100644 --- a/Data/SQLite/src/SessionImpl.cpp +++ b/Data/SQLite/src/SessionImpl.cpp @@ -190,7 +190,7 @@ void SessionImpl::close() } -void SessionImpl::resetConnection() +void SessionImpl::reset() { } diff --git a/Data/include/Poco/Data/PooledSessionImpl.h b/Data/include/Poco/Data/PooledSessionImpl.h index d31c6a6ba..e4a83cdee 100644 --- a/Data/include/Poco/Data/PooledSessionImpl.h +++ b/Data/include/Poco/Data/PooledSessionImpl.h @@ -50,7 +50,7 @@ public: void rollback(); void open(const std::string& connect = ""); void close(); - void resetConnection(); + void reset(); bool isConnected() const; void setConnectionTimeout(std::size_t timeout); std::size_t getConnectionTimeout() const; diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h index 75e6edb6c..bc8537f7b 100644 --- a/Data/include/Poco/Data/SessionImpl.h +++ b/Data/include/Poco/Data/SessionImpl.h @@ -92,7 +92,7 @@ public: void reconnect(); /// Closes the connection and opens it again. - virtual void resetConnection() = 0; + virtual void reset() = 0; /// Reset connection with dababase and clears session state, but without disconnecting virtual void begin() = 0; diff --git a/Data/src/PooledSessionImpl.cpp b/Data/src/PooledSessionImpl.cpp index c2a790c18..2097d547c 100644 --- a/Data/src/PooledSessionImpl.cpp +++ b/Data/src/PooledSessionImpl.cpp @@ -148,9 +148,9 @@ void PooledSessionImpl::close() } -void PooledSessionImpl::resetConnection() +void PooledSessionImpl::reset() { - access()->resetConnection(); + access()->reset(); } diff --git a/Data/src/SessionPool.cpp b/Data/src/SessionPool.cpp index f06233731..00b519ccc 100644 --- a/Data/src/SessionPool.cpp +++ b/Data/src/SessionPool.cpp @@ -235,7 +235,7 @@ void SessionPool::putBack(PooledSessionHolderPtr pHolder) { if (pHolder->session()->isConnected()) { - pHolder->session()->resetConnection(); + pHolder->session()->reset(); // reverse settings applied at acquisition time, if any AddPropertyMap::iterator pIt = _addPropertyMap.find(pHolder->session());