fnc12 · fnc12 · Jan 24, 2023 · Jul 8, 2022 · Jan 13, 2023 · Jan 15, 2023
diff --git a/appveyor.yml b/appveyor.yml
@@ -96,6 +96,10 @@ for:
       if "%appveyor_build_worker_image%"=="Visual Studio 2015" (set generator="Visual Studio 14 2015" %architecture%)
   install:
     - |-
+      cd C:\Tools\vcpkg
+      git clone --depth 1 --branch 2023.01.09 https://github.com/microsoft/vcpkg.git "$HOME/vcpkg"
+      .\bootstrap-vcpkg.bat
+      cd "%APPVEYOR_BUILD_FOLDER%"
       C:\Tools\vcpkg\vcpkg integrate install
       vcpkg install sqlite3:%platform%-windows
   before_build:
@@ -121,6 +125,8 @@ for:
   # using custom vcpkg triplets for building and linking dynamic dependent libraries
   install:
     - |-
+      git clone --depth 1 --branch 2023.01.09 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
+      $HOME/vcpkg/booststrap.sh
       $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
       vcpkg install sqlite3 --overlay-triplets=vcpkg/triplets
   before_build:
@@ -145,7 +151,7 @@ for:
   # using custom vcpkg triplets for building and linking dynamic dependent libraries
   install:
     - |-
-      git clone --depth 1 --branch 2022.05.10 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
+      git clone --depth 1 --branch 2023.01.09 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
       $HOME/vcpkg/booststrap.sh
       $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
       vcpkg install sqlite3 --overlay-triplets=vcpkg/triplets

