Merge branch 'main' into main

Author: mikomikotaishi

.github/workflows/ci.yml

@@ -193,7 +193,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: sudo apt -y update && sudo apt -y install libssl-dev
       - run: >-
-          cmake -S. -Bcmake-build -GNinja -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON
+          cmake -S. -Bcmake-build -GNinja -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON -DENABLE_INSTALL_CPPUNIT=ON
       - run: cmake --build cmake-build --target all --parallel 4
       - uses: ./.github/actions/retry-action
         with:
@@ -530,7 +530,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: brew install openssl@3
       - run: >-
-          cmake -S. -Bcmake-build -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON
+          cmake -S. -Bcmake-build -DPOCO_MINIMAL_BUILD=ON -DENABLE_TRACE=ON -DENABLE_TESTS=ON -DENABLE_INSTALL_CPPUNIT=ON
           -DENABLE_ACTIVERECORD=OFF -DENABLE_ACTIVERECORD_COMPILER=OFF -DENABLE_APACHECONNECTOR=OFF
       - run: cmake --build cmake-build --target all --parallel 4
       - uses: ./.github/actions/retry-action

CMakeLists.txt

@@ -219,6 +219,9 @@ endif()
 option(ENABLE_CPPUNIT
 	"Set to OFF|ON (default is OFF) to enable CppUnit library" OFF)
 
+option(ENABLE_INSTALL_CPPUNIT
+	"Set to OFF|ON (default is OFF) to install CppUnit headers and libraries" OFF)
+
 option(ENABLE_TESTS
 	"Set to OFF|ON (default is OFF) to control build of POCO tests" OFF)
 
@@ -288,6 +291,9 @@ endif()
 if(ENABLE_PDF)
 	string(APPEND _opt_deps ", libpng")
 endif()
+if(ENABLE_TRACE)
+	string(APPEND _opt_deps ", cpptrace")
+endif()
 
 if(POCO_UNBUNDLED)
 	# All bundled deps become external
@@ -438,6 +444,10 @@ if(ENABLE_POCODOC)
 	set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQLite" FORCE)
 endif()
 
+if(ENABLE_INSTALL_CPPUNIT)
+	set(ENABLE_CPPUNIT ON CACHE BOOL "Enable CppUnit" FORCE)
+endif()
+
 if(ENABLE_TESTS)
 	set(ENABLE_CPPUNIT ON CACHE BOOL "Enable CppUnit" FORCE)
 
@@ -645,11 +655,6 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Encodings/Compiler AND ENABLE_ENCODINGS_COMPILER
 	list(APPEND Poco_COMPONENTS "EncodingsCompiler")
 endif()
 
-if(ENABLE_TRACE)
-	add_subdirectory(Trace)
-	list(APPEND Poco_COMPONENTS "Trace")
-endif()
-
 if(ENABLE_MODULES AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.28)
 	add_subdirectory(modules)
 	list(APPEND Poco_COMPONENTS "C++ modules")

CppUnit/CMakeLists.txt

@@ -34,17 +34,19 @@ elseif (MINGW)
 	target_compile_definitions(CppUnit PUBLIC _DLL)
 endif()
 
-install(
-	DIRECTORY include/CppUnit
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-	COMPONENT Devel
-)
+if(ENABLE_INSTALL_CPPUNIT)
+	install(
+		DIRECTORY include/CppUnit
+		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+		COMPONENT Devel
+	)
 
-install(
-	TARGETS CppUnit
-	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-	BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
-	INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
+	install(
+		TARGETS CppUnit
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+		INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	)
+endif()

Data/ODBC/ODBC.make

@@ -51,9 +51,9 @@ SYSLIBS += -L$(POCO_ODBC_LIB)
 ## MinGW
 ##
 ifeq ($(POCO_CONFIG),MinGW)
-# -DODBCVER=0x0300: SQLHandle declaration issue
+# -DODBCVER=0x0350: SQL_GUID type depends on ODBC version 0x0350 (ODBC 3.5)
 # -DNOMINMAX      : MIN/MAX macros defined in windows conflict with libstdc++
-CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
+CXXFLAGS += -DODBCVER=0x0350 -DNOMINMAX
 
 ##
 ## unixODBC

Data/SQLite/testsuite/src/SQLiteTest.cpp

@@ -305,6 +305,48 @@ void SQLiteTest::testBind()
 }
 
 
