diff -r 6105ee2cceaf -r 947d0f6a6a83 src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Thu Oct 15 12:27:05 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Thu Oct 15 13:31:52 2020 +0200 @@ -47,16 +47,14 @@ public PGVersionDao(Connection connection) throws SQLException { list = connection.prepareStatement( - "select versionid, project, p.name as projectname, v.name, ordinal, status " + - "from lpit_version v " + - "join lpit_project p on v.project = p.projectid " + + "select versionid, project, name, ordinal, status " + + "from lpit_version " + "where project = ? " + - "order by ordinal desc, lower(v.name) desc"); + "order by ordinal desc, lower(name) desc"); find = connection.prepareStatement( - "select versionid, project, p.name as projectname, v.name, ordinal, status " + - "from lpit_version v " + - "join lpit_project p on v.project = p.projectid " + + "select versionid, project, name, ordinal, status " + + "from lpit_version " + "where versionid = ?"); insert = connection.prepareStatement( @@ -68,10 +66,7 @@ } private Version mapColumns(ResultSet result) throws SQLException { - final var project = new Project(result.getInt("project")); - project.setName(result.getString("projectname")); final var version = new Version(result.getInt("versionid")); - version.setProject(project); version.setName(result.getString("name")); version.setOrdinal(result.getInt("ordinal")); version.setStatus(VersionStatus.valueOf(result.getString("status"))); @@ -79,10 +74,9 @@ } @Override - public void save(Version instance) throws SQLException { + public void save(Version instance, Project project) throws SQLException { Objects.requireNonNull(instance.getName()); - Objects.requireNonNull(instance.getProject()); - insert.setInt(1, instance.getProject().getId()); + insert.setInt(1, project.getId()); insert.setString(2, instance.getName()); insert.setInt(3, instance.getOrdinal()); insert.setString(4, instance.getStatus().name()); @@ -106,9 +100,7 @@ List versions = new ArrayList<>(); try (var result = list.executeQuery()) { while (result.next()) { - final var v = mapColumns(result); - v.setProject(project); - versions.add(v); + versions.add(mapColumns(result)); } } return versions;