remove boost support

Author: aminroosta

CMakeLists.txt

@@ -20,27 +20,7 @@ download_project(
 
 set(CATCH_INCLUDE_DIR           ${CMAKE_BINARY_DIR}/catch-src/single_include/)
 set(TEST_SOURCE_DIR             ${CMAKE_SOURCE_DIR}/tests)
-#file(GLOB TEST_SOURCES          ${TEST_SOURCE_DIR}/*.cc)
-set(TEST_SOURCES 
-    ${TEST_SOURCE_DIR}/blob_example.cc
-    ${TEST_SOURCE_DIR}/error_log.cc
-    ${TEST_SOURCE_DIR}/exceptions.cc
-    ${TEST_SOURCE_DIR}/prepared_statment.cc
-    ${TEST_SOURCE_DIR}/lvalue_functor.cc
-    ${TEST_SOURCE_DIR}/functors.cc
-    ${TEST_SOURCE_DIR}/std_optional.cc
-    ${TEST_SOURCE_DIR}/flags.cc
-    ${TEST_SOURCE_DIR}/mov_ctor.cc
-    ${TEST_SOURCE_DIR}/shared_connection.cc
-    ${TEST_SOURCE_DIR}/trycatchblocks.cc
-    ${TEST_SOURCE_DIR}/readme_example.cc
-    ${TEST_SOURCE_DIR}/functions.cc
-    ${TEST_SOURCE_DIR}/nullptr_uniqueptr.cc
-    ${TEST_SOURCE_DIR}/simple_examples.cc
-    ${TEST_SOURCE_DIR}/variant.cc
-    ${TEST_SOURCE_DIR}/exception_dont_execute.cc
-    ${TEST_SOURCE_DIR}/exception_dont_execute_nested.cc
-)
+file(GLOB TEST_SOURCES          ${TEST_SOURCE_DIR}/*.cc)
 
 enable_testing()
 

README.md

@@ -322,13 +322,8 @@ int main() {
    };
 }
 ```
-
-If you do not have C++17 support, you can use boost optional instead by defining `_MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT` before importing the `sqlite_modern_cpp` header.
-
 If the optional library is not available, the experimental/optional one will be used instead.
 
-**Note: boost support is deprecated and will be removed in future versions.**
-
 Variant type support (C++17)
 ----
 If your columns may have flexible types, you can use C++17's `std::variant` to extract the value.

hdr/sqlite_modern_cpp.h

@@ -34,10 +34,6 @@
 #define MODERN_SQLITE_STD_OPTIONAL_SUPPORT
 #endif
 
-#ifdef _MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT
-#include <boost/optional.hpp>
-#endif
-
 #include <sqlite3.h>
 
 #include "sqlite_modern_cpp/errors.h"
@@ -254,11 +250,6 @@ namespace sqlite {
 		template <typename OptionalT> friend void get_col_from_db(database_binder& db, int inx, optional<OptionalT>& o);
 #endif
 
-#ifdef _MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT
-		template <typename BoostOptionalT> friend database_binder& operator <<(database_binder& db, const boost::optional<BoostOptionalT>& val);
-		template <typename BoostOptionalT> friend void get_col_from_db(database_binder& db, int inx, boost::optional<BoostOptionalT>& o);
-#endif
-
 	public:
 
 		database_binder(std::shared_ptr<sqlite3> db, std::u16string const & sql):
@@ -840,42 +831,6 @@ namespace sqlite {
 	}
 #endif
 
-	// boost::optional support for NULL values
-#ifdef _MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT
-	template <typename BoostOptionalT> inline database_binder& operator <<(database_binder& db, const boost::optional<BoostOptionalT>& val) {
-		if(val) {
-			return db << std::move(*val);
-		} else {
-			return db << nullptr;
-		}
-	}
-	template <typename BoostOptionalT> inline void store_result_in_db(sqlite3_context* db, const boost::optional<BoostOptionalT>& val) {
-		if(val) {
-			store_result_in_db(db, *val);
-		}
-		sqlite3_result_null(db);
-	}
-
-	template <typename BoostOptionalT> inline void get_col_from_db(database_binder& db, int inx, boost::optional<BoostOptionalT>& o) {
-		if(sqlite3_column_type(db._stmt.get(), inx) == SQLITE_NULL) {
-			o.reset();
-		} else {
-			BoostOptionalT v;
-			get_col_from_db(db, inx, v);
-			o = std::move(v);
-		}
-	}
-	template <typename BoostOptionalT> inline void get_val_from_db(sqlite3_value *value, boost::optional<BoostOptionalT>& o) {
-		if(sqlite3_value_type(value) == SQLITE_NULL) {
-			o.reset();
-		} else {
-			BoostOptionalT v;
-			get_val_from_db(value, v);
-			o = std::move(v);
-		}
-	}
-#endif
-
 #ifdef MODERN_SQLITE_STD_VARIANT_SUPPORT
 	template <typename ...Args> inline database_binder& operator <<(database_binder& db, const std::variant<Args...>& val) {
 		std::visit([&](auto &&opt) {db << std::forward<decltype(opt)>(opt);}, val);

tests/boost_optional.cc

@@ -1,79 +1,58 @@
-#ifdef ENABLE_SQLCIPHER_TESTS
 #include <iostream>
 #include <cstdio>
 #include <cstdlib>
-#include <sqlite_modern_cpp/sqlcipher.h>
-using namespace sqlite;
-using namespace std;
-
-struct TmpFile
-{
-	string fname;
-
-	TmpFile(): fname("./sqlcipher.db") { }
-	~TmpFile() { remove(fname.c_str()); }
-};
-
-int main()
-{
-	try
-	{
-		TmpFile file;
-		sqlcipher_config config;
-		{
-		  config.key = "DebugKey";
-		  sqlcipher_database db(file.fname, config);
-
-		  db << "CREATE TABLE foo (a integer, b string);";
-		  db << "INSERT INTO foo VALUES (?, ?)" << 1 << "hello";
-		  db << "INSERT INTO foo VALUES (?, ?)" << 2 << "world";
+#include <catch.hpp>
 
-		  string str;
-		  db << "SELECT b from FOO where a=?;" << 2 >> str;
-
-		  if(str != "world")
-		  {
-			  cout << "Bad result on line " << __LINE__ << endl;
-			  exit(EXIT_FAILURE);
-		  }
-		}
-		try {
-		  config.key = "DebugKey2";
-		  sqlcipher_database db(file.fname, config);
-		  db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
-
-		  cout << "Can open with wrong key";
-		  exit(EXIT_FAILURE);
-		} catch(errors::notadb) {
-		  // Expected, wrong key
-		}
-		{
-		  config.key = "DebugKey";
-		  sqlcipher_database db(file.fname, config);
-		  db.rekey("DebugKey2");
-		}
-		{
-		  config.key = "DebugKey2";
-		  sqlcipher_database db(file.fname, config);
-		  db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
-		}
-	}
-	catch(sqlite_exception e)
-	{
-		cout << "Unexpected error " << e.what() << endl;
-		exit(EXIT_FAILURE);
-	}
-	catch(...)
-	{
-		cout << "Unknown error\n";
-		exit(EXIT_FAILURE);
-	}
-
-	cout << "OK\n";
-	exit(EXIT_SUCCESS);
-}
-#else
-int main() {
-  return 42; //Skip test
-}
+#ifdef ENABLE_SQLCIPHER_TESTS
+    #include <sqlite_modern_cpp/sqlcipher.h>
+    using namespace sqlite;
+    using namespace std;
+
+    struct TmpFile
+    {
+        string fname;
+
+        TmpFile(): fname("./sqlcipher.db") { }
+        ~TmpFile() { remove(fname.c_str()); }
+    };
+
+    TEST_CASE("sqlcipher works", "[sqlcipher]") {
+        TmpFile file;
+        sqlcipher_config config;
+        {
+            config.key = "DebugKey";
+            sqlcipher_database db(file.fname, config);
+
+            db << "CREATE TABLE foo (a integer, b string);";
+            db << "INSERT INTO foo VALUES (?, ?)" << 1 << "hello";
+            db << "INSERT INTO foo VALUES (?, ?)" << 2 << "world";
+
+            string str;
+            db << "SELECT b from FOO where a=?;" << 2 >> str;
+
+            REQUIRE(str == "world");
+        }
+
+        bool failed = false;
+        try {
+            config.key = "DebugKey2";
+            sqlcipher_database db(file.fname, config);
+            db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
+        } catch(errors::notadb) {
+            failed = true;
+            // Expected, wrong key
+        }
+        REQUIRE(failed == true);
+
+        {
+            config.key = "DebugKey";
+            sqlcipher_database db(file.fname, config);
+            db.rekey("DebugKey2");
+        }
+        {
+            config.key = "DebugKey2";
+            sqlcipher_database db(file.fname, config);
+            db << "INSERT INTO foo VALUES (?, ?)" << 3 << "fail";
+        }
+    }
 #endif