Fix default timestamp in upgrade script

The 1811 upgrade script for distributed locking is failing, because the
default timestamp value is invalid for the new column type.  Modified
the value and also added one for the downgrade script.

Issue-ID: POLICY-3117
Change-Id: I8dff748cb089db551820418b1d597a1be207c9b5
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.downgrade.sql b/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.downgrade.sql
index 33f6154..55a883f 100644 (file)
--- a/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.downgrade.sql
+++ b/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.downgrade.sql
@@ -1,14 +1,14 @@
 #  ============LICENSE_START=======================================================
 #  feature-distributed-locking
 # ================================================================================
-#  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+#  Copyright (C) 2018, 2021 AT&T Intellectual Property. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
-#  
+#
 #       http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,4 +16,4 @@
 #  limitations under the License.
 #  ============LICENSE_END=========================================================
 
-ALTER TABLE pooling.locks modify if exists expirationTime bigint(20);
+ALTER TABLE pooling.locks modify if exists expirationTime bigint(20) default 0;

diff --git a/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.upgrade.sql b/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.upgrade.sql
index 7862da9..ed51879 100644 (file)
--- a/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.upgrade.sql
+++ b/feature-distributed-locking/src/main/feature/db/pooling/sql/1811-distributedlocking.upgrade.sql
@@ -1,14 +1,14 @@
 #  ============LICENSE_START=======================================================
 #  feature-distributed-locking
 # ================================================================================
-#  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+#  Copyright (C) 2018, 2021 AT&T Intellectual Property. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
-#  
+#
 #       http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,8 +16,8 @@
 #  limitations under the License.
 #  ============LICENSE_END=========================================================
 
- set foreign_key_checks=0; 
- 
- ALTER TABLE pooling.locks modify if exists expirationTime timestamp default 0;
+ set foreign_key_checks=0;
+
+ ALTER TABLE pooling.locks modify if exists expirationTime timestamp default '1971-01-01 00:00:00.000000';
 
  set foreign_key_checks=1;