Remove trailing spaces on query-builder result

Change-Id: I8eed182a46f77c28821679eff87f498011523d2d
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

diff --git a/include/klay/db/query-builder/table.hxx b/include/klay/db/query-builder/table.hxx
index 68282425ec23f1920a2095e19798638532106fb8..1c663ada9ebd4c41a040d23fdab27a1906d26e78 100644 (file)
--- a/include/klay/db/query-builder/table.hxx
+++ b/include/klay/db/query-builder/table.hxx
@@ -25,6 +25,19 @@
 #include <string>
 #include <algorithm>
 #include <sstream>
+#include <cctype>
+
+namespace {
+
+std::string&& rtrim(std::string&& s)
+{
+       auto predicate = [](unsigned char c){ return !std::isspace(c); };
+       auto base = std::find_if(s.rbegin(), s.rend(), predicate).base();
+       s.erase(base, s.end());
+       return std::move(s);
+}
+
+} // anonymous namespace
 
 namespace qxx {
 
@@ -261,7 +274,7 @@ Table<Columns...>::operator std::string()
                ss << c << " ";
 
        this->cache.clear();
-       return ss.str();
+       return rtrim(ss.str());
 }
 
 template<typename... Columns>