From 52bfae4d198bb5290b928c813d506e7f0b267f05 Mon Sep 17 00:00:00 2001
From: amin roosta <amin.roosta@outlook.com>
Date: Sat, 26 Mar 2016 11:58:00 +0430
Subject: [PATCH 1/2] support functors

---
 .../utility/function_traits.h                 | 21 +++++++
 tests/functors.cc                             | 57 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 tests/functors.cc

diff --git a/hdr/sqlite_modern_cpp/utility/function_traits.h b/hdr/sqlite_modern_cpp/utility/function_traits.h
index 88561ef1..8f482f39 100644
--- a/hdr/sqlite_modern_cpp/utility/function_traits.h
+++ b/hdr/sqlite_modern_cpp/utility/function_traits.h
@@ -31,5 +31,26 @@ namespace sqlite {
 			static const std::size_t arity = sizeof...(Arguments);
 		};
 
+    /* support the non-const operator ()
+     * this will work with user defined functors */
+		template <
+			typename    ClassType,
+			typename    ReturnType,
+			typename... Arguments
+		>
+		struct function_traits<
+			ReturnType(ClassType::*)(Arguments...)
+		> {
+			typedef ReturnType result_type;
+
+			template <std::size_t Index>
+			using argument = typename std::tuple_element<
+				Index,
+				std::tuple<Arguments...>
+			>::type;
+
+			static const std::size_t arity = sizeof...(Arguments);
+		};
+
 	}
 }
diff --git a/tests/functors.cc b/tests/functors.cc
new file mode 100644
index 00000000..facfa7c8
--- /dev/null
+++ b/tests/functors.cc
@@ -0,0 +1,57 @@
+#include <iostream>
+#include <vector>
+#include <algorithm>
+#include <string>
+#include <sqlite_modern_cpp.h>
+
+using namespace sqlite;
+using namespace std;
+
+struct tbl_functor {
+  explicit tbl_functor(vector<pair<int, string> > &vec_) : vec(vec_) { }
+
+  void operator() ( int id, string name) {
+    vec.push_back(make_pair(id, move(name)));
+  }
+  vector<pair<int,string> > &vec;
+};
+
+int main() {
+
+  try {
+		database db(":memory:");
+		db << "CREATE TABLE tbl (id integer, name string);";
+		db << "INSERT INTO tbl VALUES (?, ?);" << 1 << "hello";
+		db << "INSERT INTO tbl VALUES (?, ?);" << 2 << "world";
+
+    vector<pair<int,string> > vec;
+    db << "select id,name from tbl;" >> tbl_functor(vec);
+
+    if(vec.size() != 2) {
+			cout << "Bad result on line " << __LINE__ << endl;
+			exit(EXIT_FAILURE);
+    }
+
+    vec.clear();
+
+    tbl_functor functor(vec);
+    db << "select id,name from tbl;" >> functor;
+
+    if(vec.size() != 2 || vec[0].first != 1 || vec[0].second != "hello") {
+			cout << "Bad result on line " << __LINE__ << endl;
+			exit(EXIT_FAILURE);
+    }
+
+  }
+	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);
+}

From e03e427b90a24e8f9c0eac79d0e0895f4890ea4f Mon Sep 17 00:00:00 2001
From: amin roosta <amin.roosta@outlook.com>
Date: Sat, 26 Mar 2016 12:03:01 +0430
Subject: [PATCH 2/2] formatting tests/functors.cc

---
 tests/functors.cc | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/functors.cc b/tests/functors.cc
index facfa7c8..cc8b8a86 100644
--- a/tests/functors.cc
+++ b/tests/functors.cc
@@ -19,17 +19,17 @@ struct tbl_functor {
 int main() {
 
   try {
-		database db(":memory:");
-		db << "CREATE TABLE tbl (id integer, name string);";
-		db << "INSERT INTO tbl VALUES (?, ?);" << 1 << "hello";
-		db << "INSERT INTO tbl VALUES (?, ?);" << 2 << "world";
+    database db(":memory:");
+    db << "CREATE TABLE tbl (id integer, name string);";
+    db << "INSERT INTO tbl VALUES (?, ?);" << 1 << "hello";
+    db << "INSERT INTO tbl VALUES (?, ?);" << 2 << "world";
 
     vector<pair<int,string> > vec;
     db << "select id,name from tbl;" >> tbl_functor(vec);
 
     if(vec.size() != 2) {
-			cout << "Bad result on line " << __LINE__ << endl;
-			exit(EXIT_FAILURE);
+      cout << "Bad result on line " << __LINE__ << endl;
+      exit(EXIT_FAILURE);
     }
 
     vec.clear();
@@ -38,20 +38,20 @@ int main() {
     db << "select id,name from tbl;" >> functor;
 
     if(vec.size() != 2 || vec[0].first != 1 || vec[0].second != "hello") {
-			cout << "Bad result on line " << __LINE__ << endl;
-			exit(EXIT_FAILURE);
+      cout << "Bad result on line " << __LINE__ << endl;
+      exit(EXIT_FAILURE);
     }
 
   }
-	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);
+  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);
 }