From afbfd905b8f5326d149ba7fdfd784af50d85e5ee Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 23 Dec 2012 12:00:04 +0100
Subject: o Storing the file file reference on the jenkins build and job.

---
 .../io/trygvis/esper/testing/jenkins/JenkinsDao.java  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java')

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 a31c6a0..8d32dbe 100644
--- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java
+++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java
@@ -20,9 +20,7 @@ public class JenkinsDao {
 
     public static final String JENKINS_SERVER = "uuid, created_date, url, enabled";
 
-    public static final String JENKINS_JOB = "uuid, created_date, server, url, job_type, display_name";
-
-    public static final String JENKINS_BUILD = "uuid, created_date, job, entry_id, url, result, number, duration, timestamp, users";
+    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";
 
@@ -67,6 +65,8 @@ public class JenkinsDao {
         return list;
     }
 
+    public static final String JENKINS_BUILD = "uuid, created_date, job, file, entry_id, url, result, number, duration, timestamp, users";
+
     public static final SqlF<ResultSet, JenkinsBuildDto> jenkinsBuild = new SqlF<ResultSet, JenkinsBuildDto>() {
         public JenkinsBuildDto apply(ResultSet rs) throws SQLException {
             int i = 1;
@@ -74,6 +74,7 @@ public class JenkinsDao {
                     UUID.fromString(rs.getString(i++)),
                     new DateTime(rs.getTimestamp(i++).getTime()),
                     UUID.fromString(rs.getString(i++)),
+                    UUID.fromString(rs.getString(i++)),
                     rs.getString(i++),
                     URI.create(rs.getString(i++)),
                     rs.getString(i++),
@@ -143,13 +144,14 @@ public class JenkinsDao {
         }
     }
 
-    public UUID insertJob(UUID server, URI url, JenkinsJobXml.JenkinsJobType type, Option<String> displayName) throws SQLException {
-        try (PreparedStatement s = c.prepareStatement("INSERT INTO jenkins_job(" + JENKINS_JOB + ") VALUES(?, ?, ?, ?, ?, ?)")) {
+    public UUID insertJob(UUID server, UUID file, URI url, JenkinsJobXml.JenkinsJobType type, Option<String> displayName) throws SQLException {
+        try (PreparedStatement s = c.prepareStatement("INSERT INTO jenkins_job(" + JENKINS_JOB + ") VALUES(?, ?, ?, ?, ?, ?, ?)")) {
             UUID uuid = UUID.randomUUID();
             int i = 1;
             s.setString(i++, uuid.toString());
             s.setTimestamp(i++, new Timestamp(currentTimeMillis()));
             s.setString(i++, server.toString());
+            s.setString(i++, file.toString());
             s.setString(i++, url.toASCIIString());
             s.setString(i++, type.name());
             s.setString(i, displayName.toNull());
@@ -167,13 +169,14 @@ public class JenkinsDao {
         }
     }
 
-    public UUID insertBuild(UUID server, String entryId, URI url, String result, int number, int duration, long timestamp, UUID[] users) throws SQLException {
-        try (PreparedStatement s = c.prepareStatement("INSERT INTO jenkins_build(" + JENKINS_BUILD + ") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
+    public UUID insertBuild(UUID job, UUID file, String entryId, URI url, String result, int number, int duration, long timestamp, UUID[] users) throws SQLException {
+        try (PreparedStatement s = c.prepareStatement("INSERT INTO jenkins_build(" + JENKINS_BUILD + ") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
             UUID uuid = UUID.randomUUID();
             int i = 1;
             s.setString(i++, uuid.toString());
             s.setTimestamp(i++, new Timestamp(currentTimeMillis()));
-            s.setString(i++, server.toString());
+            s.setString(i++, job.toString());
+            s.setString(i++, file.toString());
             s.setString(i++, entryId);
             s.setString(i++, url.toASCIIString());
             s.setString(i++, result);
-- 
cgit v1.2.3