fix(Data::SessionPool): Improve Data::SessionPool thread safety #4206

Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h

@@ -57,15 +57,19 @@ class ODBC_API ConnectionHandle
 	int getTimeout() const;
 		/// Returns the connection timeout in seconds.
 
-	operator const SQLHDBC& () const;
-		/// Const conversion operator into reference to native type.
-
 	const SQLHDBC& handle() const;
 		/// Returns const reference to handle;
 
 	const SQLHDBC* pHandle() const;
 		/// Returns const pointer to handle;
 
+	operator const SQLHDBC& () const;
+		/// Const conversion operator into reference to native type.
+
+	operator bool();
+		/// Returns true if handles are not null.
+		/// True value is not a guarantee that the connection is valid.
+
 private:
 	operator SQLHDBC& ();
 		/// Conversion operator into reference to native type.
@@ -82,8 +86,8 @@ class ODBC_API ConnectionHandle
 	ConnectionHandle(const ConnectionHandle&);
 	const ConnectionHandle& operator=(const ConnectionHandle&);
 
-	const EnvironmentHandle* _pEnvironment;
-	SQLHDBC                  _hdbc;
+	const EnvironmentHandle* _pEnvironment = nullptr;
+	SQLHDBC                  _hdbc = SQL_NULL_HDBC;
 	std::string              _connectString;
 
 	friend class Poco::Data::ODBC::SessionImpl;
@@ -102,6 +106,12 @@ inline ConnectionHandle::operator const SQLHDBC& () const
 }
 
 
+inline ConnectionHandle::operator bool()
+{
+	return _pEnvironment != nullptr && _hdbc != SQL_NULL_HDBC;
+}
+
+
 inline const SQLHDBC& ConnectionHandle::handle() const
 {
 	return _hdbc;

Data/ODBC/src/ConnectionHandle.cpp

@@ -144,6 +144,8 @@ int ConnectionHandle::getTimeout() const
 
 bool ConnectionHandle::isConnected() const
 {
+	if (!*this) return false;
+
 	SQLULEN value = 0;
 
 	if (Utility::isError(Poco::Data::ODBC::SQLGetConnectAttr(_hdbc,

Data/ODBC/src/SessionImpl.cpp

@@ -372,6 +372,8 @@ void SessionImpl::autoCommit(const std::string&, bool val)
 
 bool SessionImpl::isAutoCommit(const std::string&) const
 {
+	if (!_db) return false;
+
 	SQLULEN value = 0;
 
 	checkError(Poco::Data::ODBC::SQLGetConnectAttr(_db,
@@ -386,7 +388,7 @@ bool SessionImpl::isAutoCommit(const std::string&) const
 
 bool SessionImpl::isTransaction() const
 {
-	if (!canTransact()) return false;
+	if (!_db || !canTransact()) return false;
 
 	SQLULEN value = 0;
 	checkError(Poco::Data::ODBC::SQLGetConnectAttr(_db,

Data/ODBC/testsuite/src/ODBCDB2Test.cpp

@@ -594,6 +594,9 @@ CppUnit::Test* ODBCDB2Test::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCDB2Test");
 
 		CppUnit_addTest(pSuite, ODBCDB2Test, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCDB2Test, testConnection);
+		CppUnit_addTest(pSuite, ODBCDB2Test, testSession);
+		CppUnit_addTest(pSuite, ODBCDB2Test, testSessionPool);
 		CppUnit_addTest(pSuite, ODBCDB2Test, testZeroRows);
 		CppUnit_addTest(pSuite, ODBCDB2Test, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCDB2Test, testComplexType);

Data/ODBC/testsuite/src/ODBCMySQLTest.cpp

@@ -421,6 +421,9 @@ CppUnit::Test* ODBCMySQLTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCMySQLTest");
 
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCMySQLTest, testConnection);
+		CppUnit_addTest(pSuite, ODBCMySQLTest, testSession);
+		CppUnit_addTest(pSuite, ODBCMySQLTest, testSessionPool);
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testZeroRows);
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testComplexType);

Data/ODBC/testsuite/src/ODBCOracleTest.cpp

@@ -854,6 +854,9 @@ CppUnit::Test* ODBCOracleTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCOracleTest");
 
 		CppUnit_addTest(pSuite, ODBCOracleTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCOracleTest, testConnection);
+		CppUnit_addTest(pSuite, ODBCOracleTest, testSession);
+		CppUnit_addTest(pSuite, ODBCOracleTest, testSessionPool);
 		CppUnit_addTest(pSuite, ODBCOracleTest, testZeroRows);
 		CppUnit_addTest(pSuite, ODBCOracleTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCOracleTest, testComplexType);

Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp

@@ -583,6 +583,9 @@ CppUnit::Test* ODBCPostgreSQLTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCPostgreSQLTest");
 
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testConnection);
+		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testSession);
+		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testSessionPool);
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testZeroRows);
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testComplexType);

Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp

@@ -180,18 +180,6 @@ void ODBCSQLServerTest::testTempTable()
 }
 
 
-void ODBCSQLServerTest::testConnection()
-{
-	executor().connection(_connectString);
-}
-
-
-void ODBCSQLServerTest::testSession()
-{
-	executor().session(_connectString, 5);
-}
-
-
 void ODBCSQLServerTest::testBLOB()
 {
 	const std::size_t maxFldSize = 250000;
@@ -902,6 +890,7 @@ CppUnit::Test* ODBCSQLServerTest::suite()
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testBareboneODBC);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testConnection);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSession);
+		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSessionPool);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testZeroRows);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testComplexType);

Data/ODBC/testsuite/src/ODBCSQLServerTest.h

@@ -41,9 +41,6 @@ class ODBCSQLServerTest: public ODBCTest
 
 	void testBareboneODBC();
 
-	void testConnection();
-	void testSession();
-
 	void testTempTable();
 
 	void testBLOB();

Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp

@@ -323,6 +323,9 @@ CppUnit::Test* ODBCSQLiteTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCSQLiteTest");
 
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCSQLiteTest, testConnection);
+		CppUnit_addTest(pSuite, ODBCSQLiteTest, testSession);
+		CppUnit_addTest(pSuite, ODBCSQLiteTest, testSessionPool);
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testZeroRows);
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testComplexType);

Data/ODBC/testsuite/src/ODBCTest.cpp

@@ -77,6 +77,24 @@ ODBCTest::~ODBCTest()
 }
 
 
+void ODBCTest::testConnection()
+{
+	_pExecutor->connection(_rConnectString);
+}
+
+
+void ODBCTest::testSession()
+{
+	_pExecutor->session(_rConnectString, 5);
+}
+
+
+void ODBCTest::testSessionPool()
+{
+	_pExecutor->sessionPool(_rConnectString, 1, 4, 3, 5);
+}
+
+
 void ODBCTest::testZeroRows()
 {
 	if (!_pSession) fail ("Test not available.");

Data/ODBC/testsuite/src/ODBCTest.h

@@ -23,7 +23,7 @@
 #include "SQLExecutor.h"
 
 
-#define POCO_ODBC_TEST_DATABASE_SERVER "localhost"
+#define POCO_ODBC_TEST_DATABASE_SERVER "10.211.55.5"//"localhost"
 
 
 class ODBCTest: public CppUnit::TestCase
@@ -47,6 +47,10 @@ class ODBCTest: public CppUnit::TestCase
 
 	virtual void testBareboneODBC() = 0;
 
+	virtual void testConnection();
+	virtual void testSession();
+	virtual void testSessionPool();
+
 	virtual void testZeroRows();
 	virtual void testSimpleAccess();
 	virtual void testComplexType();