diff options
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/core')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/core/db/BuildDao.java | 4 | ||||
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/core/db/PersonDao.java | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/core/db/BuildDao.java b/src/main/java/io/trygvis/esper/testing/core/db/BuildDao.java index c6a46c6..7c9ccb7 100755 --- a/src/main/java/io/trygvis/esper/testing/core/db/BuildDao.java +++ b/src/main/java/io/trygvis/esper/testing/core/db/BuildDao.java @@ -92,7 +92,7 @@ public class BuildDao { public List<BuildDto> selectBuildsByPerson(Uuid person, PageRequest page) throws SQLException { String sql = "SELECT " + BUILD + " FROM build b, build_participant bp WHERE bp.person=? AND b.uuid = bp.build"; - sql += orderBy(page.orderBy, "created_date", "timestamp"); + sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "created_date", "timestamp"); sql += " LIMIT ? OFFSET ?"; try (PreparedStatement s = c.prepareStatement(sql)) { @@ -106,7 +106,7 @@ public class BuildDao { public List<BuildDto> selectBuilds(PageRequest page) throws SQLException { String sql = "SELECT " + BUILD + " FROM build"; - sql += orderBy(page.orderBy, "created_date", "timestamp"); + sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "created_date", "timestamp"); sql += " LIMIT ? OFFSET ?"; try (PreparedStatement s = c.prepareStatement(sql)) { diff --git a/src/main/java/io/trygvis/esper/testing/core/db/PersonDao.java b/src/main/java/io/trygvis/esper/testing/core/db/PersonDao.java index 290d6d5..2cfb16d 100755 --- a/src/main/java/io/trygvis/esper/testing/core/db/PersonDao.java +++ b/src/main/java/io/trygvis/esper/testing/core/db/PersonDao.java @@ -97,14 +97,14 @@ public class PersonDao { } } - public List<PersonDto> selectPersons(PageRequest pageRequest, Option<String> query) throws SQLException { + public List<PersonDto> selectPersons(PageRequest page, Option<String> query) throws SQLException { String sql = "SELECT " + PERSON + " FROM person"; if (query.isSome()) { sql += " WHERE lower(name) LIKE '%' || ? || '%'"; } - sql += orderBy(pageRequest.orderBy, "name", "created_date"); + sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "name", "created_date"); sql += " LIMIT ? OFFSET ?"; @@ -115,8 +115,8 @@ public class PersonDao { s.setString(i++, query.some()); } - s.setInt(i++, pageRequest.count.orSome(10)); - s.setInt(i, pageRequest.startIndex.orSome(0)); + s.setInt(i++, page.count.orSome(10)); + s.setInt(i, page.startIndex.orSome(0)); return toList(s, person); } } @@ -216,7 +216,7 @@ public class PersonDao { sql += " AND level=?"; } - sql += orderBy(page.orderBy, "name", "created_date"); + sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "name", "created_date"); sql += " LIMIT ? OFFSET ?"; |