diff options
author | louiz’ <louiz@louiz.org> | 2018-04-24 19:19:06 +0200 |
---|---|---|
committer | louiz’ <louiz@louiz.org> | 2018-04-24 20:25:40 +0200 |
commit | 61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24 (patch) | |
tree | f1da873798506627587ef7cdce23062d556b454a /src/database/select_query.hpp | |
parent | a90f196a1ce779d502baf0aadff6e6917fec8a02 (diff) | |
download | biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.tar.gz biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.tar.bz2 biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.tar.xz biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.zip |
Revert "Use a different Date data type"
This reverts commit 857c7d3972a03cbeebf730d99b924d3710dee6a0.
Diffstat (limited to 'src/database/select_query.hpp')
-rw-r--r-- | src/database/select_query.hpp | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/database/select_query.hpp b/src/database/select_query.hpp index 0de4fe5..b9fdc06 100644 --- a/src/database/select_query.hpp +++ b/src/database/select_query.hpp @@ -5,8 +5,8 @@ #include <database/table.hpp> #include <database/database.hpp> #include <database/statement.hpp> -#include <utils/datetime.hpp> #include <database/query.hpp> +#include <logger/logger.hpp> #include <database/row.hpp> #include <utils/optional_bool.hpp> @@ -43,14 +43,6 @@ extract_row_value(Statement& statement, const int i) return result; } -template <typename T> -typename std::enable_if<std::is_same<DateTime, T>::value, T>::type -extract_row_value(Statement& statement, const int i) -{ - const std::string timestamp = statement.get_column_text(i); - return {timestamp}; -} - template <std::size_t N=0, typename... T> typename std::enable_if<N < sizeof...(T), void>::type extract_row_values(Row<T...>& row, Statement& statement) @@ -68,24 +60,6 @@ typename std::enable_if<N == sizeof...(T), void>::type extract_row_values(Row<T...>&, Statement&) {} -template <typename ColumnType> -std::string before_column() -{ - return {}; -} - -template <typename ColumnType> -std::string after_column() -{ - return {}; -} - -template <> -std::string before_column<Database::Date>(); - -template <> -std::string after_column<Database::Date>(); - template <typename... T> struct SelectQuery: public Query { @@ -104,8 +78,7 @@ struct SelectQuery: public Query using ColumnsType = std::tuple<T...>; using ColumnType = typename std::remove_reference<decltype(std::get<N>(std::declval<ColumnsType>()))>::type; - this->body += " "; - this->body += before_column<ColumnType>() + ColumnType::name + after_column<ColumnType>(); + this->body += " " + std::string{ColumnType::name}; if (N < (sizeof...(T) - 1)) this->body += ", "; |