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;