From 9b221b60484e62249868fcd7e1e57b9f86e677df Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 18 Sep 2021 14:46:40 +0100 Subject: Pass cppcheck and clang-tidy --- Jamroot.jam | 2 ++ libdbpp/column.h | 2 ++ libdbpp/unittests/libdbpp-odbc | 2 +- libdbpp/unittests/libdbpp-postgresql | 2 +- libdbpp/unittests/libdbpp-sqlite | 2 +- libdbpp/unittests/testUtils.cpp | 2 ++ 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Jamroot.jam b/Jamroot.jam index 51d89b0..ed164f9 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -42,6 +42,8 @@ project tidy:hicpp-* tidy:hicpp-named-parameter tidy:performance-* + tidy:boost + tidy:std ; build-project libdbpp ; diff --git a/libdbpp/column.h b/libdbpp/column.h index 17f6223..f3c97be 100644 --- a/libdbpp/column.h +++ b/libdbpp/column.h @@ -22,7 +22,9 @@ namespace DB { /// Abstract class for something that can handle field data. See Column::apply. class DLL_PUBLIC HandleField { public: + HandleField() = default; virtual ~HandleField() = default; + SPECIAL_MEMBERS_DEFAULT(HandleField); /// The field is null. virtual void null() = 0; diff --git a/libdbpp/unittests/libdbpp-odbc b/libdbpp/unittests/libdbpp-odbc index dbf98a3..3eb8f4b 160000 --- a/libdbpp/unittests/libdbpp-odbc +++ b/libdbpp/unittests/libdbpp-odbc @@ -1 +1 @@ -Subproject commit dbf98a34e08558b91328cb414447e9961c222033 +Subproject commit 3eb8f4b130eb815aa3ff7cfbb89d05ebce216350 diff --git a/libdbpp/unittests/libdbpp-postgresql b/libdbpp/unittests/libdbpp-postgresql index 216c87c..3e305e4 160000 --- a/libdbpp/unittests/libdbpp-postgresql +++ b/libdbpp/unittests/libdbpp-postgresql @@ -1 +1 @@ -Subproject commit 216c87cbb7228d9130eead5e374dfd7a11a96b98 +Subproject commit 3e305e46d818a28a9c1cbb814bdc3dd72605d803 diff --git a/libdbpp/unittests/libdbpp-sqlite b/libdbpp/unittests/libdbpp-sqlite index 7e5c360..5c72a2b 160000 --- a/libdbpp/unittests/libdbpp-sqlite +++ b/libdbpp/unittests/libdbpp-sqlite @@ -1 +1 @@ -Subproject commit 7e5c360a8c8eee8ebe8b1c18e49be5b4af8dac57 +Subproject commit 5c72a2b6a0076d85ce12884bca3b1de89df4db1b diff --git a/libdbpp/unittests/testUtils.cpp b/libdbpp/unittests/testUtils.cpp index 8fb0510..054ffb6 100644 --- a/libdbpp/unittests/testUtils.cpp +++ b/libdbpp/unittests/testUtils.cpp @@ -139,6 +139,7 @@ BOOST_AUTO_TEST_CASE(extract) { auto db = DB::MockDatabase::openConnectionTo("pqmock"); auto sel = db->select("SELECT a, b, c FROM forEachRow WHERE f"); + // cppcheck-suppress assertWithSideEffect BOOST_REQUIRE(sel->fetch()); int64_t lint; double ldouble; @@ -160,6 +161,7 @@ BOOST_AUTO_TEST_CASE(extract) BOOST_REQUIRE_THROW((*sel)[2] >> ldouble, DB::InvalidConversion); BOOST_REQUIRE_THROW((*sel)[1] >> lstring, DB::InvalidConversion); BOOST_REQUIRE_THROW((*sel)[0] >> lstring, DB::InvalidConversion); + // cppcheck-suppress assertWithSideEffect BOOST_REQUIRE(!sel->fetch()); } -- cgit v1.2.3