diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
index 7385db5be8..b724d80ab7 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
+++ b/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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
index 7385db5be8..b724d80ab7 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
+++ b/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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
index 9e65493c8b..3c4fab897d 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
+++ b/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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
index 9e65493c8b..3c4fab897d 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
+++ b/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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql-5_6_4.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql-5_6_4.sql
index a55cdd1f38..de11f32191 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql-5_6_4.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql-5_6_4.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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
index 336768179c..472b03e699 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
+++ b/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 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 NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.sql
index 1641269a7c..d0e76474f7 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
index 036c497b3e..ae30fa08a6 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
+++ b/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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
index f51739ae08..e9db9bcb68 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
+++ b/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)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
index 327770804a..0c969ef7fb 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
+++ b/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)
diff --git a/spring-integration-jdbc/src/main/sql/schema.sql.vpp b/spring-integration-jdbc/src/main/sql/schema.sql.vpp
index 6b23674326..cb1d305ffc 100644
--- a/spring-integration-jdbc/src/main/sql/schema.sql.vpp
+++ b/spring-integration-jdbc/src/main/sql/schema.sql.vpp
@@ -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)
 )#if(${VOODOO}) ${VOODOO}#end;
 
 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  (
 )#if(${VOODOO}) ${VOODOO}#end;
 
 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)