1.1 --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Thu Oct 15 12:27:05 2020 +0200
1.2 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Thu Oct 15 13:31:52 2020 +0200
1.3 @@ -47,16 +47,14 @@
1.4
1.5 public PGVersionDao(Connection connection) throws SQLException {
1.6 list = connection.prepareStatement(
1.7 - "select versionid, project, p.name as projectname, v.name, ordinal, status " +
1.8 - "from lpit_version v " +
1.9 - "join lpit_project p on v.project = p.projectid " +
1.10 + "select versionid, project, name, ordinal, status " +
1.11 + "from lpit_version " +
1.12 "where project = ? " +
1.13 - "order by ordinal desc, lower(v.name) desc");
1.14 + "order by ordinal desc, lower(name) desc");
1.15
1.16 find = connection.prepareStatement(
1.17 - "select versionid, project, p.name as projectname, v.name, ordinal, status " +
1.18 - "from lpit_version v " +
1.19 - "join lpit_project p on v.project = p.projectid " +
1.20 + "select versionid, project, name, ordinal, status " +
1.21 + "from lpit_version " +
1.22 "where versionid = ?");
1.23
1.24 insert = connection.prepareStatement(
1.25 @@ -68,10 +66,7 @@
1.26 }
1.27
1.28 private Version mapColumns(ResultSet result) throws SQLException {
1.29 - final var project = new Project(result.getInt("project"));
1.30 - project.setName(result.getString("projectname"));
1.31 final var version = new Version(result.getInt("versionid"));
1.32 - version.setProject(project);
1.33 version.setName(result.getString("name"));
1.34 version.setOrdinal(result.getInt("ordinal"));
1.35 version.setStatus(VersionStatus.valueOf(result.getString("status")));
1.36 @@ -79,10 +74,9 @@
1.37 }
1.38
1.39 @Override
1.40 - public void save(Version instance) throws SQLException {
1.41 + public void save(Version instance, Project project) throws SQLException {
1.42 Objects.requireNonNull(instance.getName());
1.43 - Objects.requireNonNull(instance.getProject());
1.44 - insert.setInt(1, instance.getProject().getId());
1.45 + insert.setInt(1, project.getId());
1.46 insert.setString(2, instance.getName());
1.47 insert.setInt(3, instance.getOrdinal());
1.48 insert.setString(4, instance.getStatus().name());
1.49 @@ -106,9 +100,7 @@
1.50 List<Version> versions = new ArrayList<>();
1.51 try (var result = list.executeQuery()) {
1.52 while (result.next()) {
1.53 - final var v = mapColumns(result);
1.54 - v.setProject(project);
1.55 - versions.add(v);
1.56 + versions.add(mapColumns(result));
1.57 }
1.58 }
1.59 return versions;
