Fix the case where a incompleted record has no EndTime

- this probably slipped through before because of the lax
  type checking which we have now improved.
- The RecordCreateTime for such records was would have been
  set to 'None' in the python code, rather None (or NULL in
  the mysql code, resulting in a load error as RecordCreateTime
  is non null.

Author: gregcorbett

schemas/cloud.sql

@@ -83,17 +83,21 @@ CREATE PROCEDURE ReplaceCloudRecord(
 BEGIN
     DECLARE measurementTimeCalculated DATETIME;
     DECLARE recordCreateTimeNotNull DATETIME;
+    DECLARE endTimeNotNull DATETIME;
 
     IF(status='completed') THEN
         -- in this case, the recordCreateTime and measurementTime could
         -- be wildly different as the VM has ended.
 
         -- if we werent supplied a record create time
         -- for a completed VM we have decided to use the end time
-        SET recordCreateTimeNotNull = IF(recordCreateTime IS NULL or recordCreateTime='0000-00-00 00:00:00', endTime, recordCreateTime);
+        -- We have to check the EndTime is not null because we can't guarantee this as we
+        -- previously loaded completed messages with no EndTime.
+        SET endTimeNotNull = IFNULL(endTime, '0000-00-00 00:00:00');
+        SET recordCreateTimeNotNull = IF(recordCreateTime IS NULL or recordCreateTime='0000-00-00 00:00:00', endTimeNotNull, recordCreateTime);
 
         -- Use the end time as the measurement time
-        SET measurementTimeCalculated = endTime;
+        SET measurementTimeCalculated = endTimeNotNull;
 
     ELSE
         -- In the case of a running VM, the measurement time will

scripts/update_measurememt_time.sql

@@ -33,17 +33,21 @@ CREATE PROCEDURE ReplaceCloudRecord(
 BEGIN
     DECLARE measurementTimeCalculated DATETIME;
     DECLARE recordCreateTimeNotNull DATETIME;
+    DECLARE endTimeNotNull DATETIME;
 
     IF(status='completed') THEN
         -- in this case, the recordCreateTime and measurementTime could
         -- be wildly different as the VM has ended.
 
         -- if we werent supplied a record create time
         -- for a completed VM we have decided to use the end time
-        SET recordCreateTimeNotNull = IF(recordCreateTime IS NULL or recordCreateTime='0000-00-00 00:00:00', endTime, recordCreateTime);
+        -- We have to check the EndTime is not null because we can't guarantee this as we
+        -- previously loaded completed messages with no EndTime.
+        SET endTimeNotNull = IFNULL(endTime, '0000-00-00 00:00:00');
+        SET recordCreateTimeNotNull = IF(recordCreateTime IS NULL or recordCreateTime='0000-00-00 00:00:00', endTimeNotNull, recordCreateTime);
 
         -- Use the end time as the measurement time
-        SET measurementTimeCalculated = endTime;
+        SET measurementTimeCalculated = endTimeNotNull;
 
     ELSE
         -- In the case of a running VM, the measurement time will