INT-4574: JDBC: Add NOT NULL for primary keys (#2698)

* INT-4574: JDBC: Add NOT NULL for primary keys

JIRA: https://jira.spring.io/browse/INT-4574

Some RDBMS don't allow have nullable columns for primary keys

* Add NOT NULL for all the columns involved in primary keys

**Cherry-pick to 4.3.x**

* * Include index generation into the `schema.sql.vpp`

* * Remove redundant blank line from generated scripts

* * Fix INT_CHANNEL_MESSAGE primary generation

Author: artembilan

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES LONGVARBINARY,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES LONGVARBINARY,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE DATETIME(6) NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 ) ENGINE=InnoDB;
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 ) ENGINE=InnoDB;
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR2(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR2(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR2(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR2(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR2(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR2(100) NOT NULL,
 	MARKED NUMBER(19,0),
 	COMPLETE NUMBER(19,0),
 	LAST_RELEASED_SEQUENCE NUMBER(19,0),
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BYTEA,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE DATETIME NOT NULL,
 	MESSAGE_BYTES IMAGE,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_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)

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql

@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE DATETIME NOT NULL,
 	MESSAGE_BYTES IMAGE,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 ) LOCK DATAROWS;
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 ) LOCK DATAROWS;
 
 CREATE TABLE INT_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)