diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-19 10:20:43 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-19 10:20:43 +0100 |
commit | fd953370ba0daea03c5de58aac30e097f86826c6 (patch) | |
tree | b41143ecd8e65bfeb1ceceb2500c23146ca7780e /src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java | |
parent | eb6cbd28992cec9025a8e95f8f03ae3839699e0b (diff) | |
download | esper-testing-fd953370ba0daea03c5de58aac30e097f86826c6.tar.gz esper-testing-fd953370ba0daea03c5de58aac30e097f86826c6.tar.bz2 esper-testing-fd953370ba0daea03c5de58aac30e097f86826c6.tar.xz esper-testing-fd953370ba0daea03c5de58aac30e097f86826c6.zip |
o Making sure every resource that supports paging has a default ordering.
o Fixing mis-mapped JenkinsJob.
o Better navigation in the Jenkins app, <a> links are now proper links.
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java index 781df13..d21118d 100755 --- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java +++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java @@ -22,8 +22,6 @@ public class JenkinsDao { public static final String JENKINS_SERVER = "uuid, created_date, name, url, enabled"; - public static final String JENKINS_JOB = "uuid, created_date, server, file, url, job_type, display_name"; - public static final String JENKINS_USER = "uuid, created_date, server, absolute_url"; public JenkinsDao(Connection c) { @@ -42,6 +40,8 @@ public class JenkinsDao { } }; + public static final String JENKINS_JOB = "uuid, created_date, server, file, url, job_type, display_name"; + public static final SqlF<ResultSet, JenkinsJobDto> jenkinsJob = new SqlF<ResultSet, JenkinsJobDto>() { public JenkinsJobDto apply(ResultSet rs) throws SQLException { int i = 1; @@ -51,6 +51,7 @@ public class JenkinsDao { UUID.fromString(rs.getString(i++)), UUID.fromString(rs.getString(i++)), URI.create(rs.getString(i++)), + rs.getString(i++), fromNull(rs.getString(i))); } }; @@ -172,7 +173,11 @@ public class JenkinsDao { } public List<JenkinsBuildDto> selectBuildByJob(UUID job, PageRequest page) throws SQLException { - try (PreparedStatement s = c.prepareStatement("SELECT " + JENKINS_BUILD + " FROM jenkins_build WHERE job=? ORDER BY created_date DESC LIMIT ? OFFSET ?")) { + String sql = "SELECT " + JENKINS_BUILD + " FROM jenkins_build WHERE job=?"; + sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "created_date", "timestamp"); + sql += " LIMIT ? OFFSET ?"; + + try (PreparedStatement s = c.prepareStatement(sql)) { int i = 1; s.setString(i++, job.toString()); s.setInt(i++, page.count.orSome(10)); |