fix(Data):

* make bool Session::isTransaction() return Poco::Optional
* move parsing to Statement
* SQLParser make build
* other fixes and improvemets #4230

.vscode/c_cpp_properties.json

@@ -23,7 +23,7 @@
             "${POCO_BASE}/Redis/include",
             "${POCO_BASE}/MongoDB/include",
             "${POCO_BASE}/ApacheConnector/include",
-            "/usr/include"
+            "${POCO_BASE}/Data/src"
         ]
     },
     "configurations": [

.vscode/settings.json

@@ -95,7 +95,11 @@
 		"strstream": "cpp",
 		"future": "cpp",
 		"shared_mutex": "cpp",
-		"stop_token": "cpp"
+		"stop_token": "cpp",
+		"codecvt": "cpp",
+		"numbers": "cpp",
+		"span": "cpp",
+		"semaphore": "cpp"
 	},
 	"files.exclude": {
         "**/.dep": true,

Data/Makefile

@@ -15,8 +15,16 @@ objects = AbstractBinder AbstractBinding AbstractExtraction AbstractExtractor \
 	SessionPool SessionPoolContainer SQLChannel \
 	Statement StatementCreator StatementImpl Time Transcoder
 
-target         = PocoData
-target_version = $(LIBVERSION)
-target_libs    = PocoFoundation
+ifndef POCO_DATA_NO_SQL_PARSER
+	objects += SQLParser SQLParserResult \
+		bison_parser flex_lexer \
+		CreateStatement PrepareStatement SQLStatement \
+		Expr statements sqlhelper
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
+target          = PocoData
+target_version  = $(LIBVERSION)
+target_libs     = PocoFoundation
 
 include $(POCO_BASE)/build/rules/lib

Data/MySQL/Makefile

@@ -15,6 +15,10 @@ objects = Binder Extractor SessionImpl Connector \
 	MySQLStatementImpl ResultMetadata MySQLException \
 	SessionHandle StatementExecutor Utility
 
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
 target         = PocoDataMySQL
 target_version = $(LIBVERSION)
 target_libs    = PocoData PocoFoundation

Data/MySQL/testsuite/Makefile

@@ -13,6 +13,10 @@ SYSLIBS += -lmysqlclient -lz -lpthread -ldl
 
 objects = MySQLTestSuite Driver MySQLTest SQLExecutor
 
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
 target         = testrunner
 target_version = 1
 target_libs    = PocoDataMySQL PocoData PocoFoundation CppUnit

Data/ODBC/Makefile

@@ -12,6 +12,10 @@ objects = Binder ConnectionHandle Connector EnvironmentHandle \
 	Extractor ODBCException ODBCMetaColumn ODBCStatementImpl \
 	Parameter Preparator SessionImpl TypeInfo Unicode Utility
 
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
 target         = PocoDataODBC
 target_version = $(LIBVERSION)
 target_libs    = PocoData PocoFoundation

Data/ODBC/include/Poco/Data/ODBC/Handle.h

@@ -61,8 +61,6 @@ class Handle
 			SQLRETURN rc =
 #endif
 			SQLFreeHandle(handleType, _handle);
-			// N.B. Destructors should not throw, but neither do we want to
-			// leak resources. So, we throw here in debug mode if things go bad.
 			poco_assert_dbg (!Utility::isError(rc));
 		}
 		catch (...)

Data/ODBC/src/ODBCStatementImpl.cpp

@@ -373,7 +373,7 @@ void ODBCStatementImpl::makeStep()
 	_extractors[currentDataSet()]->reset();
 	_nextResponse = SQLFetch(_stmt);
 	// workaround for SQL Server drivers 17, 18, ...
-	// stored procedure calls produce additional data,
+	// stored procedure calls may produce additional data,
 	// causing SQLFetch error 24000 (invalid cursor state);
 	// when it happens, SQLMoreResults() is called to
 	// force SQL_NO_DATA response

Data/ODBC/testsuite/Makefile

@@ -33,6 +33,10 @@ ifeq ($(POCO_CONFIG),MinGW)
 	objects += ODBCAccessTest
 endif
 
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
 target         = testrunner
 target_version = 1
 target_libs    = PocoDataODBC PocoData PocoFoundation CppUnit

Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp

@@ -968,9 +968,9 @@ CppUnit::Test* ODBCSQLServerTest::suite()
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSQLLogger);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testAutoCommit);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSessionTransactionNoAutoCommit);
+		CppUnit_addTest(pSuite, ODBCSQLServerTest, testTransaction);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testTransactionIsolation);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testSessionTransaction);
-		CppUnit_addTest(pSuite, ODBCSQLServerTest, testTransaction);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testTransactor);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testNullable);
 		CppUnit_addTest(pSuite, ODBCSQLServerTest, testUnicode);

