From 8a3ac48cc353dfe3a55d57b3359ffcf7648ff839 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Wed, 16 Jan 2019 09:27:42 -0500 Subject: [PATCH] Updated all task_lock tables to add NOT NULL to primary keys. resolves #505 --- spring-cloud-task-batch/src/test/resources/schema-h2.sql | 4 ++-- .../resources/org/springframework/cloud/task/schema-h2.sql | 4 ++-- .../org/springframework/cloud/task/schema-hsqldb.sql | 4 ++-- .../resources/org/springframework/cloud/task/schema-mysql.sql | 4 ++-- .../org/springframework/cloud/task/schema-oracle10g.sql | 4 ++-- .../org/springframework/cloud/task/schema-postgresql.sql | 4 ++-- .../org/springframework/cloud/task/schema-sqlserver.sql | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-cloud-task-batch/src/test/resources/schema-h2.sql b/spring-cloud-task-batch/src/test/resources/schema-h2.sql index 80c9ba3a..2c859064 100644 --- a/spring-cloud-task-batch/src/test/resources/schema-h2.sql +++ b/spring-cloud-task-batch/src/test/resources/schema-h2.sql @@ -29,8 +29,8 @@ CREATE TABLE FOO_TASK_BATCH ( CREATE SEQUENCE FOO_SEQ ; CREATE TABLE FOO_LOCK ( - LOCK_KEY CHAR(36), - REGION VARCHAR(100), + LOCK_KEY CHAR(36) NOT NULL, + REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, constraint LOCK_PK primary key (LOCK_KEY, REGION) diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql index d2fad98d..97219122 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql @@ -29,8 +29,8 @@ CREATE TABLE TASK_TASK_BATCH ( CREATE SEQUENCE TASK_SEQ ; CREATE TABLE TASK_LOCK ( - LOCK_KEY CHAR(36), - REGION VARCHAR(100), + LOCK_KEY CHAR(36) NOT NULL, + REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, constraint LOCK_PK primary key (LOCK_KEY, REGION) diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql index 554f8faa..2a2e66f6 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql @@ -31,8 +31,8 @@ CREATE TABLE TASK_SEQ ( ); CREATE TABLE TASK_LOCK ( - LOCK_KEY CHAR(36), - REGION VARCHAR(100), + LOCK_KEY CHAR(36) NOT NULL, + REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, constraint LOCK_PK primary key (LOCK_KEY, REGION) diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql index f2734d7e..8af197d9 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql @@ -35,8 +35,8 @@ CREATE TABLE TASK_SEQ ( INSERT INTO TASK_SEQ (ID, UNIQUE_KEY) select * from (select 0 as ID, '0' as UNIQUE_KEY) as tmp; CREATE TABLE TASK_LOCK ( - LOCK_KEY CHAR(36), - REGION VARCHAR(100), + LOCK_KEY CHAR(36) NOT NULL, + REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE DATETIME(6) NOT NULL, constraint LOCK_PK primary key (LOCK_KEY, REGION) diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql index 91a72903..4b4e95b0 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql @@ -29,8 +29,8 @@ CREATE TABLE TASK_TASK_BATCH ( CREATE SEQUENCE TASK_SEQ START WITH 0 MINVALUE 0 MAXVALUE 9223372036854775807 NOCACHE NOCYCLE; CREATE TABLE TASK_LOCK ( - LOCK_KEY CHAR(36), - REGION VARCHAR2(100), + LOCK_KEY CHAR(36) NOT NULL, + REGION VARCHAR2(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, constraint LOCK_PK primary key (LOCK_KEY, REGION) diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql index fde999d4..6d82ec93 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql @@ -29,8 +29,8 @@ CREATE TABLE TASK_TASK_BATCH ( CREATE SEQUENCE TASK_SEQ MAXVALUE 9223372036854775807 NO CYCLE; CREATE TABLE TASK_LOCK ( - LOCK_KEY CHAR(36), - REGION VARCHAR(100), + LOCK_KEY CHAR(36) NOT NULL, + REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, constraint LOCK_PK primary key (LOCK_KEY, REGION) diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-sqlserver.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-sqlserver.sql index e055c203..34f162c7 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-sqlserver.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-sqlserver.sql @@ -28,8 +28,8 @@ CREATE TABLE TASK_TASK_BATCH ( CREATE TABLE TASK_SEQ (ID BIGINT IDENTITY); CREATE TABLE TASK_LOCK ( - LOCK_KEY CHAR(36), - REGION VARCHAR(100), + LOCK_KEY CHAR(36) NOT NULL, + REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE DATETIME NOT NULL, constraint LOCK_PK primary key (LOCK_KEY, REGION)