Skip to content

Commit 63684e2

Browse files
artembilangaryrussell
authored andcommitted
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
1 parent 936d63b commit 63684e2

File tree

9 files changed

+76
-94
lines changed

9 files changed

+76
-94
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE TIMESTAMP NOT NULL,
75
MESSAGE_BYTES BLOB,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
16-
REGION VARCHAR(100),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
14+
REGION VARCHAR(100) NOT NULL,
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
);
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
);
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE TIMESTAMP NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE TIMESTAMP NOT NULL,
75
MESSAGE_BYTES BLOB,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
16-
REGION VARCHAR(100),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
14+
REGION VARCHAR(100) NOT NULL,
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
);
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
);
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE TIMESTAMP NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE TIMESTAMP NOT NULL,
75
MESSAGE_BYTES LONGVARBINARY,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
16-
REGION VARCHAR(100),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
14+
REGION VARCHAR(100) NOT NULL,
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
);
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
);
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE TIMESTAMP NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE TIMESTAMP NOT NULL,
75
MESSAGE_BYTES LONGVARBINARY,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
1614
REGION VARCHAR(100),
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
);
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
);
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE TIMESTAMP NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE DATETIME(6) NOT NULL,
75
MESSAGE_BYTES BLOB,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
16-
REGION VARCHAR(100),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
14+
REGION VARCHAR(100) NOT NULL,
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
) ENGINE=InnoDB;
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
) ENGINE=InnoDB;
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE DATETIME(6) NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR2(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR2(100) NOT NULL,
64
CREATED_DATE TIMESTAMP NOT NULL,
75
MESSAGE_BYTES BLOB,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
1614
REGION VARCHAR2(100),
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
);
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR2(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR2(100) NOT NULL,
2321
MARKED NUMBER(19,0),
2422
COMPLETE NUMBER(19,0),
2523
LAST_RELEASED_SEQUENCE NUMBER(19,0),
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
);
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR2(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR2(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE TIMESTAMP NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE TIMESTAMP NOT NULL,
75
MESSAGE_BYTES BYTEA,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
1614
REGION VARCHAR(100),
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
);
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
);
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE TIMESTAMP NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE DATETIME NOT NULL,
75
MESSAGE_BYTES IMAGE,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
1614
REGION VARCHAR(100),
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
);
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
);
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE DATETIME NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
-- Autogenerated: do not edit this file
2-
31
CREATE TABLE INT_MESSAGE (
4-
MESSAGE_ID CHAR(36),
5-
REGION VARCHAR(100),
2+
MESSAGE_ID CHAR(36) NOT NULL,
3+
REGION VARCHAR(100) NOT NULL,
64
CREATED_DATE DATETIME NOT NULL,
75
MESSAGE_BYTES IMAGE,
86
constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +9,15 @@ CREATE TABLE INT_MESSAGE (
119
CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
1210

1311
CREATE TABLE INT_GROUP_TO_MESSAGE (
14-
GROUP_KEY CHAR(36),
15-
MESSAGE_ID CHAR(36),
12+
GROUP_KEY CHAR(36) NOT NULL,
13+
MESSAGE_ID CHAR(36) NOT NULL,
1614
REGION VARCHAR(100),
1715
constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
1816
) LOCK DATAROWS;
1917

2018
CREATE TABLE INT_MESSAGE_GROUP (
21-
GROUP_KEY CHAR(36),
22-
REGION VARCHAR(100),
19+
GROUP_KEY CHAR(36) NOT NULL,
20+
REGION VARCHAR(100) NOT NULL,
2321
MARKED BIGINT,
2422
COMPLETE BIGINT,
2523
LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +27,8 @@ CREATE TABLE INT_MESSAGE_GROUP (
2927
) LOCK DATAROWS;
3028

3129
CREATE TABLE INT_LOCK (
32-
LOCK_KEY CHAR(36),
33-
REGION VARCHAR(100),
30+
LOCK_KEY CHAR(36) NOT NULL,
31+
REGION VARCHAR(100) NOT NULL,
3432
CLIENT_ID CHAR(36),
3533
CREATED_DATE DATETIME NOT NULL,
3634
constraint LOCK_PK primary key (LOCK_KEY, REGION)

0 commit comments

Comments
 (0)