GH-8768: Fix countQuery in JdbcMetadataStore

igdianov · web-flow · commit 6db704158f01 · 2023-10-18T09:57:49.000-04:00
Fixes #8768 The `countQuery` is accidentally formatted against `putIfAbsentValueQuery`
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStore.java
@@ -174,7 +174,7 @@ public void afterPropertiesSet() {
 		this.replaceValueByKeyQuery = String.format(this.replaceValueByKeyQuery, this.tablePrefix);
 		this.removeValueQuery = String.format(this.removeValueQuery, this.tablePrefix);
 		this.putIfAbsentValueQuery = String.format(this.putIfAbsentValueQuery, this.tablePrefix, this.tablePrefix);
-		this.countQuery = String.format(this.putIfAbsentValueQuery, this.tablePrefix);
+		this.countQuery = String.format(this.countQuery, this.tablePrefix);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public void afterPropertiesSet() {`
`174`	`174`	`this.replaceValueByKeyQuery = String.format(this.replaceValueByKeyQuery, this.tablePrefix);`
`175`	`175`	`this.removeValueQuery = String.format(this.removeValueQuery, this.tablePrefix);`
`176`	`176`	`this.putIfAbsentValueQuery = String.format(this.putIfAbsentValueQuery, this.tablePrefix, this.tablePrefix);`
`177`		`- this.countQuery = String.format(this.putIfAbsentValueQuery, this.tablePrefix);`
	`177`	`+ this.countQuery = String.format(this.countQuery, this.tablePrefix);`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`/**`