1.1 --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Sun Jun 21 11:10:30 2020 +0200 1.2 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Sun Jun 21 11:38:16 2020 +0200 1.3 @@ -44,9 +44,9 @@ 1.4 public final class PGIssueDao implements IssueDao { 1.5 1.6 private final PreparedStatement insert, update, list, listForVersion, find; 1.7 - private final PreparedStatement affectedVersions, scheduledVersions, resolvedVersions; 1.8 - private final PreparedStatement clearAffected, clearScheduled, clearResolved; 1.9 - private final PreparedStatement insertAffected, insertScheduled, insertResolved; 1.10 + private final PreparedStatement affectedVersions, resolvedVersions; 1.11 + private final PreparedStatement clearAffected, clearResolved; 1.12 + private final PreparedStatement insertAffected, insertResolved; 1.13 1.14 public PGIssueDao(Connection connection) throws SQLException { 1.15 list = connection.prepareStatement( 1.16 @@ -62,7 +62,6 @@ 1.17 listForVersion = connection.prepareStatement( 1.18 "with issue_version as ( "+ 1.19 "select issueid, versionid from lpit_issue_affected_version union "+ 1.20 - "select issueid, versionid from lpit_issue_scheduled_version union "+ 1.21 "select issueid, versionid from lpit_issue_resolved_version) "+ 1.22 "select issueid, project, p.name as projectname, status, category, subject, i.description, " + 1.23 "userid, username, givenname, lastname, mail, " + 1.24 @@ -102,15 +101,6 @@ 1.25 clearAffected = connection.prepareStatement("delete from lpit_issue_affected_version where issueid = ?"); 1.26 insertAffected = connection.prepareStatement("insert into lpit_issue_affected_version (issueid, versionid) values (?,?)"); 1.27 1.28 - scheduledVersions = connection.prepareStatement( 1.29 - "select versionid, name, status, ordinal " + 1.30 - "from lpit_version join lpit_issue_scheduled_version using (versionid) " + 1.31 - "where issueid = ? " + 1.32 - "order by ordinal, name" 1.33 - ); 1.34 - clearScheduled = connection.prepareStatement("delete from lpit_issue_scheduled_version where issueid = ?"); 1.35 - insertScheduled = connection.prepareStatement("insert into lpit_issue_scheduled_version (issueid, versionid) values (?,?)"); 1.36 - 1.37 resolvedVersions = connection.prepareStatement( 1.38 "select versionid, name, status, ordinal " + 1.39 "from lpit_version v join lpit_issue_resolved_version using (versionid) " + 1.40 @@ -161,22 +151,15 @@ 1.41 1.42 private void updateVersionLists(Issue instance) throws SQLException { 1.43 clearAffected.setInt(1, instance.getId()); 1.44 - clearScheduled.setInt(1, instance.getId()); 1.45 clearResolved.setInt(1, instance.getId()); 1.46 insertAffected.setInt(1, instance.getId()); 1.47 - insertScheduled.setInt(1, instance.getId()); 1.48 insertResolved.setInt(1, instance.getId()); 1.49 clearAffected.executeUpdate(); 1.50 - clearScheduled.executeUpdate(); 1.51 clearResolved.executeUpdate(); 1.52 for (Version v : instance.getAffectedVersions()) { 1.53 insertAffected.setInt(2, v.getId()); 1.54 insertAffected.executeUpdate(); 1.55 } 1.56 - for (Version v : instance.getScheduledVersions()) { 1.57 - insertScheduled.setInt(2, v.getId()); 1.58 - insertScheduled.executeUpdate(); 1.59 - } 1.60 for (Version v : instance.getResolvedVersions()) { 1.61 insertResolved.setInt(2, v.getId()); 1.62 insertResolved.executeUpdate(); 1.63 @@ -269,7 +252,6 @@ 1.64 public void joinVersionInformation(Issue issue) throws SQLException { 1.65 Objects.requireNonNull(issue.getProject()); 1.66 issue.setAffectedVersions(listVersions(affectedVersions, issue)); 1.67 - issue.setScheduledVersions(listVersions(scheduledVersions, issue)); 1.68 issue.setResolvedVersions(listVersions(resolvedVersions, issue)); 1.69 } 1.70 }