diff -r 4ec7f2600c83 -r 24a3596b8f98 src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Sat May 30 15:28:27 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGVersionDao.java Sat May 30 18:05:06 2020 +0200 @@ -46,14 +46,16 @@ public PGVersionDao(Connection connection) throws SQLException { list = connection.prepareStatement( - "select versionid, project, name, ordinal, status " + - "from lpit_version " + + "select versionid, project, p.name as projectname, v.name, ordinal, status " + + "from lpit_version v " + + "join lpit_project p on v.project = p.projectid " + "where project = ? " + - "order by ordinal desc, lower(name) desc"); + "order by ordinal desc, lower(v.name) desc"); find = connection.prepareStatement( - "select versionid, project, name, ordinal, status " + - "from lpit_version " + + "select versionid, project, p.name as projectname, v.name, ordinal, status " + + "from lpit_version v " + + "join lpit_project p on v.project = p.projectid " + "where versionid = ?"); insert = connection.prepareStatement( @@ -88,6 +90,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"), project); version.setName(result.getString("name")); version.setOrdinal(result.getInt("ordinal"));