From c69a8b8762a0e4108f5e92b33f93c8c6fe332170 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Wed, 27 Sep 2017 12:18:25 +0200 Subject: [PATCH] Improve JDBC data store schema scripts Closes gh-884 --- .../session/jdbc/JdbcOperationsSessionRepository.java | 3 ++- .../resources/org/springframework/session/jdbc/schema-db2.sql | 3 ++- .../org/springframework/session/jdbc/schema-derby.sql | 3 ++- .../resources/org/springframework/session/jdbc/schema-h2.sql | 3 ++- .../org/springframework/session/jdbc/schema-hsqldb.sql | 3 ++- .../org/springframework/session/jdbc/schema-mysql.sql | 3 ++- .../org/springframework/session/jdbc/schema-oracle.sql | 3 ++- .../org/springframework/session/jdbc/schema-postgresql.sql | 3 ++- .../org/springframework/session/jdbc/schema-sqlite.sql | 3 ++- .../org/springframework/session/jdbc/schema-sqlserver.sql | 3 ++- .../org/springframework/session/jdbc/schema-sybase.sql | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java index 8473dcaa..e0fe8411 100644 --- a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java +++ b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java @@ -106,8 +106,9 @@ import org.springframework.util.StringUtils; * CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) * ); * - * CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); + * CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); * CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (EXPIRY_TIME); + * CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); * * CREATE TABLE SPRING_SESSION_ATTRIBUTES ( * SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-db2.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-db2.sql index b9408671..6bc57f9c 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-db2.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-db2.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-derby.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-derby.sql index b9408671..6bc57f9c 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-derby.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-derby.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-h2.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-h2.sql index 3df06c7b..837c170b 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-h2.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-h2.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql index 3df06c7b..837c170b 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql index 136b49e9..84f35fec 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ) ENGINE=InnoDB; -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql index 774e7043..ed25ee24 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql index db508828..026a954d 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql index 2b45733d..28b0756d 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql index c0ef6b47..79cbaaaf 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ); -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL, diff --git a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql index 16f29ae8..22abfd0a 100644 --- a/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql +++ b/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql @@ -9,8 +9,9 @@ CREATE TABLE SPRING_SESSION ( CONSTRAINT SPRING_SESSION_PK PRIMARY KEY (PRIMARY_ID) ) LOCK DATAROWS; -CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); +CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID); CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME); +CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME); CREATE TABLE SPRING_SESSION_ATTRIBUTES ( SESSION_PRIMARY_ID CHAR(36) NOT NULL,