Updated to Catch2 v3

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

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";

tests/CMakeLists.txt

@@ -159,11 +159,9 @@ 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

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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
 

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", "john.doe@gmail.com"});
 
     REQUIRE_THROWS_WITH(storage.insert(Contact{0, "Johnny", "Doe", "john.doe@gmail.com"}),
-                        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()));

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;
 

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;
 

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>

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(

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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
 

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;
 

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;
 

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;
 

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;
 

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;

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;
 

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;
 

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"));
         }
     }
     {

tests/prepared_statement_tests/get_all.cpp

@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "prepared_common.h"
 

tests/prepared_statement_tests/get_all_optional.cpp

@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "prepared_common.h"
 

tests/prepared_statement_tests/get_all_pointer.cpp

@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "prepared_common.h"
 

tests/prepared_statement_tests/get_optional.cpp

@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "prepared_common.h"
 

tests/prepared_statement_tests/get_pointer.cpp

@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "prepared_common.h"
 

tests/prepared_statement_tests/insert.cpp

@@ -1,5 +1,5 @@
 #include <sqlite_orm/sqlite_orm.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "prepared_common.h"
 

tests/prepared_statement_tests/insert_explicit.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 insert explicit") {
     using namespace PreparedStatementTests;
-    using Catch::Matchers::Contains;
+    using Catch::Matchers::ContainsSubstring;
     using Catch::Matchers::UnorderedEquals;
 
     const int defaultVisitTime = 50;
@@ -67,7 +67,7 @@ TEST_CASE("Prepared insert explicit") {
             {
                 user.id = 6;
                 user.name = "Nate Dogg";
-                REQUIRE_THROWS_WITH(storage.execute(statement), Contains("constraint failed"));
+                REQUIRE_THROWS_WITH(storage.execute(statement), ContainsSubstring("constraint failed"));
 
                 get<0>(statement) = user;
                 auto insertedId = storage.execute(statement);