From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 7 Aug 2018 13:02:59 +0000 (+0200)
Subject: Attempt to avoid MySQL complaints about not allowing zero or empty in DATETIME
X-Git-Tag: Release-9.2.1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b089795d3c4c2fbb3287f206b9bb4148017d206c;p=thirdparty%2Fbacula.git

Attempt to avoid MySQL complaints about not allowing zero or empty in DATETIME
---

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 148cf6102..f8d8d1b64 100644
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -127,7 +127,7 @@ CREATE TABLE Device (
    DevWriteTime BIGINT UNSIGNED DEFAULT 0,
    DevReadTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,
    DevWriteTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   CleaningDate DATETIME,
+   CleaningDate DATETIME DEFAULT NULL,
    CleaningPeriod BIGINT UNSIGNED DEFAULT 0,
    PRIMARY KEY(DeviceId)
    );
@@ -141,10 +141,10 @@ CREATE TABLE Job (
    Level BINARY(1) NOT NULL,
    ClientId INTEGER DEFAULT 0 REFERENCES Client,
    JobStatus BINARY(1) NOT NULL,
-   SchedTime DATETIME,
-   StartTime DATETIME,
-   EndTime DATETIME,
-   RealEndTime DATETIME,
+   SchedTime DATETIME DEFAULT NULL,
+   StartTime DATETIME DEFAULT NULL,
+   EndTime DATETIME DEFAULT NULL,
+   RealEndTime DATETIME DEFAULT NULL,
    JobTDate BIGINT UNSIGNED DEFAULT 0,
    VolSessionId INTEGER UNSIGNED DEFAULT 0,
    VolSessionTime INTEGER UNSIGNED DEFAULT 0,
@@ -177,10 +177,10 @@ CREATE TABLE JobHisto (
    Level BINARY(1) NOT NULL,
    ClientId INTEGER DEFAULT 0,
    JobStatus BINARY(1) NOT NULL,
-   SchedTime DATETIME,
-   StartTime DATETIME,
-   EndTime DATETIME,
-   RealEndTime DATETIME,
+   SchedTime DATETIME DEFAULT NULL
+   StartTime DATETIME DEFAULT NULL,
+   EndTime DATETIME DEFAULT NULL,
+   RealEndTime DATETIME DEFAULT NULL,
    JobTDate BIGINT UNSIGNED DEFAULT 0,
    VolSessionId INTEGER UNSIGNED DEFAULT 0,
    VolSessionTime INTEGER UNSIGNED DEFAULT 0,
@@ -213,7 +213,7 @@ CREATE TABLE Location (
 
 CREATE TABLE LocationLog (
    LocLogId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
-   Date DATETIME,
+   Date DATETIME DEFAULT NULL
    Comment BLOB NOT NULL,
    MediaId INTEGER UNSIGNED DEFAULT 0 REFERENCES Media,
    LocationId INTEGER UNSIGNED DEFAULT 0 REFERENCES Location,
@@ -229,7 +229,7 @@ CREATE TABLE FileSet (
    FileSetId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
    FileSet TINYBLOB NOT NULL,
    MD5 TINYBLOB,
-   CreateTime DATETIME,
+   CreateTime DATETIME DEFAULT NULL,
    PRIMARY KEY(FileSetId)
    );
 
@@ -257,9 +257,9 @@ CREATE TABLE Media (
    MediaType TINYBLOB NOT NULL,
    MediaTypeId INTEGER UNSIGNED DEFAULT 0 REFERENCES MediaType,
    LabelType TINYINT DEFAULT 0,
-   FirstWritten DATETIME,
-   LastWritten DATETIME,
-   LabelDate DATETIME,
+   FirstWritten DATETIME DEFAULT NULL,
+   LastWritten DATETIME DEFAULT NULL,
+   LabelDate DATETIME DEFAULT NULL,
    VolJobs INTEGER UNSIGNED DEFAULT 0,
    VolFiles INTEGER UNSIGNED DEFAULT 0,
    VolBlocks INTEGER UNSIGNED DEFAULT 0,
@@ -297,7 +297,7 @@ CREATE TABLE Media (
    EndBlock INTEGER UNSIGNED DEFAULT 0,
    LocationId INTEGER UNSIGNED DEFAULT 0 REFERENCES Location,
    RecycleCount INTEGER UNSIGNED DEFAULT 0,
-   InitialWrite DATETIME,
+   InitialWrite DATETIME DEFAULT NULL,
    ScratchPoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool,
    RecyclePoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool,
    Comment BLOB,
@@ -353,7 +353,7 @@ CREATE TABLE Client (
 CREATE TABLE Log (
    LogId INTEGER UNSIGNED AUTO_INCREMENT,
    JobId INTEGER UNSIGNED DEFAULT 0 REFERENCES Job,
-   Time DATETIME,
+   Time DATETIME DEFAULT NULL,
    LogText BLOB NOT NULL,
    PRIMARY KEY(LogId),
    INDEX (JobId)
@@ -392,7 +392,7 @@ CREATE TABLE Counters (
 
 CREATE TABLE CDImages (
    MediaId INTEGER UNSIGNED NOT NULL,
-   LastBurn DATETIME,
+   LastBurn DATETIME DEFAULT NULL,
    PRIMARY KEY (MediaId)
    );