Merge lp:~linuxjedi/drizzle/trunk-bug-528410 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

Add drizzle_column_skip_all function
Add error when row retrieval is attempted before all columns are retrieved

[Stewart Smith (stewart)]

review: Approve

[Brian Aker (brianaker)]

(Sorry about hitting reject, I meant accept, should be corrected)

[Andrew Hutchings (linuxjedi)]

hehe, no problem :)

=== modified file 'libdrizzle-1.0/libdrizzle/column.c'
--- libdrizzle-1.0/libdrizzle/column.c	2011-07-20 13:51:34 +0000
+++ libdrizzle-1.0/libdrizzle/column.c	2011-09-07 11:23:04 +0000
@@ -531,6 +531,21 @@
   return ret;
 }
 
+drizzle_return_t drizzle_column_skip_all(drizzle_result_st *result)
+{
+  drizzle_return_t ret;
+  uint16_t it;
+
+  for (it= 1; it <= result->column_count; it++)
+  {
+    ret= drizzle_column_skip(result);
+    if (ret != DRIZZLE_RETURN_OK)
+      return ret;
+  }
+
+  return DRIZZLE_RETURN_OK;
+}
+
 drizzle_column_st *drizzle_column_read(drizzle_result_st *result,
                                        drizzle_column_st *column,
                                        drizzle_return_t *ret_ptr)
@@ -791,6 +806,7 @@
     con->buffer_ptr+= con->packet_size;
     con->buffer_size-= con->packet_size;
     con->packet_size= 0;
+    con->result->column_current++;
 
     drizzle_state_pop(con);
   }

=== modified file 'libdrizzle-1.0/libdrizzle/column_client.h'
--- libdrizzle-1.0/libdrizzle/column_client.h	2010-12-10 20:09:17 +0000
+++ libdrizzle-1.0/libdrizzle/column_client.h	2011-09-07 11:23:04 +0000
@@ -58,12 +58,19 @@
  */
 
 /**
- * Skip all columns in result.
+ * Skip a column in result.
  */
 DRIZZLE_API
 drizzle_return_t drizzle_column_skip(drizzle_result_st *result);
 
 /**
+ * Skip all columns in a result
+ */
+
+DRIZZLE_API
+drizzle_return_t drizzle_column_skip_all(drizzle_result_st *result);
+
+/**
  * Read column information.
  *
  * @param[in,out] result pointer to the structure to read from.

=== modified file 'libdrizzle-1.0/libdrizzle/row.c'
--- libdrizzle-1.0/libdrizzle/row.c	2010-12-12 11:52:00 +0000
+++ libdrizzle-1.0/libdrizzle/row.c	2011-09-07 11:23:04 +0000
@@ -47,6 +47,13 @@
 
 uint64_t drizzle_row_read(drizzle_result_st *result, drizzle_return_t *ret_ptr)
 {
+  if ((result->column_current != result->column_count) && (!(result->options & DRIZZLE_RESULT_BUFFER_COLUMN)))
+  {
+    drizzle_set_error(result->con->drizzle, "drizzle_row_read", "cannot retrieve rows until all columns are retrieved");
+    *ret_ptr= DRIZZLE_RETURN_NOT_READY;
+    return 0;
+  }
+
   if (drizzle_state_none(result->con))
   {
     drizzle_state_push(result->con, drizzle_state_row_read);

=== modified file 'libdrizzle-2.0/libdrizzle/column.cc'
--- libdrizzle-2.0/libdrizzle/column.cc	2011-07-20 13:51:34 +0000
+++ libdrizzle-2.0/libdrizzle/column.cc	2011-09-07 11:23:04 +0000
@@ -524,6 +524,21 @@
   return ret;
 }
 
+drizzle_return_t drizzle_column_skip_all(drizzle_result_st *result)
+{
+  drizzle_return_t ret;
+  uint16_t it;
+
+  for (it= 1; it <= result->column_count; it++)
+  {
+    ret= drizzle_column_skip(result);
+    if (ret != DRIZZLE_RETURN_OK)
+      return ret;
+  }
+
+  return DRIZZLE_RETURN_OK;
+}
+
 drizzle_column_st *drizzle_column_read(drizzle_result_st *result,
                                        drizzle_column_st *column,
                                        drizzle_return_t *ret_ptr)
@@ -779,6 +794,7 @@
     con->buffer_ptr+= con->packet_size;
     con->buffer_size-= con->packet_size;
     con->packet_size= 0;
+    con->result->column_count++;
 
     drizzle_state_pop(con);
   }

=== modified file 'libdrizzle-2.0/libdrizzle/column_client.h'
--- libdrizzle-2.0/libdrizzle/column_client.h	2011-03-22 18:39:54 +0000
+++ libdrizzle-2.0/libdrizzle/column_client.h	2011-09-07 11:23:04 +0000
@@ -58,12 +58,18 @@
  */
 
 /**
- * Skip all columns in result.
+ * Skip a column in result.
  */
 DRIZZLE_API
 drizzle_return_t drizzle_column_skip(drizzle_result_st *result);
 
 /**
+ * Skip all columns in a result.
+ */
+DRIZZLE_API
+drizzle_return_t drizzle_column_skip_all(drizzle_result_st *result);
+
+/**
  * Read column information.
  *
  * @param[in,out] result pointer to the structure to read from.

=== modified file 'libdrizzle-2.0/libdrizzle/row.cc'
--- libdrizzle-2.0/libdrizzle/row.cc	2011-06-14 21:15:09 +0000
+++ libdrizzle-2.0/libdrizzle/row.cc	2011-09-07 11:23:04 +0000
@@ -47,6 +47,13 @@
 
 uint64_t drizzle_row_read(drizzle_result_st *result, drizzle_return_t *ret_ptr)
 {
+  if ((result->column_current != result->column_count) && (!(result->options & DRIZZLE_RESULT_BUFFER_COLUMN)))
+  {
+    drizzle_set_error(result->con->drizzle, "drizzle_row_read", "cannot retrieve rows until all columns are retrieved");
+    *ret_ptr= DRIZZLE_RETURN_NOT_READY;
+    return 0;
+  }
+
   if (drizzle_state_none(result->con))
   {
     drizzle_state_push(result->con, drizzle_state_row_read);