Data/ODBC/testsuite/src/ODBCTest.cpp

@@ -1230,7 +1230,7 @@ void ODBCTest::testTransactionIsolation()
 		recreatePersonTable();
 		_pSession->setFeature("autoBind", bindValue(i));
 		_pSession->setFeature("autoExtract", bindValue(i+1));
-		_pExecutor->transactionIsolation(_rConnectString);
+		_pExecutor->transactionIsolation();
 		i += 2;
 	}
 }

Data/ODBC/testsuite/src/SQLExecutor.cpp

@@ -4187,7 +4187,7 @@ void SQLExecutor::autoCommit(const std::string& connect)
 }
 
 
-void SQLExecutor::transactionIsolation(const std::string& connect)
+void SQLExecutor::transactionIsolation()
 {
 	auto ti = session().getTransactionIsolation();
 
@@ -4225,18 +4225,25 @@ void SQLExecutor::sessionTransaction(const std::string& connect)
 	std::string result;
 
 	session().setFeature("autoCommit", true);
+	assertTrue (session().getFeature("autoCommit"));
+	assertTrue (!session().isTransaction());
+
 	session().begin();
 	assertTrue (session().isTransaction());
+	assertTrue (!session().getFeature("autoCommit"));
 
-	// autocommit is invalid for session in transaction ...
+	// changing autocommit is invalid for session in transaction ...
 	try
 	{
 		 session().setFeature("autoCommit", true);
 		 fail ("must fail on autocommit setting during transaction");
 	}
 	catch(const Poco::InvalidAccessException& e) { }
+	// make sure nothing was changed ...
+	assertTrue (!session().getFeature("autoCommit"));
 	// but setting it to its current state is allowed (no-op)
 	session().setFeature("autoCommit", false);
+	assertTrue (!session().getFeature("autoCommit"));
 
 	session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now;
 	assertTrue (session().isTransaction());
@@ -4293,6 +4300,7 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connect)
 	}
 
 	std::string funct = "sessionTransactionNoAutoCommit()";
+
 	std::vector<std::string> lastNames = {"LN1", "LN2"};
 	std::vector<std::string> firstNames = {"FN1", "FN2"};
 	std::vector<std::string> addresses = {"ADDR1", "ADDR2"};
@@ -4311,20 +4319,24 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connect)
 	local << "SELECT COUNT(*) FROM Person", into(locCount), now;
 	assertTrue (0 == count);
 	assertTrue (2 == locCount);
+#ifndef POCO_DATA_NO_SQL_PARSER
 	assertTrue (local.isTransaction());
 
 	// autocommit is invalid for session in transaction ...
 	try
 	{
 		 local.setFeature("autoCommit", true);
-		 fail ("must fail on autocommit setting during transaction");
+		 fail ("must fail on autocommit setting during transaction", __LINE__);
 	}
 	catch(const Poco::InvalidAccessException& e) { }
+
 	// but setting it to its current state is allowed (no-op)
 	local.setFeature("autoCommit", false);
 
 	assertTrue (!session().isTransaction());
-
+#else
+	session().commit();
+#endif // POCO_DATA_NO_SQL_PARSER
 	local.commit();
 	assertTrue (!local.isTransaction());
 
@@ -4341,8 +4353,12 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connect)
 	local << "SELECT COUNT(*) FROM Person", into(locCount), now;
 	assertTrue (0 == count);
 	assertTrue (4 == locCount);
+#ifndef POCO_DATA_NO_SQL_PARSER
 	assertTrue (local.isTransaction());
 	assertTrue (!session().isTransaction());
+#else
+	session().commit();
+#endif
 
 	local.rollback();
 	assertTrue (!local.isTransaction());
@@ -4354,7 +4370,10 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connect)
 	local << "SELECT COUNT(*) FROM Person", into(locCount), now;
 	assertTrue (2 == count);
 	assertTrue (2 == locCount);
-
+#ifndef POCO_DATA_NO_SQL_PARSER
+	session().commit();
+	local.commit();
+#endif
 	session().setFeature("autoCommit", autoCommit);
 }
 
@@ -4399,34 +4418,26 @@ void SQLExecutor::transaction(const std::string& connect)
 		assertTrue (trans.isActive());
 		assertTrue (session().isTransaction());
 
-		try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; }
-		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+		session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now;
 
 		assertTrue (session().isTransaction());
 		assertTrue (trans.isActive());
 
-		try { session() << "SELECT COUNT(*) FROM Person", into(count), now; }
-		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+		session() << "SELECT COUNT(*) FROM Person", into(count), now;
 		assertTrue (2 == count);
 		assertTrue (session().isTransaction());
 		assertTrue (trans.isActive());
 	}
 	assertTrue (!session().isTransaction());
 
