diff options
Diffstat (limited to 'lib/statement.cpp')
-rw-r--r-- | lib/statement.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/statement.cpp b/lib/statement.cpp index 5dd3789..ac83084 100644 --- a/lib/statement.cpp +++ b/lib/statement.cpp | |||
@@ -1,8 +1,8 @@ | |||
1 | #include "statement.h" | 1 | #include "statement.h" |
2 | #include <sstream> | 2 | #include <sstream> |
3 | #include <utility> | 3 | #include <utility> |
4 | #include <hkutil/string.h> | ||
4 | #include "filter.h" | 5 | #include "filter.h" |
5 | #include "util.h" | ||
6 | #include "order.h" | 6 | #include "order.h" |
7 | 7 | ||
8 | namespace verbly { | 8 | namespace verbly { |
@@ -69,7 +69,7 @@ namespace verbly { | |||
69 | ctes.push_back(cteStream.str()); | 69 | ctes.push_back(cteStream.str()); |
70 | } | 70 | } |
71 | 71 | ||
72 | queryStream << implode(std::begin(ctes), std::end(ctes), ", "); | 72 | queryStream << hatkirby::implode(std::begin(ctes), std::end(ctes), ", "); |
73 | queryStream << " "; | 73 | queryStream << " "; |
74 | } | 74 | } |
75 | 75 | ||
@@ -80,7 +80,7 @@ namespace verbly { | |||
80 | } | 80 | } |
81 | 81 | ||
82 | queryStream << "SELECT "; | 82 | queryStream << "SELECT "; |
83 | queryStream << implode(std::begin(realSelect), std::end(realSelect), ", "); | 83 | queryStream << hatkirby::implode(std::begin(realSelect), std::end(realSelect), ", "); |
84 | queryStream << " FROM "; | 84 | queryStream << " FROM "; |
85 | queryStream << tables_.at(topTable_); | 85 | queryStream << tables_.at(topTable_); |
86 | queryStream << " AS "; | 86 | queryStream << " AS "; |
@@ -1069,7 +1069,7 @@ namespace verbly { | |||
1069 | { | 1069 | { |
1070 | return clauses.front(); | 1070 | return clauses.front(); |
1071 | } else { | 1071 | } else { |
1072 | std::string result = implode(std::begin(clauses), std::end(clauses), group_.orlogic_ ? " OR " : " AND "); | 1072 | std::string result = hatkirby::implode(std::begin(clauses), std::end(clauses), group_.orlogic_ ? " OR " : " AND "); |
1073 | 1073 | ||
1074 | if (toplevel) | 1074 | if (toplevel) |
1075 | { | 1075 | { |