Merge pull request #1739 from haiwen/fix-sql

[scripts] Fix default datetime issue in 6.0
haiwen · Sep 2, 2016 · 01e0571 · 01e0571
2 parents fad9fc2 + 9994ad9
commit 01e0571
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/upgrade/sql/6.0.0/mysql/seahub.sql b/scripts/upgrade/sql/6.0.0/mysql/seahub.sql
@@ -1,5 +1,5 @@
 ALTER TABLE api2_tokenv2 ADD COLUMN wiped_at DATETIME DEFAULT NULL;
-ALTER TABLE api2_tokenv2 ADD COLUMN created_at DATETIME NOT NULL;
+ALTER TABLE api2_tokenv2 ADD COLUMN created_at DATETIME NOT NULL DEFAULT "1970-01-01 00:00:00";
 
 CREATE TABLE IF NOT EXISTS `base_filecomment` (
   `id` int(11) NOT NULL AUTO_INCREMENT,

diff --git a/scripts/upgrade/sql/6.0.0/sqlite3/seahub.sql b/scripts/upgrade/sql/6.0.0/sqlite3/seahub.sql
@@ -21,4 +21,4 @@ CREATE INDEX IF NOT EXISTS "invitations_invitation_94a08da1" ON "invitations_inv
 CREATE INDEX IF NOT EXISTS "invitations_invitation_d5dd16f8" ON "invitations_invitation" ("inviter");
 
 ALTER TABLE api2_tokenv2 ADD COLUMN wiped_at datetime DEFAULT NULL;
-ALTER TABLE api2_tokenv2 ADD COLUMN created_at datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE api2_tokenv2 ADD COLUMN created_at datetime NOT NULL DEFAULT '1970-01-01 00:00:00';