From 4db71d751aeeb950271fd245071ae075bbfef581 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 19 Aug 2019 11:32:58 -0400 Subject: [PATCH] GH-3035: Include INT_ prefix into PK constraints Fixes https://github.com/spring-projects/spring-integration/issues/3035 To avoid names collision for primary key indexes on the target schemas include an `INT_` prefix to names for the PKs in Spring Integration SQL scripts. Also fix the Docs for mentioned PKs --- .../springframework/integration/jdbc/schema-db2.sql | 10 +++++----- .../springframework/integration/jdbc/schema-derby.sql | 10 +++++----- .../org/springframework/integration/jdbc/schema-h2.sql | 10 +++++----- .../springframework/integration/jdbc/schema-hsqldb.sql | 10 +++++----- .../springframework/integration/jdbc/schema-mysql.sql | 10 +++++----- .../springframework/integration/jdbc/schema-oracle.sql | 10 +++++----- .../integration/jdbc/schema-postgresql.sql | 10 +++++----- .../integration/jdbc/schema-sqlserver.sql | 10 +++++----- .../springframework/integration/jdbc/schema-sybase.sql | 10 +++++----- src/reference/asciidoc/jdbc.adoc | 4 ++-- 10 files changed, 47 insertions(+), 47 deletions(-) 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 0645673325..ced3a7373f 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, MESSAGE_BYTES BLOB, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( 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) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ); CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, UPDATED_DATE TIMESTAMP DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ); CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); CREATE SEQUENCE INT_MESSAGE_SEQ START WITH 1 INCREMENT BY 1 NO CACHE NO CYCLE; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_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 a405e27911..b8e51d5045 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, MESSAGE_BYTES BLOB, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( 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) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ); CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, UPDATED_DATE TIMESTAMP DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ); CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_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 92ad066406..d0d7c265bb 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, MESSAGE_BYTES LONGVARBINARY, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( 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) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ); CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, UPDATED_DATE TIMESTAMP DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ); CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); CREATE SEQUENCE INT_MESSAGE_SEQ START WITH 1 INCREMENT BY 1; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_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 6df88261f7..ce75dea9ef 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, MESSAGE_BYTES LONGVARBINARY, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( GROUP_KEY CHAR(36) NOT NULL, MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100), - constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ); CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, UPDATED_DATE TIMESTAMP DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ); CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); CREATE SEQUENCE INT_MESSAGE_SEQ AS BIGINT START WITH 1 INCREMENT BY 1; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_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 d3a27fadf5..a46f6237bd 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE DATETIME(6) NOT NULL, MESSAGE_BYTES BLOB, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ) ENGINE=InnoDB; CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( 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) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ) ENGINE=InnoDB; CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE DATETIME(6) NOT NULL, UPDATED_DATE DATETIME(6) DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ) ENGINE=InnoDB; CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE DATETIME(6) NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ) ENGINE=InnoDB; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_KEY, REGION) ) ENGINE=InnoDB; diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql index e309ea21bd..1c5910e4bd 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR2(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, MESSAGE_BYTES BLOB, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( GROUP_KEY CHAR(36) NOT NULL, MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR2(100), - constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ); CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE NUMBER(19,0), CREATED_DATE TIMESTAMP NOT NULL, UPDATED_DATE TIMESTAMP DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ); CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR2(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); CREATE SEQUENCE INT_MESSAGE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE NOCYCLE; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR2(255) NOT NULL, METADATA_VALUE VARCHAR2(4000), REGION VARCHAR2(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_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 d29891f86b..8d09838086 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, MESSAGE_BYTES BYTEA, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( GROUP_KEY CHAR(36) NOT NULL, MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100), - constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ); CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, UPDATED_DATE TIMESTAMP DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ); CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); CREATE SEQUENCE INT_MESSAGE_SEQ START WITH 1 INCREMENT BY 1 NO CYCLE; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_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 6adb0c3127..a3743df292 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE DATETIME NOT NULL, MESSAGE_BYTES IMAGE, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( GROUP_KEY CHAR(36) NOT NULL, MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100), - constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ); CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE DATETIME NOT NULL, UPDATED_DATE DATETIME DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ); CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE DATETIME NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); CREATE SEQUENCE INT_MESSAGE_SEQ START WITH 1 INCREMENT BY 1 NO CACHE NO CYCLE; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_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 76df4f23dc..4e625f9433 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 @@ -3,7 +3,7 @@ CREATE TABLE INT_MESSAGE ( REGION VARCHAR(100) NOT NULL, CREATED_DATE DATETIME NOT NULL, MESSAGE_BYTES IMAGE, - constraint MESSAGE_PK primary key (MESSAGE_ID, REGION) + constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ) LOCK DATAROWS; CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE); @@ -12,7 +12,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( GROUP_KEY CHAR(36) NOT NULL, MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100), - constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) + constraint INT_GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION) ) LOCK DATAROWS; CREATE TABLE INT_MESSAGE_GROUP ( @@ -23,7 +23,7 @@ CREATE TABLE INT_MESSAGE_GROUP ( LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE DATETIME NOT NULL, UPDATED_DATE DATETIME DEFAULT NULL, - constraint MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) + constraint INT_MESSAGE_GROUP_PK primary key (GROUP_KEY, REGION) ) LOCK DATAROWS; CREATE TABLE INT_LOCK ( @@ -31,7 +31,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100) NOT NULL, CLIENT_ID CHAR(36), CREATED_DATE DATETIME NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ) LOCK DATAROWS; CREATE SEQUENCE INT_MESSAGE_SEQ START WITH 1 INCREMENT BY 1 NO CACHE NO CYCLE; @@ -56,5 +56,5 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_KEY, REGION) ) LOCK DATAROWS; diff --git a/src/reference/asciidoc/jdbc.adoc b/src/reference/asciidoc/jdbc.adoc index e5a8b38793..ad15350f7a 100644 --- a/src/reference/asciidoc/jdbc.adoc +++ b/src/reference/asciidoc/jdbc.adoc @@ -1072,7 +1072,7 @@ CREATE TABLE INT_LOCK ( REGION VARCHAR(100), CLIENT_ID CHAR(36), CREATED_DATE TIMESTAMP NOT NULL, - constraint LOCK_PK primary key (LOCK_KEY, REGION) + constraint INT_LOCK_PK primary key (LOCK_KEY, REGION) ); ---- ==== @@ -1125,7 +1125,7 @@ CREATE TABLE INT_METADATA_STORE ( METADATA_KEY VARCHAR(255) NOT NULL, METADATA_VALUE VARCHAR(4000), REGION VARCHAR(100) NOT NULL, - constraint METADATA_STORE primary key (METADATA_KEY, REGION) + constraint INT_METADATA_STORE_PK primary key (METADATA_KEY, REGION) ); ---- ====