Skip to content

Commit b16de9c

Browse files
committed
Fix job instance retrieval in JdbcJobInstanceDao
This commit reverts the accidental removal of the wildcard functionality deleted in bf53794
1 parent ae2df53 commit b16de9c

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ SELECT COUNT(*)
106106
private static final String FIND_LAST_JOBS_BY_NAME = """
107107
SELECT JOB_INSTANCE_ID, JOB_NAME
108108
FROM %PREFIX%JOB_INSTANCE
109-
WHERE JOB_NAME = ?
109+
WHERE JOB_NAME LIKE ?
110110
ORDER BY JOB_INSTANCE_ID DESC
111111
""";
112112

@@ -116,12 +116,6 @@ SELECT COUNT(*)
116116
WHERE I1.JOB_NAME = ? AND I1.JOB_INSTANCE_ID = (SELECT MAX(I2.JOB_INSTANCE_ID) FROM %PREFIX%JOB_INSTANCE I2 WHERE I2.JOB_NAME = ?)
117117
""";
118118

119-
private static final String FIND_LAST_JOBS_LIKE_NAME = """
120-
SELECT JOB_INSTANCE_ID, JOB_NAME
121-
FROM %PREFIX%JOB_INSTANCE
122-
WHERE JOB_NAME LIKE ? ORDER BY JOB_INSTANCE_ID DESC
123-
""";
124-
125119
private static final String DELETE_JOB_INSTANCE = """
126120
DELETE FROM %PREFIX%JOB_INSTANCE
127121
WHERE JOB_INSTANCE_ID = ?
@@ -236,6 +230,10 @@ public List<JobInstance> extractData(ResultSet rs) throws SQLException, DataAcce
236230

237231
};
238232

233+
if (jobName.contains(STAR_WILDCARD)) {
234+
jobName = jobName.replaceAll("\\" + STAR_WILDCARD, SQL_WILDCARD);
235+
}
236+
239237
return getJdbcTemplate().query(getQuery(FIND_LAST_JOBS_BY_NAME), extractor, jobName);
240238
}
241239

0 commit comments

Comments
 (0)