1.1 --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Sat May 30 15:28:27 2020 +0200
1.2 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Sat May 30 18:05:06 2020 +0200
1.3 @@ -46,14 +46,16 @@
1.4
1.5 public PGVersionDao(Connection connection) throws SQLException {
1.6 list = connection.prepareStatement(
1.7 - "select versionid, project, name, ordinal, status " +
1.8 - "from lpit_version " +
1.9 + "select versionid, project, p.name as projectname, v.name, ordinal, status " +
1.10 + "from lpit_version v " +
1.11 + "join lpit_project p on v.project = p.projectid " +
1.12 "where project = ? " +
1.13 - "order by ordinal desc, lower(name) desc");
1.14 + "order by ordinal desc, lower(v.name) desc");
1.15
1.16 find = connection.prepareStatement(
1.17 - "select versionid, project, name, ordinal, status " +
1.18 - "from lpit_version " +
1.19 + "select versionid, project, p.name as projectname, v.name, ordinal, status " +
1.20 + "from lpit_version v " +
1.21 + "join lpit_project p on v.project = p.projectid " +
1.22 "where versionid = ?");
1.23
1.24 insert = connection.prepareStatement(
1.25 @@ -88,6 +90,7 @@
1.26
1.27 private Version mapColumns(ResultSet result) throws SQLException {
1.28 final var project = new Project(result.getInt("project"));
1.29 + project.setName(result.getString("projectname"));
1.30 final var version = new Version(result.getInt("versionid"), project);
1.31 version.setName(result.getString("name"));
1.32 version.setOrdinal(result.getInt("ordinal"));
