From 2d2e7a3cec6910a8b43c67369a3318be41b7599e Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Mon, 17 Apr 2017 09:37:09 +0200 Subject: [PATCH] Use explicit constraints in JDBC schema scripts Fixes gh-766 --- .../org/springframework/session/jdbc/schema-db2.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-derby.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-h2.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-hsqldb.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-mysql.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-oracle.sql | 8 ++++---- .../springframework/session/jdbc/schema-postgresql.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-sqlite.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-sqlserver.sql | 8 ++++---- .../org/springframework/session/jdbc/schema-sybase.sql | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql index 8d4237bc..a2c1ad2b 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-db2.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES BLOB, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES BLOB NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql index 8d4237bc..a2c1ad2b 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-derby.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES BLOB, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES BLOB NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql index e8fd5e0f..d3278d30 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-h2.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES LONGVARBINARY, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES LONGVARBINARY NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql index e8fd5e0f..d3278d30 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES LONGVARBINARY, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES LONGVARBINARY NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql index fedf2d0c..0739d69c 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES BLOB, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES BLOB NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ) ENGINE=InnoDB; diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql index 02ac6ea2..2444869f 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME NUMBER(19,0) NOT NULL, LAST_ACCESS_TIME NUMBER(19,0) NOT NULL, MAX_INACTIVE_INTERVAL NUMBER(10,0) NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR2(200 CHAR), - ATTRIBUTE_BYTES BLOB, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR2(200 CHAR) NOT NULL, + ATTRIBUTE_BYTES BLOB NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql index 535b6ec4..4889ec7a 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES BYTEA, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES BYTEA NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql index 76441ce5..c2590c05 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHARACTER(36), + SESSION_ID CHARACTER(36) NOT NULL, CREATION_TIME INTEGER NOT NULL, LAST_ACCESS_TIME INTEGER NOT NULL, MAX_INACTIVE_INTERVAL INTEGER NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES BLOB, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES BLOB NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql index c27f11ac..16133629 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES IMAGE, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES IMAGE NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ); diff --git a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql index 8be46bb7..1695dde6 100644 --- a/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql +++ b/spring-session/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql @@ -1,5 +1,5 @@ CREATE TABLE SPRING_SESSION ( - SESSION_ID CHAR(36), + SESSION_ID CHAR(36) NOT NULL, CREATION_TIME BIGINT NOT NULL, LAST_ACCESS_TIME BIGINT NOT NULL, MAX_INACTIVE_INTERVAL INT NOT NULL, @@ -10,9 +10,9 @@ CREATE TABLE SPRING_SESSION ( CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (LAST_ACCESS_TIME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( - SESSION_ID CHAR(36), - ATTRIBUTE_NAME VARCHAR(200), - ATTRIBUTE_BYTES IMAGE, + SESSION_ID CHAR(36) NOT NULL, + ATTRIBUTE_NAME VARCHAR(200) NOT NULL, + ATTRIBUTE_BYTES IMAGE NOT NULL, CONSTRAINT SPRING_SESSION_ATTRIBUTES_PK PRIMARY KEY (SESSION_ID, ATTRIBUTE_NAME), CONSTRAINT SPRING_SESSION_ATTRIBUTES_FK FOREIGN KEY (SESSION_ID) REFERENCES SPRING_SESSION(SESSION_ID) ON DELETE CASCADE ) LOCK DATAROWS;