Issue eclipse-ee4j#2301 - Sorting not honored with JPA and Oracle

Signed-off-by: Tomáš Kraus <[email protected]>
rfelcman · Dec 4, 2024 · 292f19b · 292f19b
1 parent 6736e5c
commit 292f19b
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...sistence.core/src/main/java/org/eclipse/persistence/platform/database/OraclePlatform.java b/...sistence.core/src/main/java/org/eclipse/persistence/platform/database/OraclePlatform.java
@@ -1030,8 +1030,16 @@ public void printSQLSelectStatement(DatabaseCall call, ExpressionSQLPrinter prin
                     printer.printString(primaryKeyFields);
                     printer.printString(FROM_ID);
                     printer.printString(queryString);
-                    printer.printString(ORDER_BY_ID);
-                    printer.printString(primaryKeyFields);
+                    if (statement.hasOrderByExpressions()) {
+                        try {
+                            statement.printSQLOrderByClause(printer);
+                        } catch (IOException exception) {
+                            throw ValidationException.fileError(exception);
+                        }
+                    } else {
+                        printer.printString(ORDER_BY_ID);
+                        printer.printString(primaryKeyFields);
+                    }
                     printer.printString(END_FROM_ID);
                     printer.printString(MAX_ROW);
                     printer.printParameter(DatabaseCall.MAXROW_FIELD);