From 8d241c60d293f541e226dec3c5b5502c4905d964 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 2 Sep 2022 16:28:15 -0400 Subject: [PATCH] Rename CONDITION column to GROUP_CONDITION The `CONDITION` word is reserved one in some RDBMS vendors * Rename the `CONDITION` column to `GROUP_CONDITION` to avoid possible failures and get rid of the conditional code on the `JdbcMessageStore` --- .../integration/jdbc/store/JdbcMessageStore.java | 16 ++++------------ .../integration/jdbc/schema-db2.sql | 2 +- .../integration/jdbc/schema-derby.sql | 2 +- .../integration/jdbc/schema-h2.sql | 2 +- .../integration/jdbc/schema-hsqldb.sql | 2 +- .../integration/jdbc/schema-mysql.sql | 2 +- .../integration/jdbc/schema-oracle.sql | 2 +- .../integration/jdbc/schema-postgresql.sql | 2 +- .../integration/jdbc/schema-sqlserver.sql | 2 +- .../integration/jdbc/schema-sybase.sql | 2 +- 10 files changed, 13 insertions(+), 21 deletions(-) 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 a8694ae238..10c04fbb42 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 @@ -93,7 +93,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa "(GROUP_KEY, REGION, COMPLETE, LAST_RELEASED_SEQUENCE, CREATED_DATE, UPDATED_DATE)" + " values (?, ?, 0, 0, ?, ?)"), - UPDATE_MESSAGE_GROUP("UPDATE %PREFIX%MESSAGE_GROUP set UPDATED_DATE=?, \"CONDITION\"=? " + + UPDATE_MESSAGE_GROUP("UPDATE %PREFIX%MESSAGE_GROUP set UPDATED_DATE=?, GROUP_CONDITION=? " + "where GROUP_KEY=? and REGION=?"), REMOVE_MESSAGE_FROM_GROUP("DELETE from %PREFIX%GROUP_TO_MESSAGE where GROUP_KEY=? and MESSAGE_ID=? and " + @@ -123,7 +123,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa "and %PREFIX%GROUP_TO_MESSAGE.GROUP_KEY = ? " + "and m.REGION = ?)"), - GET_GROUP_INFO("SELECT COMPLETE, LAST_RELEASED_SEQUENCE, CREATED_DATE, UPDATED_DATE, \"CONDITION\"" + + GET_GROUP_INFO("SELECT COMPLETE, LAST_RELEASED_SEQUENCE, CREATED_DATE, UPDATED_DATE, GROUP_CONDITION" + " from %PREFIX%MESSAGE_GROUP where GROUP_KEY=? and REGION=?"), GET_MESSAGE("SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_BYTES from %PREFIX%MESSAGE where MESSAGE_ID=? and " + @@ -452,7 +452,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa groupMetadata.setTimestamp(rs.getTimestamp("CREATED_DATE").getTime()); groupMetadata.setLastModified(rs.getTimestamp("UPDATED_DATE").getTime()); groupMetadata.setLastReleasedMessageSequenceNumber(rs.getInt("LAST_RELEASED_SEQUENCE")); - groupMetadata.setCondition(rs.getString("CONDITION")); + groupMetadata.setCondition(rs.getString("GROUP_CONDITION")); return groupMetadata; }, key, this.region); } @@ -587,15 +587,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa */ protected String getQuery(Query base) { return this.queryCache.computeIfAbsent(base, - query -> { - String parsedSql = StringUtils.replace(query.getSql(), "%PREFIX%", this.tablePrefix); - if ((Query.GET_GROUP_INFO.equals(base) || Query.UPDATE_MESSAGE_GROUP.equals(base)) - && this.vendorName.equals("MySQL")) { - - parsedSql = parsedSql.replaceFirst("\"(CONDITION)\"", "`$1`"); - } - return parsedSql; - }); + query -> StringUtils.replace(query.getSql(), "%PREFIX%", this.tablePrefix)); } /** 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 361f3b423a..82dcc72730 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - "CONDITION" VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, 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 eda5a5e374..7914556a41 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - CONDITION VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, 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 0bdbd57f39..1751ab4cbc 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - CONDITION VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, 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 441d923c80..22592c1a87 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - "CONDITION" VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, 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 de9e2f1c00..655688a891 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - `CONDITION` VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE DATETIME(6) NOT NULL, 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 1cfdd2856d..e465da9993 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY VARCHAR2(36) NOT NULL, REGION VARCHAR2(100) NOT NULL, - CONDITION VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE NUMBER(19,0), LAST_RELEASED_SEQUENCE NUMBER(19,0), CREATED_DATE TIMESTAMP NOT NULL, 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 2bc1ba3f46..25fd2c44be 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - "CONDITION" VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE TIMESTAMP NOT NULL, 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 0e6906dd1b..6c1c091ef9 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - "CONDITION" VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE DATETIME NOT NULL, 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 63506a3ede..7aa8938877 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 @@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE ( CREATE TABLE INT_MESSAGE_GROUP ( GROUP_KEY CHAR(36) NOT NULL, REGION VARCHAR(100) NOT NULL, - CONDITION VARCHAR(255), + GROUP_CONDITION VARCHAR(255), COMPLETE BIGINT, LAST_RELEASED_SEQUENCE BIGINT, CREATED_DATE DATETIME NOT NULL,