Merge pull request pocoproject#5 in FSF_POCO/upstream from ~LUTKOS/up…

…stream:ms-develop to ms-develop * commit '335631b64f9557d5ff4dac54bf916e0b61280fd8': MSTKPROJ-1466 Fixed posgres error reporting
kostya-lnk-ms · May 15, 2015 · ad31fb7 · ad31fb7
2 parents d46726c + 335631b
commit ad31fb7
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 4 deletions.
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
@@ -157,6 +157,7 @@ class ODBC_API ODBCStatementImpl: public Poco::Data::StatementImpl
 	mutable std::size_t   _affectedRowCount;
 	bool                  _canCompile;
 	bool                  _numericToString;
+	bool                  _isPostgres;
 };
 
 

diff --git a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
@@ -102,7 +102,8 @@ class ODBC_API Preparator : public AbstractPreparator
 		const std::string& statement, 
 		std::size_t maxFieldSize,
 		DataExtraction dataExtraction,
-		bool numericToString
+		bool numericToString,
+		bool isPostgres
 		);
 		/// Creates the Preparator.
 

diff --git a/Data/ODBC/src/ODBCStatementImpl.cpp b/Data/ODBC/src/ODBCStatementImpl.cpp
@@ -47,7 +47,8 @@ ODBCStatementImpl::ODBCStatementImpl(SessionImpl& rSession):
 	_prepared(false),
 	_affectedRowCount(0),
 	_canCompile(true),
-	_numericToString(rSession.numericToString())
+	_numericToString(rSession.numericToString()),
+	_isPostgres(false)
 {
 	int queryTimeout = rSession.queryTimeout();
 	if (queryTimeout >= 0)
@@ -58,6 +59,15 @@ ODBCStatementImpl::ODBCStatementImpl(SessionImpl& rSession):
 			(SQLPOINTER) uqt,
 			0);
 	}
+	SQLSMALLINT t;
+	SQLRETURN r = SQLGetInfo(_rConnection, SQL_DRIVER_NAME, NULL, 0, &t);
+	if (!Utility::isError(r) && t > 0)
+	{
+		std::string serverString;
+		serverString.resize(static_cast<std::size_t>(t) + 2);
+		r = SQLGetInfo(_rConnection, SQL_DRIVER_NAME, &serverString[0], SQLSMALLINT((serverString.length() - 1) * sizeof(serverString[0])), &t);
+		_isPostgres = (!Utility::isError(r) && Poco::toUpperInPlace(serverString).find("PSQLODBC") == 0);
+	}
 }
 
 
@@ -140,7 +150,7 @@ void ODBCStatementImpl::addPreparator()
 
 		std::size_t maxFieldSize = AnyCast<std::size_t>(session().getProperty("maxFieldSize"));
 
-		_preparations.push_back(new Preparator(_stmt, statement, maxFieldSize, ext, _numericToString));
+		_preparations.push_back(new Preparator(_stmt, statement, maxFieldSize, ext, _numericToString, _isPostgres));
 	}
 	else
 		_preparations.push_back(new Preparator(*_preparations[0]));

diff --git a/Data/ODBC/src/Preparator.cpp b/Data/ODBC/src/Preparator.cpp
@@ -31,7 +31,8 @@ Preparator::Preparator(const StatementHandle& rStmt,
 	const std::string& statement, 
 	std::size_t maxFieldSize,
 	DataExtraction dataExtraction,
-	bool numericToString) :
+	bool numericToString,
+	bool isPostgres) :
 	_rStmt(rStmt),
 	_maxFieldSize(maxFieldSize),
 	_dataExtraction(dataExtraction),
@@ -40,6 +41,16 @@ Preparator::Preparator(const StatementHandle& rStmt,
 	SQLCHAR* pStr = (SQLCHAR*) statement.c_str();
 	if (Utility::isError(Poco::Data::ODBC::SQLPrepare(_rStmt, pStr, (SQLINTEGER) statement.length())))
 		throw StatementException(_rStmt);
+	// PostgreSQL error swallowing workaround:
+	// Postgres may execute a statement with sintax error fine,
+	// but would return error once num of columns requested!
+	if (isPostgres)
+	{
+		SQLSMALLINT t = 0;
+		SQLRETURN r = SQLNumResultCols(rStmt, &t);
+		if (r != SQL_NO_DATA && Utility::isError(r))
+			throw StatementException(rStmt, "Failed to get number of columns");
+	}
 }
 
 

diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
@@ -670,6 +670,7 @@ CppUnit::Test* ODBCDB2Test::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCDB2Test");
 
 		CppUnit_addTest(pSuite, ODBCDB2Test, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCDB2Test, testSyntaxError);
 		CppUnit_addTest(pSuite, ODBCDB2Test, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCDB2Test, testComplexType);
 		CppUnit_addTest(pSuite, ODBCDB2Test, testSimpleAccessVector);

diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
@@ -421,6 +421,7 @@ CppUnit::Test* ODBCMySQLTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCMySQLTest");
 
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCMySQLTest, testSyntaxError);
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testComplexType);
 		CppUnit_addTest(pSuite, ODBCMySQLTest, testSimpleAccessVector);

diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
@@ -856,6 +856,7 @@ CppUnit::Test* ODBCOracleTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCOracleTest");
 
 		CppUnit_addTest(pSuite, ODBCOracleTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCOracleTest, testSyntaxError);
 		CppUnit_addTest(pSuite, ODBCOracleTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCOracleTest, testComplexType);
 		CppUnit_addTest(pSuite, ODBCOracleTest, testComplexTypeTuple);

diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
@@ -629,6 +629,7 @@ CppUnit::Test* ODBCPostgreSQLTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCPostgreSQLTest");
 
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testSyntaxError);
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testComplexType);
 		CppUnit_addTest(pSuite, ODBCPostgreSQLTest, testSimpleAccessVector);

diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
@@ -737,6 +737,7 @@ CppUnit::Test* ODBCSQLServerTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCSQLServerTest");
 
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSyntaxError);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testComplexType);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSimpleAccessVector);

diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
@@ -325,6 +325,7 @@ CppUnit::Test* ODBCSQLiteTest::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ODBCSQLiteTest");
 
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testBareboneODBC);
+		CppUnit_addTest(pSuite, ODBCSQLiteTest, testSyntaxError);
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testSimpleAccess);
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testComplexType);
 		CppUnit_addTest(pSuite, ODBCSQLiteTest, testSimpleAccessVector);

diff --git a/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp b/Data/ODBC/testsuite/src/ODBCSybaseTest.cpp
@@ -503,6 +503,7 @@ CppUnit::Test* SybaseODBC::suite()
 		CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SybaseODBC");
 
 		CppUnit_addTest(pSuite, SybaseODBC, testBareboneODBC);
+		CppUnit_addTest(pSuite, SybaseODBC, testSyntaxError);
 		CppUnit_addTest(pSuite, SybaseODBC, testSimpleAccess);
 		CppUnit_addTest(pSuite, SybaseODBC, testComplexType);
 		CppUnit_addTest(pSuite, SybaseODBC, testSimpleAccessVector);

diff --git a/Data/ODBC/testsuite/src/ODBCTest.cpp b/Data/ODBC/testsuite/src/ODBCTest.cpp
@@ -42,6 +42,7 @@ using Poco::Data::ODBC::ODBCException;
 using Poco::Data::ODBC::ConnectionException;
 using Poco::Data::ODBC::StatementException;
 using Poco::Data::ODBC::StatementDiagnostics;
+using Poco::Data::Statement;
 using Poco::format;
 using Poco::Tuple;
 using Poco::Any;
@@ -1278,6 +1279,28 @@ void ODBCTest::testReconnect()
 }
 
 
+void ODBCTest::testSyntaxError()
+{
+	try {
+		session() << "select fro oops", now;
+		fail("Expected syntax error exception");
+	}
+	catch (const StatementException&)
+	{
+	}
+
+	try {
+		Statement stat(session());
+		stat << "select fro oops";
+		stat.execute();
+		fail("Expected syntax error exception");
+	}
+	catch (const StatementException&)
+	{
+	}
+}
+
+
 bool ODBCTest::canConnect(const std::string& driver,
 	std::string& dsn,
 	std::string& uid,

diff --git a/Data/ODBC/testsuite/src/ODBCTest.h b/Data/ODBC/testsuite/src/ODBCTest.h
@@ -154,6 +154,7 @@ class ODBCTest: public CppUnit::TestCase
 
 	virtual void testReconnect();
 	virtual void testNumeric();
+	virtual void testSyntaxError();
 
 protected:
 	typedef Poco::Data::ODBC::Utility::DriverMap Drivers;