Skip to content

Commit 8d241c6

Browse files
artembilangaryrussell
authored andcommitted
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`
1 parent 8c9662a commit 8d241c6

File tree

10 files changed

+13
-21
lines changed

10 files changed

+13
-21
lines changed

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private enum Query {
9393
"(GROUP_KEY, REGION, COMPLETE, LAST_RELEASED_SEQUENCE, CREATED_DATE, UPDATED_DATE)"
9494
+ " values (?, ?, 0, 0, ?, ?)"),
9595

96-
UPDATE_MESSAGE_GROUP("UPDATE %PREFIX%MESSAGE_GROUP set UPDATED_DATE=?, \"CONDITION\"=? " +
96+
UPDATE_MESSAGE_GROUP("UPDATE %PREFIX%MESSAGE_GROUP set UPDATED_DATE=?, GROUP_CONDITION=? " +
9797
"where GROUP_KEY=? and REGION=?"),
9898

9999
REMOVE_MESSAGE_FROM_GROUP("DELETE from %PREFIX%GROUP_TO_MESSAGE where GROUP_KEY=? and MESSAGE_ID=? and " +
@@ -123,7 +123,7 @@ private enum Query {
123123
"and %PREFIX%GROUP_TO_MESSAGE.GROUP_KEY = ? " +
124124
"and m.REGION = ?)"),
125125

126-
GET_GROUP_INFO("SELECT COMPLETE, LAST_RELEASED_SEQUENCE, CREATED_DATE, UPDATED_DATE, \"CONDITION\"" +
126+
GET_GROUP_INFO("SELECT COMPLETE, LAST_RELEASED_SEQUENCE, CREATED_DATE, UPDATED_DATE, GROUP_CONDITION" +
127127
" from %PREFIX%MESSAGE_GROUP where GROUP_KEY=? and REGION=?"),
128128

129129
GET_MESSAGE("SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_BYTES from %PREFIX%MESSAGE where MESSAGE_ID=? and " +
@@ -452,7 +452,7 @@ public MessageGroupMetadata getGroupMetadata(Object groupId) {
452452
groupMetadata.setTimestamp(rs.getTimestamp("CREATED_DATE").getTime());
453453
groupMetadata.setLastModified(rs.getTimestamp("UPDATED_DATE").getTime());
454454
groupMetadata.setLastReleasedMessageSequenceNumber(rs.getInt("LAST_RELEASED_SEQUENCE"));
455-
groupMetadata.setCondition(rs.getString("CONDITION"));
455+
groupMetadata.setCondition(rs.getString("GROUP_CONDITION"));
456456
return groupMetadata;
457457
}, key, this.region);
458458
}
@@ -587,15 +587,7 @@ public Iterator<MessageGroup> iterator() {
587587
*/
588588
protected String getQuery(Query base) {
589589
return this.queryCache.computeIfAbsent(base,
590-
query -> {
591-
String parsedSql = StringUtils.replace(query.getSql(), "%PREFIX%", this.tablePrefix);
592-
if ((Query.GET_GROUP_INFO.equals(base) || Query.UPDATE_MESSAGE_GROUP.equals(base))
593-
&& this.vendorName.equals("MySQL")) {
594-
595-
parsedSql = parsedSql.replaceFirst("\"(CONDITION)\"", "`$1`");
596-
}
597-
return parsedSql;
598-
});
590+
query -> StringUtils.replace(query.getSql(), "%PREFIX%", this.tablePrefix));
599591
}
600592

601593
/**

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
"CONDITION" VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE TIMESTAMP NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
CONDITION VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE TIMESTAMP NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
CONDITION VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE TIMESTAMP NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
"CONDITION" VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE TIMESTAMP NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
`CONDITION` VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE DATETIME(6) NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY VARCHAR2(36) NOT NULL,
2020
REGION VARCHAR2(100) NOT NULL,
21-
CONDITION VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE NUMBER(19,0),
2323
LAST_RELEASED_SEQUENCE NUMBER(19,0),
2424
CREATED_DATE TIMESTAMP NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
"CONDITION" VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE TIMESTAMP NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
"CONDITION" VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE DATETIME NOT NULL,

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE INT_GROUP_TO_MESSAGE (
1818
CREATE TABLE INT_MESSAGE_GROUP (
1919
GROUP_KEY CHAR(36) NOT NULL,
2020
REGION VARCHAR(100) NOT NULL,
21-
CONDITION VARCHAR(255),
21+
GROUP_CONDITION VARCHAR(255),
2222
COMPLETE BIGINT,
2323
LAST_RELEASED_SEQUENCE BIGINT,
2424
CREATED_DATE DATETIME NOT NULL,

0 commit comments

Comments
 (0)