Merge pull request #819 from fnc12/integrity-check

removed std::string as result of pragma.integrity_check

Author: fnc12

dev/pragma.h

@@ -86,23 +86,21 @@ namespace sqlite_orm {
                 this->set_pragma("auto_vacuum", value);
             }
 
-            template<class R = std::string>
-            R integrity_check() {
-                return this->get_pragma<R>("integrity_check");
+            std::vector<std::string> integrity_check() {
+                return this->get_pragma<std::vector<std::string>>("integrity_check");
             }
 
-            template<class R, class T>
-            R integrity_check(T table_name) {
+            template<class T>
+            std::vector<std::string> integrity_check(T table_name) {
                 std::ostringstream oss;
                 oss << "integrity_check(" << table_name << ")";
-                return this->get_pragma<R>(oss.str());
+                return this->get_pragma<std::vector<std::string>>(oss.str());
             }
 
-            template<class R>
-            R integrity_check(int n) {
+            std::vector<std::string> integrity_check(int n) {
                 std::ostringstream oss;
                 oss << "integrity_check(" << n << ")";
-                return this->get_pragma<R>(oss.str());
+                return this->get_pragma<std::vector<std::string>>(oss.str());
             }
 
           private:

include/sqlite_orm/sqlite_orm.h

@@ -11349,23 +11349,21 @@ namespace sqlite_orm {
                 this->set_pragma("auto_vacuum", value);
             }
 
-            template<class R = std::string>
-            R integrity_check() {
-                return this->get_pragma<R>("integrity_check");
+            std::vector<std::string> integrity_check() {
+                return this->get_pragma<std::vector<std::string>>("integrity_check");
             }
 
-            template<class R, class T>
-            R integrity_check(T table_name) {
+            template<class T>
+            std::vector<std::string> integrity_check(T table_name) {
                 std::ostringstream oss;
                 oss << "integrity_check(" << table_name << ")";
-                return this->get_pragma<R>(oss.str());
+                return this->get_pragma<std::vector<std::string>>(oss.str());
             }
 
-            template<class R>
-            R integrity_check(int n) {
+            std::vector<std::string> integrity_check(int n) {
                 std::ostringstream oss;
                 oss << "integrity_check(" << n << ")";
-                return this->get_pragma<R>(oss.str());
+                return this->get_pragma<std::vector<std::string>>(oss.str());
             }
 
           private:

tests/pragma_tests.cpp

@@ -139,9 +139,7 @@ TEST_CASE("Integrity Check") {
                                            make_column("email", &User::email, default_value("dummy@email.com"))));
     storage.sync_schema();
 
-    REQUIRE(storage.pragma.integrity_check() == "ok");
-    REQUIRE(storage.pragma.integrity_check<std::string>(5) == "ok");
-    REQUIRE(storage.pragma.integrity_check<std::vector<std::string>>(5) == std::vector<std::string>{"ok"});
-    REQUIRE(storage.pragma.integrity_check<std::string>(tablename) == "ok");
-    REQUIRE(storage.pragma.integrity_check<std::vector<std::string>>() == std::vector<std::string>{"ok"});
+    REQUIRE(storage.pragma.integrity_check() == std::vector<std::string>{"ok"});
+    REQUIRE(storage.pragma.integrity_check(5) == std::vector<std::string>{"ok"});
+    REQUIRE(storage.pragma.integrity_check(tablename) == std::vector<std::string>{"ok"});
 }