diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java index 05634511746..230b4decc14 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java @@ -129,7 +129,7 @@ SELECT COUNT(MESSAGE_ID) """), LIST_MESSAGES_BY_GROUP_KEY(""" - SELECT MESSAGE_ID, MESSAGE_BYTES, CREATED_DATE + SELECT MESSAGE_ID, MESSAGE_CONTENT, CREATED_DATE from %PREFIX%MESSAGE where MESSAGE_ID in (SELECT MESSAGE_ID from %PREFIX%GROUP_TO_MESSAGE where GROUP_KEY = ? and REGION = ?) and REGION = ? @@ -137,7 +137,7 @@ where MESSAGE_ID in (SELECT MESSAGE_ID from %PREFIX%GROUP_TO_MESSAGE where GROUP """), POLL_FROM_GROUP(""" - SELECT %PREFIX%MESSAGE.MESSAGE_ID, %PREFIX%MESSAGE.MESSAGE_BYTES + SELECT %PREFIX%MESSAGE.MESSAGE_ID, %PREFIX%MESSAGE.MESSAGE_CONTENT from %PREFIX%MESSAGE where %PREFIX%MESSAGE.MESSAGE_ID = ( SELECT min(m.MESSAGE_ID) @@ -159,13 +159,13 @@ SELECT min(CREATED_DATE) """), GET_MESSAGE(""" - SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_BYTES + SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_CONTENT from %PREFIX%MESSAGE where MESSAGE_ID=? and REGION=? """), GET_MESSAGE_FROM_GROUP(""" - SELECT m.MESSAGE_ID, m.CREATED_DATE, m.MESSAGE_BYTES + SELECT m.MESSAGE_ID, m.CREATED_DATE, m.MESSAGE_CONTENT from %PREFIX%MESSAGE m inner join %PREFIX%GROUP_TO_MESSAGE gm on m.MESSAGE_ID = gm.MESSAGE_ID @@ -187,7 +187,7 @@ and MESSAGE_ID not in ( """), CREATE_MESSAGE(""" - INSERT into %PREFIX%MESSAGE(MESSAGE_ID, REGION, CREATED_DATE, MESSAGE_BYTES) + INSERT into %PREFIX%MESSAGE(MESSAGE_ID, REGION, CREATED_DATE, MESSAGE_CONTENT) values (?, ?, ?, ?) """), diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java index 1c040abe5f9..1e39d4569f3 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java @@ -32,7 +32,7 @@ public interface ChannelMessageStoreQueryProvider { String SELECT_COMMON = """ - SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES + SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_CONTENT from %PREFIX%CHANNEL_MESSAGE where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region """; @@ -53,7 +53,7 @@ default String getCountAllMessagesInGroupQuery() { */ default String getMessageQuery() { return """ - SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_BYTES + SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_CONTENT from %PREFIX%CHANNEL_MESSAGE where MESSAGE_ID=? and GROUP_KEY=? and REGION=? """; @@ -87,7 +87,7 @@ default String getCreateMessageQuery() { REGION, CREATED_DATE, MESSAGE_PRIORITY, - MESSAGE_BYTES) + MESSAGE_CONTENT) values (?, ?, ?, ?, ?, ?) """; } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java index f192e312037..adb9700c9f6 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java @@ -31,7 +31,7 @@ public class H2ChannelMessageStoreQueryProvider implements ChannelMessageStoreQu @Override public String getCreateMessageQuery() { return "INSERT into %PREFIX%CHANNEL_MESSAGE(MESSAGE_ID, GROUP_KEY, REGION, CREATED_DATE, MESSAGE_PRIORITY, " + - "MESSAGE_SEQUENCE, MESSAGE_BYTES) " + + "MESSAGE_SEQUENCE, MESSAGE_CONTENT) " + "values (?, ?, ?, ?, ?, NEXT VALUE FOR %PREFIX%MESSAGE_SEQ, ?)"; } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java index f246c8af76b..8fb1b5ad044 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java @@ -36,7 +36,7 @@ public String getCreateMessageQuery() { CREATED_DATE, MESSAGE_PRIORITY, MESSAGE_SEQUENCE, - MESSAGE_BYTES) + MESSAGE_CONTENT) values (?, ?, ?, ?, ?, NEXT VALUE FOR %PREFIX%MESSAGE_SEQ, ?) """; } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java index 018e032b005..6e5a0e097d7 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java @@ -53,7 +53,7 @@ public MessageRowMapper(AllowListDeserializingConverter deserializer) { @Override public Message mapRow(ResultSet rs, int rowNum) throws SQLException { - byte[] blobAsBytes = rs.getBytes("MESSAGE_BYTES"); + byte[] blobAsBytes = rs.getBytes("MESSAGE_CONTENT"); return (Message) this.deserializer.convert(Objects.requireNonNull(blobAsBytes)); } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java index 25889196d1e..29a986bed60 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java @@ -34,7 +34,7 @@ public class OracleChannelMessageStoreQueryProvider implements ChannelMessageSto @Override public String getCreateMessageQuery() { return "INSERT into %PREFIX%CHANNEL_MESSAGE(MESSAGE_ID, GROUP_KEY, REGION, CREATED_DATE, MESSAGE_PRIORITY, " - + "MESSAGE_SEQUENCE, MESSAGE_BYTES)" + + "MESSAGE_SEQUENCE, MESSAGE_CONTENT)" + " values (?, ?, ?, ?, ?, %PREFIX%MESSAGE_SEQ.NEXTVAL, ?)"; } @@ -55,7 +55,7 @@ public String getPollFromGroupQuery() { public String getPriorityPollFromGroupExcludeIdsQuery() { return """ SELECT /*+ INDEX(%PREFIX%CHANNEL_MESSAGE %PREFIX%CHANNEL_MSG_PRIORITY_IDX) */ - %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES + %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_CONTENT from %PREFIX%CHANNEL_MESSAGE where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region @@ -68,7 +68,7 @@ public String getPriorityPollFromGroupExcludeIdsQuery() { public String getPriorityPollFromGroupQuery() { return """ SELECT /*+ INDEX(%PREFIX%CHANNEL_MESSAGE %PREFIX%CHANNEL_MSG_PRIORITY_IDX) */ - %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES + %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_CONTENT from %PREFIX%CHANNEL_MESSAGE where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java index 9a684d73b39..1766e4608f6 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java @@ -38,7 +38,7 @@ public String getPollFromGroupExcludeIdsQuery() { and %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID not in (:message_ids) order by CREATED_DATE, MESSAGE_SEQUENCE limit 1 for update skip locked) - returning MESSAGE_ID, MESSAGE_BYTES; + returning MESSAGE_ID, MESSAGE_CONTENT; """; } @@ -53,7 +53,7 @@ public String getPollFromGroupQuery() { and %PREFIX%CHANNEL_MESSAGE.REGION = :region order by CREATED_DATE, MESSAGE_SEQUENCE limit 1 for update skip locked) - returning MESSAGE_ID, MESSAGE_BYTES; + returning MESSAGE_ID, MESSAGE_CONTENT; """; } @@ -69,7 +69,7 @@ public String getPriorityPollFromGroupExcludeIdsQuery() { and %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID not in (:message_ids) order by MESSAGE_PRIORITY DESC NULLS LAST, CREATED_DATE, MESSAGE_SEQUENCE limit 1 for update skip locked) - returning MESSAGE_ID, MESSAGE_BYTES; + returning MESSAGE_ID, MESSAGE_CONTENT; """; } @@ -84,7 +84,7 @@ public String getPriorityPollFromGroupQuery() { and %PREFIX%CHANNEL_MESSAGE.REGION = :region order by MESSAGE_PRIORITY DESC NULLS LAST, CREATED_DATE, MESSAGE_SEQUENCE limit 1 for update skip locked) - returning MESSAGE_ID, MESSAGE_BYTES; + returning MESSAGE_ID, MESSAGE_CONTENT; """; } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java index 07b6d7cd258..acf1e0835c6 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java @@ -62,7 +62,7 @@ public String getCreateMessageQuery() { CREATED_DATE, MESSAGE_PRIORITY, MESSAGE_SEQUENCE, - MESSAGE_BYTES) + MESSAGE_CONTENT) values (?, ?, ?, ?, ?,(NEXT VALUE FOR %PREFIX%MESSAGE_SEQ), ?) """; } 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 b24482b0f27..cbb52ccb300 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL , - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ); 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 7250b8c971e..8715e59fc40 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ); 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 cc0147e315e..692c93fa4f8 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, - MESSAGE_BYTES LONGVARBINARY, + MESSAGE_CONTENT LONGVARBINARY, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL , - MESSAGE_BYTES LONGVARBINARY, + MESSAGE_CONTENT LONGVARBINARY, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ); 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 15689443467..9ab3333e04f 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, - MESSAGE_BYTES LONGVARBINARY, + MESSAGE_CONTENT LONGVARBINARY, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL , - MESSAGE_BYTES LONGVARBINARY, + MESSAGE_CONTENT LONGVARBINARY, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ); 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 948568d00c8..6920f840e79 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE DATETIME(6) NOT NULL, - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ) ENGINE=InnoDB; @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL AUTO_INCREMENT UNIQUE, - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ) 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 7066d4f3756..1945c597d1f 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR2(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE NUMBER(19,0) NOT NULL, MESSAGE_PRIORITY NUMBER(19,0), MESSAGE_SEQUENCE NUMBER(19,0) NOT NULL , - MESSAGE_BYTES BLOB, + MESSAGE_CONTENT BLOB, REGION VARCHAR2(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ); 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 36b835b4cab..2b4ba9bf075 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE TIMESTAMP NOT NULL, - MESSAGE_BYTES BYTEA, + MESSAGE_CONTENT BYTEA, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL DEFAULT nextval('INT_MESSAGE_SEQ'), - MESSAGE_BYTES BYTEA, + MESSAGE_CONTENT BYTEA, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ); 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 6ffdf53f7b2..ceeb0b3c599 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE DATETIME NOT NULL, - MESSAGE_BYTES IMAGE, + MESSAGE_CONTENT IMAGE, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ); @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL , - MESSAGE_BYTES IMAGE, + MESSAGE_CONTENT IMAGE, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ); 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 ce882fa6fd7..9096f08ced3 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 @@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE ( MESSAGE_ID CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, CREATED_DATE DATETIME NOT NULL, - MESSAGE_BYTES IMAGE, + MESSAGE_CONTENT IMAGE, constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION) ) LOCK DATAROWS; @@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE ( CREATED_DATE BIGINT NOT NULL, MESSAGE_PRIORITY BIGINT, MESSAGE_SEQUENCE BIGINT NOT NULL , - MESSAGE_BYTES IMAGE, + MESSAGE_CONTENT IMAGE, REGION VARCHAR(100) NOT NULL, constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE) ) LOCK DATAROWS; diff --git a/src/reference/antora/modules/ROOT/pages/whats-new.adoc b/src/reference/antora/modules/ROOT/pages/whats-new.adoc index f658e4dd0f3..ae8c0efde79 100644 --- a/src/reference/antora/modules/ROOT/pages/whats-new.adoc +++ b/src/reference/antora/modules/ROOT/pages/whats-new.adoc @@ -86,6 +86,10 @@ The xref:jdbc/dsl.adoc[] chapter provides more details. The `JdbcLock` now supports the feature of customized time-to-live for the lock status data. See xref:jdbc/lock-registry.adoc[] for more information. +The message stores now use a `MESSAGE_CONTENT` column name for serialized messages instead of `MESSAGE_BYTES` since the content might not always be stored as a byte array. +All the out-of-the-box SQL schemas have beed changed, too, to rely on the `MESSAGE_CONTENT` name for the respective column in the `INT_MESSAGE` and `INT_CHANNEL_MESSAGE` tables. +See xref:jdbc/message-store.adoc[] for more information. + [[x7.0-redis-changes]] === Redis Changes