diff -r 2223bd79e0c6 -r 821c4950b619 src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Tue May 19 18:49:48 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Tue May 19 19:34:57 2020 +0200 @@ -47,22 +47,22 @@ public PGIssueDao(Connection connection) throws SQLException { list = connection.prepareStatement( - "select id, project, status, category, subject, description, " + + "select issue.id, issue.project, issue.status, issue.category, issue.subject, issue.description, " + "vplan.id, vplan.name, vdone.id, vdone.name, " + - "created, updated, eta " + - "from lpit_issue " + + "issue.created, issue.updated, issue.eta " + + "from lpit_issue issue " + "left join lpit_version vplan on vplan.id = version_plan " + "left join lpit_version vdone on vdone.id = version_done " + - "where project = ? "); + "where issue.project = ? "); find = connection.prepareStatement( - "select id, project, status, category, subject, description, " + + "select issue.id, issue.project, issue.status, issue.category, issue.subject, issue.description, " + "vplan.id, vplan.name, vdone.id, vdone.name, " + - "created, updated, eta " + - "from lpit_issue " + + "issue.created, issue.updated, issue.eta " + + "from lpit_issue issue " + "left join lpit_version vplan on vplan.id = version_plan " + "left join lpit_version vdone on vdone.id = version_done " + - "where id = ? "); + "where issue.id = ? "); insert = connection.prepareStatement( "insert into lpit_issue (project, status, category, subject, description, version_plan, version_done, eta) " + @@ -86,17 +86,17 @@ } public Issue mapColumns(ResultSet result) throws SQLException { - final var project = new Project(result.getInt("project")); - final var issue = new Issue(result.getInt("id"), project); - issue.setStatus(IssueStatus.valueOf(result.getString("status"))); - issue.setCategory(IssueCategory.valueOf(result.getString("category"))); - issue.setSubject(result.getString("subject")); - issue.setDescription(result.getString("description")); + final var project = new Project(result.getInt("issue.project")); + final var issue = new Issue(result.getInt("issue.id"), project); + issue.setStatus(IssueStatus.valueOf(result.getString("issue.status"))); + issue.setCategory(IssueCategory.valueOf(result.getString("issue.category"))); + issue.setSubject(result.getString("issue.subject")); + issue.setDescription(result.getString("issue.description")); issue.setScheduledVersion(obtainVersion(result, project, "vplan.")); issue.setResolvedVersion(obtainVersion(result, project, "vdone.")); - issue.setCreated(result.getTimestamp("created")); - issue.setUpdated(result.getTimestamp("updated")); - issue.setEta(result.getDate("eta")); + issue.setCreated(result.getTimestamp("issue.created")); + issue.setUpdated(result.getTimestamp("issue.updated")); + issue.setEta(result.getDate("issue.eta")); return issue; }