-	try { session() << "SELECT count(*) FROM Person", into(count), now; }
-	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+	session() << "SELECT count(*) FROM Person", into(count), now;
 	assertTrue (0 == count);
-	assertTrue (session().isTransaction());
+	assertTrue (!session().isTransaction());
 	session().commit();
 
 	{
 		Transaction trans(session());
-		try { session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; }
-		catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-		catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+		session() << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now;
 
 		Statement stmt1 = (local << "SELECT COUNT(*) FROM Person", into(locCount), async, now);
 
@@ -4440,20 +4451,14 @@ void SQLExecutor::transaction(const std::string& connect)
 		assertTrue (2 == locCount);
 	}
 
-	try { session() << "SELECT count(*) FROM Person", into(count), now; }
-	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+	session() << "SELECT count(*) FROM Person", into(count), now;
 	assertTrue (2 == count);
 
-	try { session() << "DELETE FROM Person", now; }
-	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+	session() << "DELETE FROM Person", now;
 
 	Statement stmt1 = (local << "SELECT count(*) FROM Person", into(locCount), async, now);
 
-	try { session() << "SELECT count(*) FROM Person", into(count), now; }
-	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+	session() << "SELECT count(*) FROM Person", into(count), now;
 	assertTrue (0 == count);
 	try
 	{
@@ -4493,19 +4498,15 @@ void SQLExecutor::transaction(const std::string& connect)
 	stmt2.wait();
 	assertTrue (0 == locCount);
 
-	try { session() << "SELECT count(*) FROM Person", into(count), now; }
-	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+	session() << "SELECT count(*) FROM Person", into(count), now;
 	assertTrue (0 == count);
 
 	trans.execute(sql);
 
 	Statement stmt3 = (local << "SELECT COUNT(*) FROM Person", into(locCount), now);
 	assertTrue (2 == locCount);
 
-	try { session() << "SELECT count(*) FROM Person", into(count), now; }
-	catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (funct); }
-	catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (funct); }
+	session() << "SELECT count(*) FROM Person", into(count), now;
 	assertTrue (2 == count);
 	session().commit();
 

Data/ODBC/testsuite/src/SQLExecutor.h

@@ -512,7 +512,7 @@ class SQLExecutor: public CppUnit::TestCase
 	void sqlLogger(const std::string& connect);
 
 	void autoCommit(const std::string& connect);
-	void transactionIsolation(const std::string& connect);
+	void transactionIsolation();
 
 	void sessionTransaction(const std::string& connect);
 	void sessionTransactionNoAutoCommit(const std::string& connect);

Data/PostgreSQL/Makefile

@@ -12,6 +12,10 @@ objects = Extractor BinaryExtractor Binder SessionImpl Connector \
 	PostgreSQLStatementImpl PostgreSQLException \
 	SessionHandle StatementExecutor PostgreSQLTypes Utility
 
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
 target         = PocoDataPostgreSQL
 target_version = $(LIBVERSION)
 target_libs    = PocoData PocoFoundation

Data/PostgreSQL/testsuite/Makefile

@@ -13,6 +13,10 @@ SYSLIBS += -lpq -lz -lpthread -ldl
 
 objects = PostgreSQLTestSuite Driver PostgreSQLTest SQLExecutor
 
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
 target         = testrunner
 target_version = 1
 target_libs    = PocoDataPostgreSQL PocoData PocoFoundation CppUnit

Data/SQLite/Makefile

@@ -9,18 +9,20 @@ include $(POCO_BASE)/build/rules/global
 COMMONFLAGS += -I$(POCO_BASE)/Data/SQLite/src
 
 SYSFLAGS += -DSQLITE_THREADSAFE=1 -DSQLITE_DISABLE_LFS \
-        -DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE \
-        -DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED
+	-DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE \
+	-DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED
 
 objects = Binder Extractor Notifier SessionImpl Connector \
-        SQLiteException SQLiteStatementImpl Utility
-
-sqlite_objects = sqlite3
+	SQLiteException SQLiteStatementImpl Utility
 
 ifdef POCO_UNBUNDLED
-        SYSLIBS += -lsqlite3
+	SYSLIBS += -lsqlite3
 else
-        objects += $(sqlite_objects)
+	objects += sqlite3
+endif
+
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
 endif
 
 target         = PocoDataSQLite

Data/SQLite/testsuite/Makefile

@@ -9,6 +9,10 @@ include $(POCO_BASE)/build/rules/global
 objects = SQLiteTestSuite Driver \
 	SQLiteTest
 
+ifndef POCO_DATA_NO_SQL_PARSER
+	target_includes = $(POCO_BASE)/Data/src
+endif
+
 target         = testrunner
 target_version = 1
 target_libs    = PocoDataSQLite PocoData PocoFoundation CppUnit