Merge lp:~linuxjedi/libdrizzle/5.1-fixes into lp:libdrizzle

[Andrew Hutchings]

Fix datetime output for prepared statement

Microsecond handling and leading zeros were incorrect

(Wim's test case now passes! :)

=== modified file 'libdrizzle/datetime.h'
--- libdrizzle/datetime.h	2013-01-27 11:55:48 +0000
+++ libdrizzle/datetime.h	2013-04-25 10:18:28 +0000
@@ -47,6 +47,7 @@
   uint8_t second;
   uint32_t microsecond;
   bool negative;
+  bool show_microseconds;
 };
 
 
 
=== modified file 'libdrizzle/pack.cc'
--- libdrizzle/pack.cc	2013-03-25 17:37:33 +0000
+++ libdrizzle/pack.cc	2013-04-25 10:18:28 +0000
@@ -256,7 +256,7 @@
   return ptr + 1 + length;
 }
 
-void drizzle_unpack_time(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime)
+void drizzle_unpack_time(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime, uint8_t decimals)
 {
   memset(datetime, 0, sizeof(*datetime));
 
@@ -271,10 +271,14 @@
     {
       datetime->microsecond= drizzle_get_byte4(&field[8]);
     }
+    if (decimals)
+    {
+      datetime->show_microseconds= true;
+    }
   }
 }
 
-void drizzle_unpack_datetime(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime)
+void drizzle_unpack_datetime(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime, uint8_t decimals)
 {
   memset(datetime, 0, sizeof(*datetime));
 
@@ -294,6 +298,10 @@
         datetime->microsecond= drizzle_get_byte4(&field[7]);
       }
     }
+    if (decimals)
+    {
+      datetime->show_microseconds= true;
+    } 
   }
 }
 
 
=== modified file 'libdrizzle/pack.h'
--- libdrizzle/pack.h	2013-03-19 17:26:38 +0000
+++ libdrizzle/pack.h	2013-04-25 10:18:28 +0000
@@ -79,9 +79,9 @@
 
 unsigned char *drizzle_pack_datetime(drizzle_datetime_st *datetime, unsigned char *ptr);
 
-void drizzle_unpack_time(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime);
+void drizzle_unpack_time(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime, uint8_t decimals);
 
-void drizzle_unpack_datetime(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime);
+void drizzle_unpack_datetime(drizzle_field_t field, size_t length, drizzle_datetime_st *datetime, uint8_t decimals);
 
 /**
  * Unpack length-encoded string.
 
=== modified file 'libdrizzle/statement.cc'
--- libdrizzle/statement.cc	2013-04-22 18:32:01 +0000
+++ libdrizzle/statement.cc	2013-04-25 10:18:28 +0000
@@ -485,13 +485,13 @@
           break;
         case DRIZZLE_COLUMN_TYPE_TIME:
           param->data= param->data_buffer;
-          drizzle_unpack_time(row[current_column], param->length, (drizzle_datetime_st *)param->data);
+          drizzle_unpack_time(row[current_column], param->length, (drizzle_datetime_st *)param->data, stmt->execute_result->column_buffer[current_column].decimals);
           break;
         case DRIZZLE_COLUMN_TYPE_DATE:
         case DRIZZLE_COLUMN_TYPE_DATETIME:
         case DRIZZLE_COLUMN_TYPE_TIMESTAMP:
           param->data= param->data_buffer;
-          drizzle_unpack_datetime(row[current_column], param->length, (drizzle_datetime_st *)param->data);
+          drizzle_unpack_datetime(row[current_column], param->length, (drizzle_datetime_st *)param->data, stmt->execute_result->column_buffer[current_column].decimals);
           break;
         case DRIZZLE_COLUMN_TYPE_TINY_BLOB:
         case DRIZZLE_COLUMN_TYPE_MEDIUM_BLOB:
 
=== modified file 'libdrizzle/statement_param.cc'
--- libdrizzle/statement_param.cc	2013-04-25 08:58:44 +0000
+++ libdrizzle/statement_param.cc	2013-04-25 10:18:28 +0000
@@ -642,7 +642,7 @@
   used = snprintf(buffer, buffersize-used, "%s%02u:%02"PRIu8":%02"PRIu8, (time->negative) ? "-" : "", time->hour + 24 * time->day, time->minute, time->second);
 
   /* TODO: the existence (and length) of the decimals should be decided based on the number of fields sent by the server or possibly the column's "decimals" value, not by whether the microseconds are 0 */
-  if (time->microsecond)
+  if (time->microsecond || time->show_microseconds)
     used += snprintf(buffer+used, buffersize-used, ".%06" PRIu32, time->microsecond);
   
   assert(used < buffersize);
@@ -657,7 +657,7 @@
   int buffersize = 27;
   int used = 0;
   
-  used += snprintf(buffer, buffersize-used, "%"PRIu16"-%02"PRIu8"-%02"PRIu32,
+  used += snprintf(buffer, buffersize-used, "%04"PRIu16"-%02"PRIu8"-%02"PRIu32,
      timestamp->year, timestamp->month, timestamp->day);
   assert(used < buffersize);
   
@@ -667,8 +667,7 @@
   used += snprintf(buffer+used, buffersize-used, " %02"PRIu16":%02"PRIu8":%02"PRIu8,
     timestamp->hour, timestamp->minute, timestamp->second);
 
-  /* TODO: the existence (and length) of the decimals should be decided based on the number of fields sent by the server or possibly the column's "decimals" value, not by whether the microseconds are 0 */
-  if (timestamp->microsecond)
+  if (timestamp->microsecond || timestamp->show_microseconds)
   {
     used += snprintf(buffer+used, buffersize-used, ".%06"PRIu32, timestamp->microsecond);
   }
 
=== modified file 'tests/unit/datetypes.c'
--- tests/unit/datetypes.c	2013-04-23 20:33:18 +0000
+++ tests/unit/datetypes.c	2013-04-25 10:18:28 +0000
@@ -252,7 +252,7 @@
     if (cur_row == 2) {
 	    ASSERT_COL_STREQ_(2, "1984-02-29");
     } else if (cur_row == 4) {
-	    ASSERT_COL_STREQ_(2, "0084-02-29");  /* Yes, year 84, during the reign of Domitian */
+	    ASSERT_COL_STREQ_(2, "0084-02-09");  /* Yes, year 84, during the reign of Domitian */
     }
 
     /* TODO: libdrizzle currently has no way to give us access to the actual returned values for time/date fields. If that changes, test the values here. */
 
=== modified file 'tests/unit/include.am'
--- tests/unit/include.am	2013-04-22 19:14:35 +0000
+++ tests/unit/include.am	2013-04-25 10:18:28 +0000
@@ -57,7 +57,6 @@
 tests_unit_datetypes_LDADD= libdrizzle/libdrizzle.la
 check_PROGRAMS+= tests/unit/datetypes
 noinst_PROGRAMS+= tests/unit/datetypes
-XFAIL_TESTS+= tests/unit/datetypes
 
 tests_unit_nulls_SOURCES= tests/unit/nulls.c tests/unit/common.c
 tests_unit_nulls_LDADD= libdrizzle/libdrizzle.la