Skip to content

Commit 6039587

Browse files
committed
fix: handle null pagination parameters in latest event search query
Ensure proper defaults are used when pagination parameters are not provided, this helps to have a query working for all DBs especially SQL Server to avoid ``` The ORDER BY clause is invalid in views, inline functions, derived tables, subqueries, and common table expressions, unless TOP, OFFSET or FOR XML is also specified. ``` (cherry picked from commit 7fc4535)
1 parent bb1dd64 commit 6039587

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

gravitee-apim-repository/gravitee-apim-repository-jdbc/src/main/java/io/gravitee/repository/jdbc/management/JdbcEventLatestRepository.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public class JdbcEventLatestRepository extends JdbcAbstractRepository<Event> imp
7575
public List<Event> search(EventCriteria criteria, Event.EventProperties group, Long page, Long size) {
7676
log.debug("JdbcEventLatestRepository.search({})", criteriaToString(criteria));
7777

78+
var pageNumber = page != null ? page : 0;
79+
var pageSize = size != null ? size : 10;
80+
7881
final List<Object> args = new ArrayList<>();
7982
var select = """
8083
WITH PagedEvents AS (%s)
@@ -86,7 +89,7 @@ WITH PagedEvents AS (%s)
8689
LEFT JOIN %s evo ON evt.id = evo.event_id
8790
ORDER BY evt.updated_at ASC, evt.id ASC
8891
""".formatted(
89-
buildSelectIn(criteria, group, page, size, args),
92+
buildSelectIn(criteria, group, pageNumber, pageSize, args),
9093
tableName,
9194
EVENT_PROPERTIES,
9295
EVENT_ENVIRONMENTS,

0 commit comments

Comments
 (0)