query progress

src/sql/query_intermediates.cpp

@@ -20,10 +20,10 @@ record query_select_finish::fetch_one()
   return *connection_.fetch(compiler.compile(&data_)).begin().get();
 }
 
-std::string query_select_finish::str() const
+query_context query_select_finish::build() const
 {
   query_compiler compiler(connection_.dialect());
-  return compiler.compile(&data_).sql;
+  return compiler.compile(&data_);
 }
 
 std::unique_ptr<query_result_impl> query_select_finish::fetch()
@@ -184,10 +184,10 @@ statement query_execute_finish::prepare()
   return connection_.prepare(compiler.compile(&data_));
 }
 
-std::string query_execute_finish::str() const
+query_context query_execute_finish::build() const
 {
   query_compiler compiler(connection_.dialect());
-  return compiler.compile(&data_).sql;
+  return compiler.compile(&data_);
 }
 
 query_execute_finish query_into_intermediate::values(std::initializer_list<any_type> values)
@@ -229,10 +229,10 @@ query_execute_finish query_drop_intermediate::table(const sql::table &table)
   return {connection_, schema_, data_};
 }
 
-query_execute_finish query_execute_where_intermediate::limit(int limit)
+query_order_by_intermediate query_execute_where_intermediate::order_by(const column &col)
 {
+  data_.parts.push_back(std::make_unique<query_order_by_part>(col));
   return {connection_, schema_, data_};
-//  return {connection_, builder_.limit(limit)};
 }
 
 query_execute_where_intermediate query_set_intermediate::where_clause(std::unique_ptr<basic_condition> &&cond)
@@ -273,6 +273,7 @@ query_delete_intermediate::query_delete_intermediate(connection &db, const std::
 
 query_delete_from_intermediate query_delete_intermediate::from(const sql::table &table)
 {
+  data_.parts.push_back(std::make_unique<query_delete_from_part>(table));
   return {connection_, schema_, data_};
 }