diff -r 501addad452b -r 1438e5a22c55 src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Sun Jun 21 11:10:30 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Sun Jun 21 11:38:16 2020 +0200 @@ -44,9 +44,9 @@ public final class PGIssueDao implements IssueDao { private final PreparedStatement insert, update, list, listForVersion, find; - private final PreparedStatement affectedVersions, scheduledVersions, resolvedVersions; - private final PreparedStatement clearAffected, clearScheduled, clearResolved; - private final PreparedStatement insertAffected, insertScheduled, insertResolved; + private final PreparedStatement affectedVersions, resolvedVersions; + private final PreparedStatement clearAffected, clearResolved; + private final PreparedStatement insertAffected, insertResolved; public PGIssueDao(Connection connection) throws SQLException { list = connection.prepareStatement( @@ -62,7 +62,6 @@ listForVersion = connection.prepareStatement( "with issue_version as ( "+ "select issueid, versionid from lpit_issue_affected_version union "+ - "select issueid, versionid from lpit_issue_scheduled_version union "+ "select issueid, versionid from lpit_issue_resolved_version) "+ "select issueid, project, p.name as projectname, status, category, subject, i.description, " + "userid, username, givenname, lastname, mail, " + @@ -102,15 +101,6 @@ clearAffected = connection.prepareStatement("delete from lpit_issue_affected_version where issueid = ?"); insertAffected = connection.prepareStatement("insert into lpit_issue_affected_version (issueid, versionid) values (?,?)"); - scheduledVersions = connection.prepareStatement( - "select versionid, name, status, ordinal " + - "from lpit_version join lpit_issue_scheduled_version using (versionid) " + - "where issueid = ? " + - "order by ordinal, name" - ); - clearScheduled = connection.prepareStatement("delete from lpit_issue_scheduled_version where issueid = ?"); - insertScheduled = connection.prepareStatement("insert into lpit_issue_scheduled_version (issueid, versionid) values (?,?)"); - resolvedVersions = connection.prepareStatement( "select versionid, name, status, ordinal " + "from lpit_version v join lpit_issue_resolved_version using (versionid) " + @@ -161,22 +151,15 @@ private void updateVersionLists(Issue instance) throws SQLException { clearAffected.setInt(1, instance.getId()); - clearScheduled.setInt(1, instance.getId()); clearResolved.setInt(1, instance.getId()); insertAffected.setInt(1, instance.getId()); - insertScheduled.setInt(1, instance.getId()); insertResolved.setInt(1, instance.getId()); clearAffected.executeUpdate(); - clearScheduled.executeUpdate(); clearResolved.executeUpdate(); for (Version v : instance.getAffectedVersions()) { insertAffected.setInt(2, v.getId()); insertAffected.executeUpdate(); } - for (Version v : instance.getScheduledVersions()) { - insertScheduled.setInt(2, v.getId()); - insertScheduled.executeUpdate(); - } for (Version v : instance.getResolvedVersions()) { insertResolved.setInt(2, v.getId()); insertResolved.executeUpdate(); @@ -269,7 +252,6 @@ public void joinVersionInformation(Issue issue) throws SQLException { Objects.requireNonNull(issue.getProject()); issue.setAffectedVersions(listVersions(affectedVersions, issue)); - issue.setScheduledVersions(listVersions(scheduledVersions, issue)); issue.setResolvedVersions(listVersions(resolvedVersions, issue)); } }