Merge pull request #27 from aminroosta/fix25

Changed tests and README

Author: Killili

README.md

@@ -105,12 +105,12 @@ You can use transactions with `begin;`, `commit;` and `rollback;` commands.
 
 Dealing with NULL values
 =====
-If you have databases where some rows may be null, you can use boost::optional to retain the NULL value between C++ variables and the database. Note that you must enable the boost support by including the type extension for it.
+If you have databases where some rows may be null, you can use boost::optional to retain the NULL value between C++ variables and the database. Note that you must enable the boost support by defining _MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT befor importing the header.
 
 ```c++
 
+	#define _MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT
 	#include <sqlite_modern_cpp.h>
-	#include <sqlite_modern_cpp/extensions/boost_optional.h>
 
 	struct User {
 		long long _id;

tests/boost_optional.cc

@@ -19,9 +19,9 @@ void select(database& db, bool should_be_null) {
 	db << "select id,val from test" >> [&](long long id, boost::optional<int> val) {
 		id = id;
 		if(should_be_null) {
-			if(val) exit(1);
+			if(val) exit(EXIT_FAILURE);
 		} else {
-			if(!val) exit(1);
+			if(!val) exit(EXIT_FAILURE);
 		}
 	};
 }
@@ -51,7 +51,7 @@ int main() {
 		db << "drop table if exists test";
 		db <<
 			"create table if not exists test ("
-			"   id integer primary key autoincrement not null,"
+			"   id integer primary key,"
 			"   val int"
 			");";
 
@@ -63,6 +63,7 @@ int main() {
 
 	} catch(exception& e) {
 		cout << e.what() << endl;
+		exit(EXIT_FAILURE);
 	}
-	return 0;
+	exit(EXIT_SUCCESS);
 }

tests/simple_examples.cc

@@ -41,21 +41,22 @@ int main()
 		if(str != "world")
 		{
 			cout << "Bad result on line " << __LINE__ << endl;
-			exit(1);
+			exit(EXIT_FAILURE);
 		}
 
 
 	}
 	catch(sqlite_exception e)
 	{
 		cout << "Unexpected error " << e.what() << endl;
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 	catch(...)
 	{
 		cout << "Unknown error\n";
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	cout << "OK\n";
+	exit(EXIT_SUCCESS);
 }