1.1 --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Tue May 19 18:49:48 2020 +0200
1.2 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Tue May 19 19:34:57 2020 +0200
1.3 @@ -47,22 +47,22 @@
1.4
1.5 public PGIssueDao(Connection connection) throws SQLException {
1.6 list = connection.prepareStatement(
1.7 - "select id, project, status, category, subject, description, " +
1.8 + "select issue.id, issue.project, issue.status, issue.category, issue.subject, issue.description, " +
1.9 "vplan.id, vplan.name, vdone.id, vdone.name, " +
1.10 - "created, updated, eta " +
1.11 - "from lpit_issue " +
1.12 + "issue.created, issue.updated, issue.eta " +
1.13 + "from lpit_issue issue " +
1.14 "left join lpit_version vplan on vplan.id = version_plan " +
1.15 "left join lpit_version vdone on vdone.id = version_done " +
1.16 - "where project = ? ");
1.17 + "where issue.project = ? ");
1.18
1.19 find = connection.prepareStatement(
1.20 - "select id, project, status, category, subject, description, " +
1.21 + "select issue.id, issue.project, issue.status, issue.category, issue.subject, issue.description, " +
1.22 "vplan.id, vplan.name, vdone.id, vdone.name, " +
1.23 - "created, updated, eta " +
1.24 - "from lpit_issue " +
1.25 + "issue.created, issue.updated, issue.eta " +
1.26 + "from lpit_issue issue " +
1.27 "left join lpit_version vplan on vplan.id = version_plan " +
1.28 "left join lpit_version vdone on vdone.id = version_done " +
1.29 - "where id = ? ");
1.30 + "where issue.id = ? ");
1.31
1.32 insert = connection.prepareStatement(
1.33 "insert into lpit_issue (project, status, category, subject, description, version_plan, version_done, eta) " +
1.34 @@ -86,17 +86,17 @@
1.35 }
1.36
1.37 public Issue mapColumns(ResultSet result) throws SQLException {
1.38 - final var project = new Project(result.getInt("project"));
1.39 - final var issue = new Issue(result.getInt("id"), project);
1.40 - issue.setStatus(IssueStatus.valueOf(result.getString("status")));
1.41 - issue.setCategory(IssueCategory.valueOf(result.getString("category")));
1.42 - issue.setSubject(result.getString("subject"));
1.43 - issue.setDescription(result.getString("description"));
1.44 + final var project = new Project(result.getInt("issue.project"));
1.45 + final var issue = new Issue(result.getInt("issue.id"), project);
1.46 + issue.setStatus(IssueStatus.valueOf(result.getString("issue.status")));
1.47 + issue.setCategory(IssueCategory.valueOf(result.getString("issue.category")));
1.48 + issue.setSubject(result.getString("issue.subject"));
1.49 + issue.setDescription(result.getString("issue.description"));
1.50 issue.setScheduledVersion(obtainVersion(result, project, "vplan."));
1.51 issue.setResolvedVersion(obtainVersion(result, project, "vdone."));
1.52 - issue.setCreated(result.getTimestamp("created"));
1.53 - issue.setUpdated(result.getTimestamp("updated"));
1.54 - issue.setEta(result.getDate("eta"));
1.55 + issue.setCreated(result.getTimestamp("issue.created"));
1.56 + issue.setUpdated(result.getTimestamp("issue.updated"));
1.57 + issue.setEta(result.getDate("issue.eta"));
1.58 return issue;
1.59 }
1.60
