query parts progress

include/matador/sql/query.hpp

@@ -41,7 +41,9 @@ query_select_intermediate query::select()
 template<class Type>
 query_select_intermediate query::select(std::initializer_list<column> columns)
 {
-  return query_select_intermediate{connection_, column_name_generator::generate<Type>(this->schema())};
+  auto cols = column_name_generator::generate<Type>(this->schema());
+  cols.insert(cols.end(), columns);
+  return query_select_intermediate{connection_, cols};
 }
 
 }

include/matador/sql/query_intermediates.hpp

@@ -127,7 +127,7 @@ public:
   using query_select_finish::query_select_finish;
 
   query_group_by_intermediate group_by(const std::string &name);
-  query_order_by_intermediate order_by(const std::string &name);
+  query_order_by_intermediate order_by(const column &col);
 };
 
 class query_join_intermediate;
@@ -145,7 +145,7 @@ public:
     return {connection_, data_};
   }
   query_group_by_intermediate group_by(const std::string &name);
-  query_order_by_intermediate order_by(const std::string &name);
+  query_order_by_intermediate order_by(const column &col);
 };
 
 class query_join_intermediate : public query_intermediate

include/matador/sql/query_parts.hpp

@@ -125,13 +125,18 @@ private:
   void accept(query_part_visitor &visitor) override;
 };
 
-class query_order_by_part : public query_table_name_part
+class query_order_by_part : public query_part
 {
 public:
-  explicit query_order_by_part(const std::string &table_name);
+  explicit query_order_by_part(sql::column  col);
+
+  const sql::column& column() const;
 
 private:
   void accept(query_part_visitor &visitor) override;
+
+private:
+  sql::column column_;
 };
 
 class query_order_by_asc_part : public query_part

include/matador/sql/table.hpp

@@ -8,7 +8,6 @@ namespace matador::sql {
 
 struct table
 {
-//  std::type_index index;
   std::string name;
   std::string alias;
 

include/matador/utils/macro_map.hpp

@@ -0,0 +1,42 @@
+#ifndef QUERY_MACRO_MAP_HPP
+#define QUERY_MACRO_MAP_HPP
+
+#define EVAL0(...) __VA_ARGS__
+#define EVAL1(...) EVAL0(EVAL0(EVAL0(__VA_ARGS__)))
+#define EVAL2(...) EVAL1(EVAL1(EVAL1(__VA_ARGS__)))
+#define EVAL3(...) EVAL2(EVAL2(EVAL2(__VA_ARGS__)))
+#define EVAL4(...) EVAL3(EVAL3(EVAL3(__VA_ARGS__)))
+#define EVAL(...)  EVAL4(EVAL4(EVAL4(__VA_ARGS__)))
+
+#define MAP_END(...)
+#define MAP_OUT
+#define MAP_COMMA ,
+
+#define MAP_GET_END2() 0, MAP_END
+#define MAP_GET_END1(...) MAP_GET_END2
+#define MAP_GET_END(...) MAP_GET_END1
+#define MAP_NEXT0(test, next, ...) next MAP_OUT
+#define MAP_NEXT1(test, next) MAP_NEXT0(test, next, 0)
+#define MAP_NEXT(test, next)  MAP_NEXT1(MAP_GET_END test, next)
+
+#define MAP0(f, x, peek, ...) f(x) MAP_NEXT(peek, MAP1)(f, peek, __VA_ARGS__)
+#define MAP1(f, x, peek, ...) f(x) MAP_NEXT(peek, MAP0)(f, peek, __VA_ARGS__)
+
+#define MAP_LIST_NEXT1(test, next) MAP_NEXT0(test, MAP_COMMA next, 0)
+#define MAP_LIST_NEXT(test, next)  MAP_LIST_NEXT1(MAP_GET_END test, next)
+
+#define MAP_LIST0(f, x, peek, ...) f(x) MAP_LIST_NEXT(peek, MAP_LIST1)(f, peek, __VA_ARGS__)
+#define MAP_LIST1(f, x, peek, ...) f(x) MAP_LIST_NEXT(peek, MAP_LIST0)(f, peek, __VA_ARGS__)
+
+/**
+ * Applies the function macro `f` to each of the remaining parameters.
+ */
+#define MAP(f, ...) EVAL(MAP1(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+/**
+ * Applies the function macro `f` to each of the remaining parameters and
+ * inserts commas between the results.
+ */
+#define MAP_LIST(f, ...) EVAL(MAP_LIST1(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#endif //QUERY_MACRO_MAP_HPP