7 files changed, 15 insertions, 14 deletions
diff --git a/libdbpp/unittests/libdbpp-mysql b/libdbpp/unittests/libdbpp-mysql
-Subproject fef8f7b2afc7765ad9ffd0c1612eea3d987127b
+Subproject ef7a2108654dd8afb18fd27f0f84f152f7f796c
diff --git a/libdbpp/unittests/libdbpp-odbc b/libdbpp/unittests/libdbpp-odbc
-Subproject fbe5f26f21c623bc04da312d4869639f9c37319
+Subproject e5c210fcbddcbb73ca387cf0eb3c5a6f91b2f4a
diff --git a/libdbpp/unittests/libdbpp-postgresql b/libdbpp/unittests/libdbpp-postgresql
-Subproject 6d22e64c985fd3a55c424fd3b3e5dd49c083cbc
+Subproject 448720848b383639c37f5f0487efdf8c0f0ed43
diff --git a/libdbpp/unittests/libdbpp-sqlite b/libdbpp/unittests/libdbpp-sqlite
-Subproject 6df49b45f5e905a4ec9114e7a6cbe484ded798e
+Subproject f571f6b2bf1370b0757c29162988a40e02a82f9
diff --git a/libdbpp/unittests/testConnection.cpp b/libdbpp/unittests/testConnection.cpp
index b874a99..491c236 100644
--- a/libdbpp/unittests/testConnection.cpp
+++ b/libdbpp/unittests/testConnection.cpp
@@ -25,7 +25,9 @@ BOOST_AUTO_TEST_CASE( resolve )
 	auto libname = DB::Connection::resolvePlugin(typeid(DB::Connection), "postgresql");
 	BOOST_REQUIRE(libname);
 	BOOST_REQUIRE_EQUAL("libdbpp-postgresql.so", *libname);
-	BOOST_REQUIRE_THROW(DB::ConnectionFactory::createNew("otherdb", "doesn't matter"), AdHoc::LoadLibraryException);
+	BOOST_REQUIRE_THROW(
+			(void)DB::ConnectionFactory::createNew("otherdb", "doesn't matter"),
+			AdHoc::LoadLibraryException);
 }
 
 BOOST_AUTO_TEST_CASE( finish )
diff --git a/libdbpp/unittests/testMock.cpp b/libdbpp/unittests/testMock.cpp
index 7b71312..43b757d 100644
--- a/libdbpp/unittests/testMock.cpp
+++ b/libdbpp/unittests/testMock.cpp
@@ -10,7 +10,7 @@
 BOOST_AUTO_TEST_CASE( noFactory )
 {
 	BOOST_REQUIRE_THROW({
-		DB::MockDatabaseFactory::get("not-found");
+		(void)DB::MockDatabaseFactory::get("not-found");
 	}, AdHoc::LoadLibraryException);
 }
 
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE( mockFactory )
 BOOST_AUTO_TEST_CASE( missingMock )
 {
 	BOOST_REQUIRE_THROW({
-		DB::MockDatabaseFactory::createNew("MockMock",
+		(void)DB::MockDatabaseFactory::createNew("MockMock",
 				"user=postgres dbname=postgres", typeid(this).name(), { rootDir / "missing.sql" });
 	}, std::fstream::failure);
 }
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE( missingMock )
 BOOST_AUTO_TEST_CASE( failingMock )
 {
 	BOOST_REQUIRE_THROW({
-		DB::MockDatabaseFactory::createNew("MockMock",
+		(void)DB::MockDatabaseFactory::createNew("MockMock",
 				"user=postgres dbname=postgres", typeid(this).name(), { rootDir / "badMock.sql" });
 	}, DB::Error);
 }
diff --git a/libdbpp/unittests/testUtils.cpp b/libdbpp/unittests/testUtils.cpp
index a05c831..eed1322 100644
--- a/libdbpp/unittests/testUtils.cpp
+++ b/libdbpp/unittests/testUtils.cpp
@@ -122,8 +122,8 @@ BOOST_AUTO_TEST_CASE( columns )
 	auto db = DB::MockDatabase::openConnectionTo("pqmock");
 	auto sel = db->select("SELECT a, b, c, d, e FROM forEachRow ORDER BY a LIMIT 1");
 	sel->execute();
-	BOOST_REQUIRE_THROW((*sel)[5], DB::ColumnIndexOutOfRange);
-	BOOST_REQUIRE_THROW((*sel)[-1], DB::ColumnIndexOutOfRange);
+	BOOST_REQUIRE_THROW((void)(*sel)[5], DB::ColumnIndexOutOfRange);
+	BOOST_REQUIRE_THROW((void)(*sel)[-1], DB::ColumnIndexOutOfRange);
 	BOOST_REQUIRE_EQUAL(0, (*sel)[0].colNo);
 	BOOST_REQUIRE_EQUAL(4, (*sel)[4].colNo);
 	BOOST_REQUIRE_EQUAL("c", (*sel)[2].name);
@@ -131,9 +131,9 @@ BOOST_AUTO_TEST_CASE( columns )
 	BOOST_REQUIRE_EQUAL(4, (*sel)["e"].colNo);
 	BOOST_REQUIRE_EQUAL(5, sel->columnCount());
 	BOOST_REQUIRE_EQUAL(1, sel->getOrdinal("b"));
-	BOOST_REQUIRE_THROW((*sel)["f"], DB::ColumnDoesNotExist);
-	BOOST_REQUIRE_THROW((*sel)["aa"], DB::ColumnDoesNotExist);
-	BOOST_REQUIRE_THROW((*sel)[""], DB::ColumnDoesNotExist);
+	BOOST_REQUIRE_THROW((void)(*sel)["f"], DB::ColumnDoesNotExist);
+	BOOST_REQUIRE_THROW((void)(*sel)["aa"], DB::ColumnDoesNotExist);
+	BOOST_REQUIRE_THROW((void)(*sel)[""], DB::ColumnDoesNotExist);
 }
 
 BOOST_AUTO_TEST_CASE( extract )
@@ -206,10 +206,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( nullBind, Str, StringTypes )
 	unsigned int count = 0;
 	for (const auto & row : sel->as<int, std::optional<double>, Str>()) {
 		count += 1;
-		BOOST_CHECK_THROW(row.template get<0>(), DB::UnexpectedNullValue);
+		BOOST_CHECK_THROW((void)row.template get<0>(), DB::UnexpectedNullValue);
 		auto nd = row.template get<1>();
 		BOOST_CHECK(!nd.has_value());
-		BOOST_CHECK_THROW(row.template get<2>(), DB::UnexpectedNullValue);
+		BOOST_CHECK_THROW((void)row.template get<2>(), DB::UnexpectedNullValue);
 	}
 	BOOST_REQUIRE_EQUAL(1, count);
 }
@@ -414,9 +414,9 @@ BOOST_AUTO_TEST_CASE( testBlobCompare )
 
 // These just compile time support, actual data extraction should be tested by the implementing connector.
 template<typename T>
-void
+auto
 testExtractT(DB::Row<T> row) {
-	row.template value<0>();
+	return row.template value<0>();
 }
 
 template<typename T>
@@ -429,7 +429,6 @@ testExtractT(const DB::SelectCommandPtr & sel) {
 #ifdef __clang__
 	// Clang cannot compile this for reasons largely todo with ambiguousness in the spec
 	// Fixed when we move to std::chrono
-	// NOLINTNEXTLINE(bugprone-suspicious-semicolon,hicpp-braces-around-statements)
 	if constexpr (!std::is_same<T, boost::posix_time::time_duration>::value) {
 #else
 	if constexpr (true) {