+void SQLiteTest::testAddBindingReuse()
+{
+	Session session(Poco::Data::SQLite::Connector::KEY, "dummy.db");
+	session << "DROP TABLE IF EXISTS test", now;
+	session << "CREATE TABLE test (id INTEGER, name VARCHAR(30))", now;
+	session << "INSERT INTO test VALUES(1, 'Alice')", now;
+	session << "INSERT INTO test VALUES(2, 'Bob')", now;
+	session << "INSERT INTO test VALUES(3, 'Charlie')", now;
+
+	Statement stmt(session);
+	stmt << "SELECT name FROM test WHERE id = ?";
+
+	// first execute
+	int id = 1;
+	Poco::Data::AbstractBindingVec bindings;
+	bindings.push_back(Poco::Data::Keywords::bind(id, "id"));
+	stmt.addBinding(bindings, true);
+	std::string name;
+	stmt.addExtract(into(name));
+	stmt.execute();
+	assertTrue (name == "Alice");
+
+	// second execute with new binding — this is the bug scenario from #5220
+	id = 2;
+	Poco::Data::AbstractBindingVec bindings2;
+	bindings2.push_back(Poco::Data::Keywords::bind(id, "id"));
+	stmt.addBinding(bindings2, true);
+	name.clear();
+	stmt.execute();
+	assertTrue (name == "Bob");
+
+	// third execute to confirm repeated reuse
+	id = 3;
+	Poco::Data::AbstractBindingVec bindings3;
+	bindings3.push_back(Poco::Data::Keywords::bind(id, "id"));
+	stmt.addBinding(bindings3, true);
+	name.clear();
+	stmt.execute();
+	assertTrue (name == "Charlie");
+}
+
+
 void SQLiteTest::testBinding()
 {
 	Session tmp (Poco::Data::SQLite::Connector::KEY, "dummy.db");
@@ -4061,6 +4103,7 @@ CppUnit::Test* SQLiteTest::suite()
 	CppUnit_addTest(pSuite, SQLiteTest, testIllegalFilePath);
 	CppUnit_addTest(pSuite, SQLiteTest, testTransactionTypeProperty);
 	CppUnit_addTest(pSuite, SQLiteTest, testRecordsetCopyMove);
+	CppUnit_addTest(pSuite, SQLiteTest, testAddBindingReuse);
 
 	return pSuite;
 }

Data/SQLite/testsuite/src/SQLiteTest.h

@@ -148,6 +148,7 @@ class SQLiteTest: public CppUnit::TestCase
 	void testTransactionTypeProperty();
 
 	void testRecordsetCopyMove();
+	void testAddBindingReuse();
 
 	void setUp();
 	void tearDown();

Data/include/Poco/Data/Statement.h

@@ -180,10 +180,12 @@ class Data_API Statement
 	Statement& addBinding(C& bindingCont, bool reset)
 		/// Registers binding container with the Statement.
 	{
-		if (reset) _pImpl->resetBinding();
-		typename C::iterator itAB = bindingCont.begin();
-		typename C::iterator itABEnd = bindingCont.end();
-		for (; itAB != itABEnd; ++itAB) addBind(*itAB);
+		if (reset)
+		{
+			_pImpl->resetBinding();
+			_pImpl->bindings().clear();
+		}
+		for (auto& ab : bindingCont) addBind(ab);
 		return *this;
 	}
 

Data/samples/CMakeLists.txt

@@ -1,7 +1,15 @@
-add_subdirectory(Binding)
-add_subdirectory(RecordSet)
-add_subdirectory(RowFormatter)
-add_subdirectory(Tuple)
-add_subdirectory(TypeHandler)
-add_subdirectory(WebNotifier)
-add_subdirectory(DBLogger)
+if(ENABLE_DATA_SQLITE)
+	add_subdirectory(Binding)
+	add_subdirectory(RecordSet)
+	add_subdirectory(RowFormatter)
+	add_subdirectory(Tuple)
+	add_subdirectory(TypeHandler)
+	add_subdirectory(DBLogger)
+	if(ENABLE_NET)
+		add_subdirectory(WebNotifier)
+	else()
+		message(STATUS "Data sample WebNotifier requires Net and is not being built")
+	endif()
+else()
+	message(STATUS "Data samples Binding, RecordSet, RowFormatter, Tuple, TypeHandler, WebNotifier, DBLogger require SQLite and are not being built")
+endif()

Foundation/CMakeLists.txt

@@ -180,7 +180,7 @@ else()
 endif(CYGWIN)
 
 if(ENABLE_TRACE)
-	target_link_libraries(Foundation PRIVATE Poco::Trace)
+	target_link_libraries(Foundation PRIVATE "$<BUILD_LOCAL_INTERFACE:cpptrace::cpptrace>")
 endif()
 
 if(CMAKE_SYSTEM MATCHES "SunOS")
@@ -204,7 +204,7 @@ if(MINGW)
 			_WIN32
 			MINGW32
 			WINVER=0x500
-			ODBCVER=0x0300
+			ODBCVER=0x0350
 			POCO_THREAD_STACK_SIZE
 	)
 endif()

Foundation/Makefile

@@ -7,7 +7,7 @@
 include $(POCO_BASE)/build/rules/global
 
 ifdef POCO_ENABLE_TRACE
-INCLUDE += -I $(POCO_BASE)/Trace/include/Poco/Trace
+INCLUDE += -I$(POCO_BASE)/dependencies/cpptrace/include
 endif
 
 objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel AsyncNotificationCenter ActiveThreadPool\
@@ -85,7 +85,7 @@ target         = PocoFoundation
 target_version = $(LIBVERSION)
 target_libs    =
 ifdef POCO_ENABLE_TRACE
-target_libs   += PocoTrace
+target_libs   += cpptrace
 endif
 
 ifeq ($(findstring MinGW, $(POCO_CONFIG)), MinGW)