Fix missing order by clause for native queries (#3853)

Author: el-hackerino

modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/query/BaseNativeQuery.java

@@ -56,15 +56,13 @@ protected Map<String, Object> generateParameterMap() {
         parameterMap.put("needsPaging", firstResult >= 0);
         String orderBy = (String) parameterMap.get("orderBy");
         if (orderBy != null && !"".equals(orderBy)) {
-            String columns = "RES." + orderBy;
-            parameterMap.put("orderBy", columns);
-            parameterMap.put("orderByColumns", columns);
-            parameterMap.put("orderByForWindow", columns);
+            orderBy = "RES." + orderBy;
         } else {
-            parameterMap.put("orderBy", "order by RES.ID_ asc");
-            parameterMap.put("orderByForWindow", "order by RES.ID_ asc");
-            parameterMap.put("orderByColumns", "RES.ID_ asc");
+            orderBy = "RES.ID_ asc";
         }
+        parameterMap.put("orderBy", "order by " + orderBy);
+        parameterMap.put("orderByForWindow", "order by " + orderBy);
+        parameterMap.put("orderByColumns", orderBy);
 
         int firstRow = firstResult + 1;
         parameterMap.put("firstRow", firstRow);

modules/flowable-engine/src/test/java/org/flowable/engine/test/api/identity/GroupQueryTest.java

@@ -20,6 +20,7 @@
 
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.engine.impl.test.PluggableFlowableTestCase;
 import org.flowable.idm.api.Group;
 import org.flowable.idm.api.GroupQuery;
@@ -258,4 +259,27 @@ public void testNativeQuery() {
         assertThat(identityService.createNativeGroupQuery().sql(baseQuerySql + " where ID_ = #{id}").parameter("id", "admin").listPage(0, 1)).hasSize(1);
     }
 
+    @Test
+    public void testNativeQueryOrder() {
+        StringBuilder baseQueryBuilder = new StringBuilder();
+        baseQueryBuilder.append("SELECT ");
+        if (AbstractEngineConfiguration.DATABASE_TYPE_MSSQL.equals(processEngineConfiguration.getDatabaseType())) {
+            baseQueryBuilder.append("top 100 percent ");
+        }
+        baseQueryBuilder.append("* FROM ")
+                .append(IdentityTestUtil.getTableName("ACT_ID_GROUP", processEngineConfiguration))
+                .append(" order by ID_ desc");
+        String baseQuerySql = baseQueryBuilder.toString();
+
+        assertThat(identityService.createNativeGroupQuery().sql(baseQuerySql).list())
+                .extracting(Group::getId)
+                .containsExactly("muppets", "mammals", "frogs", "admin");
+
+        assertThat(identityService.createNativeGroupQuery().sql(baseQuerySql)
+                .parameter("orderBy", "ID_ desc")
+                .listPage(0, 2))
+                .extracting(Group::getId)
+                .containsExactly("muppets", "mammals");
+    }
+
 }