diff --git a/dev/statement_serializer.h b/dev/statement_serializer.h
@@ -788,7 +788,7 @@ namespace sqlite_orm {
             using statement_type = conflict_clause_t;
 
             template<class Ctx>
-            std::string operator()(const statement_type& statement, const Ctx& context) const {
+            std::string operator()(const statement_type& statement, const Ctx&) const {
                 switch(statement) {
                     case conflict_clause_t::rollback:
                         return "ROLLBACK";

diff --git a/examples/chrono_binding.cpp b/examples/chrono_binding.cpp
@@ -6,6 +6,10 @@
 #include <format>
 
 #if __cpp_lib_chrono >= 201907L && __cpp_lib_format >= 201907L
+#define ENABLE_THIS_EXAMPLE
+#endif
+
+#ifdef ENABLE_THIS_EXAMPLE
 
 ///////////////////////////////
 /// sys_days binding as TEXT
@@ -14,11 +18,6 @@
 #include <sstream>
 #include <regex>
 
-static std::chrono::sys_days today() {
-    const auto today = std::chrono::sys_days{floor<std::chrono::days>(std::chrono::system_clock::now())};
-    return today;
-}
-
 /**
  *  This is the date we want to map to our sqlite db.
  *  Let's make it `TEXT`
@@ -143,10 +142,10 @@ struct Person {
     std::string name;
     std::chrono::sys_days birthdate;
 };
+#endif
 
-int main(int argc, const char* argv[]) {
-    cout << argv[0] << endl;
-
+int main(int, char**) {
+#ifdef ENABLE_THIS_EXAMPLE
     const std::string db_name = "sys_days.sqlite";
     ::remove(db_name.c_str());
 
@@ -168,6 +167,5 @@ int main(int argc, const char* argv[]) {
     auto pers = storage.get<Person>(1);
     year_month_day ymd = pers.birthdate;  // using the implicit operator from sys_days to year_month_day
     assert(ymd == birthdate);
-}
-
 #endif
+}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -141,29 +141,27 @@ if (MSVC)
     if (MSVC_VERSION LESS_EQUAL 1900)
         target_compile_options(unit_tests PUBLIC
             # C4503: decorated name length exceeded
-            /wd"4503"
+            /wd4503
             # C4800: forcing value to bool (performance warning)
-            /wd"4800")
+            /wd4800)
     else()
         target_compile_options(unit_tests PUBLIC
             # warning-level 4
             /W4
             # C4127: conditional expression is constant
-            /wd"4127"
+            /wd4127
             # C4456: declaration of 'symbol' hides previous local declaration
-            /wd"4456"
+            /wd4456
             # C4458: declaration of 'symbol' hides class member
-            /wd"4458")
+            /wd4458)
     endif()
 endif()
 
 target_precompile_headers(unit_tests PRIVATE
     <sqlite_orm/sqlite_orm.h>
-    <catch2/catch.hpp>)
-# tests.cpp contains CATCH_CONFIG_MAIN
-set_source_files_properties(tests.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+    <catch2/catch_all.hpp>)
 
-target_link_libraries(unit_tests PRIVATE sqlite_orm Catch2::Catch2)
+target_link_libraries(unit_tests PRIVATE sqlite_orm Catch2::Catch2WithMain)
 
 add_test(NAME "All_in_one_unit_test"
     COMMAND unit_tests

diff --git a/tests/ast_iterator_tests.cpp b/tests/ast_iterator_tests.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/backup_tests.cpp b/tests/backup_tests.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <cstdio>  //  remove
 
 using namespace sqlite_orm;

diff --git a/tests/built_in_functions_tests/core_functions_tests.cpp b/tests/built_in_functions_tests/core_functions_tests.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/built_in_functions_tests/datetime_function_tests.cpp b/tests/built_in_functions_tests/datetime_function_tests.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/built_in_functions_tests/math_functions.cpp b/tests/built_in_functions_tests/math_functions.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/column_tests.cpp b/tests/column_tests.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/constraints/check.cpp b/tests/constraints/check.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/constraints/composite_key.cpp b/tests/constraints/composite_key.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/constraints/default.cpp b/tests/constraints/default.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/constraints/foreign_key.cpp b/tests/constraints/foreign_key.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <type_traits>  //  std::is_same
 

diff --git a/tests/constraints/unique.cpp b/tests/constraints/unique.cpp
@@ -1,10 +1,10 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 
 TEST_CASE("Unique") {
-    using Catch::Matchers::Contains;
+    using Catch::Matchers::ContainsSubstring;
 
     struct Contact {
         int id = 0;
@@ -57,11 +57,11 @@ TEST_CASE("Unique") {
     storage.insert(Contact{0, "John", "Doe", "[email protected]"});
 
     REQUIRE_THROWS_WITH(storage.insert(Contact{0, "Johnny", "Doe", "[email protected]"}),
-                        Contains("constraint failed"));
+                        ContainsSubstring("constraint failed"));
 
     storage.insert(Shape{0, "red", "green"});
     storage.insert(Shape{0, "red", "blue"});
-    REQUIRE_THROWS_WITH(storage.insert(Shape{0, "red", "green"}), Contains("constraint failed"));
+    REQUIRE_THROWS_WITH(storage.insert(Shape{0, "red", "green"}), ContainsSubstring("constraint failed"));
 
     std::vector<List> lists(2);
     REQUIRE_NOTHROW(storage.insert_range(lists.begin(), lists.end()));

diff --git a/tests/explicit_columns.cpp b/tests/explicit_columns.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/filename.cpp b/tests/filename.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/get_all_custom_containers.cpp b/tests/get_all_custom_containers.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <list>
 #include <deque>

diff --git a/tests/index_tests.cpp b/tests/index_tests.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 
@@ -48,7 +48,7 @@ TEST_CASE("index") {
 
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
 TEST_CASE("filtered index") {
-    using Catch::Matchers::Contains;
+    using Catch::Matchers::ContainsSubstring;
 
     struct Test {
         std::optional<int> field1 = 0;
@@ -62,7 +62,7 @@ TEST_CASE("filtered index") {
         REQUIRE_NOTHROW(storage.sync_schema());
 
         storage.insert(Test{1, std::nullopt});
-        REQUIRE_THROWS_WITH(storage.insert(Test{1, std::nullopt}), Contains("constraint failed"));
+        REQUIRE_THROWS_WITH(storage.insert(Test{1, std::nullopt}), ContainsSubstring("constraint failed"));
     }
     SECTION("2") {
         auto storage = make_storage(

diff --git a/tests/json.cpp b/tests/json.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/arithmetic_operators.cpp b/tests/operators/arithmetic_operators.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/between.cpp b/tests/operators/between.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/binary_operators.cpp b/tests/operators/binary_operators.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/bitwise.cpp b/tests/operators/bitwise.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/cast.cpp b/tests/operators/cast.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/glob.cpp b/tests/operators/glob.cpp
@@ -2,7 +2,7 @@
  *  Obtained from here https://www.tutlane.com/tutorial/sqlite/sqlite-glob-operator
  */
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <vector>  //  std::vector
 #include <algorithm>  //  std::find_if, std::count
 

diff --git a/tests/operators/in.cpp b/tests/operators/in.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/is_null.cpp b/tests/operators/is_null.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/like.cpp b/tests/operators/like.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/operators/not_operator.cpp b/tests/operators/not_operator.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/pointer_passing_interface.cpp b/tests/pointer_passing_interface.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 using std::unique_ptr;

diff --git a/tests/pragma_tests.cpp b/tests/pragma_tests.cpp
@@ -1,6 +1,6 @@
 #include <sqlite_orm/sqlite_orm.h>
 #include <cstdio>  //  ::remove
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/prepared_statement_tests/column_names.cpp b/tests/prepared_statement_tests/column_names.cpp
@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace sqlite_orm;
 

diff --git a/tests/prepared_statement_tests/get.cpp b/tests/prepared_statement_tests/get.cpp
@@ -1,13 +1,13 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "prepared_common.h"
 
 using namespace sqlite_orm;
 
 TEST_CASE("Prepared get") {
     using namespace PreparedStatementTests;
-    using Catch::Matchers::Contains;
+    using Catch::Matchers::ContainsSubstring;
     using Catch::Matchers::UnorderedEquals;
 
     const int defaultVisitTime = 50;
@@ -72,7 +72,7 @@ TEST_CASE("Prepared get") {
             }
             {
                 get<0>(statement) = 4;
-                REQUIRE_THROWS_WITH(storage.execute(statement), Contains("Not found"));
+                REQUIRE_THROWS_WITH(storage.execute(statement), ContainsSubstring("Not found"));
             }
         }
     }
@@ -94,7 +94,7 @@ TEST_CASE("Prepared get") {
             //..
         }
         SECTION("execute") {
-            REQUIRE_THROWS_WITH(storage.execute(statement), Contains("Not found"));
+            REQUIRE_THROWS_WITH(storage.execute(statement), ContainsSubstring("Not found"));
         }
     }
     {