CDK: Add new method end_of_reply() to Reply interface.

This method checks if there is more data in the reply, without moving to the next result if it exists. This is needed for correct error reporting, because has_results() starts reading next result (if it exists) and can throw error if server reports one.

Author: rsomla1

cdk/include/mysql/cdk/api/reply.h

@@ -47,7 +47,6 @@ class Reply
 
   typedef typename Traits::row_count_t row_count_t;
 
-
   /*
      Method has_results() Returns true if there are result sets included in the
      reply. To access these result sets one has to create a cursor. The exact
@@ -58,6 +57,7 @@ class Reply
      In other words, has_results() informs about result sets that can be still �consumed� and if it returns false it means that all of them have been processed.
     Returns true if there are result sets included in the reply.
   */
+
   virtual bool has_results() = 0;
 
 
@@ -66,8 +66,17 @@ class Reply
      (and thus avoiding allocation of cursor resources). If reply has several
      result sets then the next one becomes available.
   */
+
   virtual void skip_result() = 0;
 
+  /*
+    This method returns true if all results in the reply have been consumed.
+    If it returns false, then there are more results pending, but they do not
+    need to contain rows (so that creating a new cursor might fail). To check
+    if there are more rows to consume with a cursor, call has_results().
+  */
+
+  virtual bool end_of_reply() = 0;
 
   /*
      Method has_out_params() informs if this reply contains values for output

cdk/include/mysql/cdk/reply.h

@@ -67,7 +67,13 @@ class Reply
 
   // Reply interface
 
-  bool has_results()
+  bool end_of_reply() override
+  {
+    assert(m_impl);
+    return !m_impl->check_results();
+  }
+
+  bool has_results() override
   {
     /*
       If we are in a state after consuming one result set and there is
@@ -79,43 +85,51 @@ class Reply
     return m_impl->next_result() || m_impl->check_results();
   }
 
-  void skip_result()
+  void skip_result() override
   {
     m_impl->discard_result();
     m_impl->wait();
     // Note: this moves to next result set, if present.
     m_impl->next_result();
   }
 
-  row_count_t affected_rows() { return m_impl->affected_rows(); }
-  row_count_t last_insert_id() { return m_impl->last_insert_id(); }
+  void discard() override
+  { m_impl->discard(); }
+
+  row_count_t affected_rows() override
+  { return m_impl->affected_rows(); }
+
+  row_count_t last_insert_id()
+  { return m_impl->last_insert_id(); }
+
   const std::vector<std::string>& generated_ids() const
   { return m_impl->generated_ids(); }
-  void discard() { m_impl->discard(); }
 
   // Diagnostics interface
 
-  unsigned int entry_count(Severity::value level=Severity::ERROR)
+  unsigned int entry_count(Severity::value level=Severity::ERROR) override
   { return m_impl->entry_count(level); }
 
-  Diagnostic_iterator& get_entries(Severity::value level=Severity::ERROR)
+  Diagnostic_iterator& get_entries(Severity::value level=Severity::ERROR) override
   { return m_impl->get_entries(level); }
 
-  const Error& get_error()
+  const Error& get_error() override
   { return m_impl->get_error(); }
 
   // Async_op interface
 
-  bool is_completed() const { return m_impl->is_completed(); }
+  bool is_completed() const override
+  { return m_impl->is_completed(); }
 
 private:
 
   // Async_op
 
-  bool do_cont() { return m_impl->cont(); }
-  void do_wait() { return m_impl->wait(); }
-  void do_cancel() { return m_impl->cancel(); }
-  const cdk::api::Event_info* get_event_info() const
+  bool do_cont() override { return m_impl->cont(); }
+  void do_wait() override { return m_impl->wait(); }
+  void do_cancel() override { return m_impl->cancel(); }
+
+  const cdk::api::Event_info* get_event_info() const override
   { return m_impl->get_event_info(); }