FAIRPC-29: fixed failing metadata request when no records found (#1478)

thehyve · Jan 31, 2024 · d0bc331 · d0bc331
1 parent acdf5d3
commit d0bc331
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/services/views/ViewStoreReader.java b/projects/saturn/src/main/java/io/fairspace/saturn/services/views/ViewStoreReader.java
@@ -412,12 +412,14 @@ private ViewRowCollection retrieveJoinTableRows(
 
         var rows = new ViewRowCollection();
 
-        try (var query = getJoinQuery(view, joinView, joinedTable, joinTable, projectionColumns, ids);
-             var result = query.executeQuery()) {
-            while (result.next()) {
-                var id = result.getString("rowid");
-                var row = buildJoinRows(joinView, projectionColumns, result);
-                rows.add(id, row);
+        if (!ids.isEmpty()) {
+            try (var query = getJoinQuery(view, joinView, joinedTable, joinTable, projectionColumns, ids);
+                 var result = query.executeQuery()) {
+                while (result.next()) {
+                    var id = result.getString("rowid");
+                    var row = buildJoinRows(joinView, projectionColumns, result);
+                    rows.add(id, row);
+                }
             }
         }