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`

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

@@ -93,7 +93,7 @@ private enum Query {
 				"(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 @@ private enum Query {
 				"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 MessageGroupMetadata getGroupMetadata(Object groupId) {
 				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 Iterator<MessageGroup> iterator() {
 	 */
 	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));
 	}
 
 	/**

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,

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,

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,

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,

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,

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,

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,

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,

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,