* fixes for mysql timestamp behavior quirks

PearsonEducation · May 28, 2015 · 7d8e175 · 7d8e175
1 parent dcb2ebe
commit 7d8e175
Show file tree

Hide file tree

Showing 10 changed files with 2,136 additions and 2,133 deletions.
diff --git a/docs/manual.pdf b/docs/manual.pdf
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.pearson.StatsAgg</groupId>
     <artifactId>StatsAgg</artifactId>
-    <version>1.3</version>
+    <version>1.3.1</version>
     <packaging>war</packaging>
     <name>StatsAgg</name>
 

diff --git a/src/main/java/com/pearson/statsagg/database/alert_suspensions/AlertSuspensionsSql.java b/src/main/java/com/pearson/statsagg/database/alert_suspensions/AlertSuspensionsSql.java
@@ -57,10 +57,10 @@ public class AlertSuspensionsSql {
                     "IS_RECUR_THURSDAY BOOLEAN NOT NULL, " + 
                     "IS_RECUR_FRIDAY BOOLEAN NOT NULL, " + 
                     "IS_RECUR_SATURDAY BOOLEAN NOT NULL, " +
-                    "START_DATE TIMESTAMP NOT NULL, " + 
-                    "START_TIME TIMESTAMP NOT NULL, " +
+                    "START_DATE TIMESTAMP NULL DEFAULT NULL, " + 
+                    "START_TIME TIMESTAMP NULL DEFAULT NULL, " +
                     "DURATION INTEGER NOT NULL, " + 
-                    "DELETE_AT_TIMESTAMP TIMESTAMP " + 
+                    "DELETE_AT_TIMESTAMP TIMESTAMP NULL DEFAULT NULL" + 
                     ") " +
                     "ROW_FORMAT=DYNAMIC";
 

diff --git a/src/main/java/com/pearson/statsagg/database/alerts/AlertsSql.java b/src/main/java/com/pearson/statsagg/database/alerts/AlertsSql.java
@@ -78,10 +78,10 @@ public class AlertsSql {
                     "CAUTION_STOP_TRACKING_AFTER BIGINT, " +
                     "CAUTION_MINIMUM_SAMPLE_COUNT INTEGER, " + 
                     "IS_CAUTION_ALERT_ACTIVE BOOLEAN NOT NULL, " +
-                    "CAUTION_ALERT_LAST_SENT_TIMESTAMP TIMESTAMP, " +
+                    "CAUTION_ALERT_LAST_SENT_TIMESTAMP TIMESTAMP NULL DEFAULT NULL, " +
                     "IS_CAUTION_ACKNOWLEDGED BOOLEAN, " +
                     "CAUTION_ACTIVE_ALERTS_SET MEDIUMTEXT, " +
-                    "CAUTION_FIRST_ACTIVE_AT TIMESTAMP, " + 
+                    "CAUTION_FIRST_ACTIVE_AT TIMESTAMP NULL DEFAULT NULL, " + 
                     "DANGER_NOTIFICATION_GROUP_ID INTEGER, " +
                     "DANGER_OPERATOR INTEGER, " + 
                     "DANGER_COMBINATION INTEGER, " + 
@@ -91,10 +91,10 @@ public class AlertsSql {
                     "DANGER_STOP_TRACKING_AFTER BIGINT, " +
                     "DANGER_MINIMUM_SAMPLE_COUNT INTEGER, " + 
                     "IS_DANGER_ALERT_ACTIVE BOOLEAN NOT NULL, " +
-                    "DANGER_ALERT_LAST_SENT_TIMESTAMP TIMESTAMP, " +
+                    "DANGER_ALERT_LAST_SENT_TIMESTAMP TIMESTAMP NULL DEFAULT NULL, " +
                     "IS_DANGER_ACKNOWLEDGED BOOLEAN, " +
                     "DANGER_ACTIVE_ALERTS_SET MEDIUMTEXT, " +
-                    "DANGER_FIRST_ACTIVE_AT TIMESTAMP " + 
+                    "DANGER_FIRST_ACTIVE_AT TIMESTAMP NULL DEFAULT NULL" + 
                     ") " +
                     "ROW_FORMAT=DYNAMIC";
 

diff --git a/src/main/java/com/pearson/statsagg/database/gauges/GaugesSql.java b/src/main/java/com/pearson/statsagg/database/gauges/GaugesSql.java
@@ -29,7 +29,7 @@ public class GaugesSql {
                     "BUCKET_SHA1 VARCHAR(50) NOT NULL, " + 
                     "BUCKET MEDIUMTEXT NOT NULL, " + 
                     "METRIC_VALUE DECIMAL(65,7) NOT NULL, " +
-                    "LAST_MODIFIED TIMESTAMP NOT NULL " + 
+                    "LAST_MODIFIED TIMESTAMP NULL DEFAULT NULL " + 
                     ") " +
                     "ROW_FORMAT=DYNAMIC";
 

diff --git a/src/main/java/com/pearson/statsagg/database/metric_last_seen/MetricLastSeenSql.java b/src/main/java/com/pearson/statsagg/database/metric_last_seen/MetricLastSeenSql.java
@@ -24,7 +24,7 @@ public class MetricLastSeenSql {
                     "CREATE TABLE METRIC_LAST_SEEN (" + 
                     "METRIC_KEY_SHA1 VARCHAR(50) NOT NULL, " + 
                     "METRIC_KEY MEDIUMTEXT NOT NULL, " + 
-                    "LAST_MODIFIED TIMESTAMP NOT NULL " + 
+                    "LAST_MODIFIED TIMESTAMP NULL DEFAULT NULL" + 
                     ") " +
                     "ROW_FORMAT=DYNAMIC";
 

diff --git a/src/main/webapp/docs/Manual.htm b/src/main/webapp/docs/Manual.htm
diff --git a/src/main/webapp/docs/Manual_files/image001.png b/src/main/webapp/docs/Manual_files/image001.png
diff --git a/src/main/webapp/docs/Manual_files/image002.png b/src/main/webapp/docs/Manual_files/image002.png
diff --git a/src/main/webapp/docs/Manual_files/props011.xml b/src/main/webapp/docs/Manual_files/props011.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ds:datastoreItem ds:itemID="{250E1DB7-BBC9-40B5-8C98-FD883BFA6083}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
+<ds:datastoreItem ds:itemID="{8F071B55-FC1E-4F6C-BB3C-45A713D7D84A}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>