added query helper macro and join query parts

include/matador/sql/query_compiler.hpp

@@ -24,6 +24,8 @@ public:
 private:
   void visit(query_select_part &select_part) override;
   void visit(query_from_part &from_part) override;
+  void visit(query_join_part &join_part) override;
+  void visit(query_on_part &on_part) override;
   void visit(query_where_part &where_part) override;
   void visit(query_group_by_part &group_by_part) override;
   void visit(query_order_by_part &order_by_part) override;

include/matador/sql/query_intermediates.hpp

@@ -73,7 +73,7 @@ public:
 
   statement prepare();
 
-  std::string str() const;
+  [[nodiscard]] std::string str() const;
 
 private:
   std::unique_ptr<query_result_impl> fetch();
@@ -148,7 +148,12 @@ class query_join_intermediate : public query_intermediate
 public:
   using query_intermediate::query_intermediate;
 
-  query_on_intermediate on(const basic_condition &cond);
+  template<class Condition>
+  query_on_intermediate on(const Condition &cond)
+  {
+    data_.parts.push_back(std::make_unique<query_on_part>(cond));
+    return {connection_, data_};
+  }
 };
 
 class query_from_intermediate : public query_select_finish
@@ -156,7 +161,7 @@ class query_from_intermediate : public query_select_finish
 public:
   using query_select_finish::query_select_finish;
 
-  query_join_intermediate join_left(const std::string &join_table_name, const std::string &as = "");
+  query_join_intermediate join_left(const table &t);
   query_where_intermediate where(const basic_condition &cond);
   query_group_by_intermediate group_by(const std::string &name);
   query_order_by_intermediate order_by(const std::string &name);
@@ -176,7 +181,7 @@ class query_select_intermediate : public query_start_intermediate
 public:
   query_select_intermediate(connection &s, const std::vector<column>& columns);
 
-  query_from_intermediate from(const std::string &table, const std::string &as = "");
+  query_from_intermediate from(const table& t);
 };
 
 template < class Type >

include/matador/sql/query_part_visitor.hpp

@@ -5,6 +5,8 @@ namespace matador::sql {
 
 class query_select_part;
 class query_from_part;
+class query_join_part;
+class query_on_part;
 class query_where_part;
 class query_group_by_part;
 class query_order_by_part;
@@ -24,6 +26,8 @@ public:
 
   virtual void visit(query_select_part &select_part) = 0;
   virtual void visit(query_from_part &from_part) = 0;
+  virtual void visit(query_join_part &join_part) = 0;
+  virtual void visit(query_on_part &on_part) = 0;
   virtual void visit(query_where_part &where_part) = 0;
   virtual void visit(query_group_by_part &group_by_part) = 0;
   virtual void visit(query_order_by_part &order_by_part) = 0;

include/matador/sql/query_parts.hpp

@@ -1,10 +1,12 @@
 #ifndef QUERY_QUERY_PARTS_HPP
 #define QUERY_QUERY_PARTS_HPP
 
+#include "matador/sql/basic_condition.hpp"
 #include "matador/sql/query_part_visitor.hpp"
 #include "matador/sql/column.hpp"
 #include "matador/sql/column_definition.hpp"
 #include "matador/sql/dialect.hpp"
+#include "matador/sql/table.hpp"
 
 #include <memory>
 
@@ -46,15 +48,44 @@ private:
 class query_from_part : public query_part
 {
 public:
-  explicit query_from_part(std::string table_name);
-  query_from_part(std::string table_name, std::string as);
+  explicit query_from_part(sql::table t);
+
+  [[nodiscard]] const sql::table& table() const;
 
 private:
   void accept(query_part_visitor &visitor) override;
 
 private:
-  std::string table_;
-  std::string alias_;
+  sql::table table_;
+};
+
+class query_join_part : public query_part
+{
+public:
+  explicit query_join_part(sql::table t);
+
+  [[nodiscard]] const sql::table& table() const;
+
+private:
+  void accept(query_part_visitor &visitor) override;
+
+private:
+  sql::table table_;
+};
+
+class query_on_part : public query_part
+{
+public:
+  template < class Condition >
+  explicit query_on_part(const Condition &cond)
+    : query_part(dialect::token_t::ON)
+    , condition_(new Condition(cond)) {}
+
+private:
+  void accept(query_part_visitor &visitor) override;
+
+private:
+  std::unique_ptr<basic_condition> condition_;
 };
 
 class query_where_part : public query_part

include/matador/sql/schema.hpp

@@ -28,7 +28,7 @@ public:
   using iterator = repository::iterator;
   using const_iterator = repository::const_iterator;
 
-  std::string name() const;
+  [[nodiscard]] std::string name() const;
 
   template<typename Type>
   const table_info& attach(const std::string &table_name)

include/matador/sql/table.hpp

@@ -8,8 +8,18 @@ namespace matador::sql {
 
 struct table
 {
-  std::type_index index;
+//  std::type_index index;
   std::string name;
+  std::string alias;
+
+  table(std::string name, std::string as = "") // NOLINT(*-explicit-constructor)
+  : name(std::move(name)), alias(std::move(as)) {}
+
+  table& as(const std::string &a) {
+    alias = a;
+    return *this;
+  }
+
 };
 
 }