Adjust MySQL Query Building for the new OrderBy and fix OrderBy test

Author: TimothyGillespie

src/main/java/org/javawebstack/orm/query/QueryOrderBy.java

@@ -1,7 +1,9 @@
 package org.javawebstack.orm.query;
 
+import org.javawebstack.orm.TableInfo;
+
 import java.util.LinkedList;
-import java.util.List;
+import java.util.stream.Collectors;
 
 public class QueryOrderBy extends LinkedList<QueryOrderByElement>{
 
@@ -25,4 +27,15 @@ public boolean add(QueryOrderByElement element) {
     private boolean willOverwrite(QueryOrderByElement element) {
         return this.stream().anyMatch(element::hasEqualColumn);
     }
+
+    @Override
+    public String toString() {
+        return toString(null);
+    }
+
+    public String toString(TableInfo info) {
+        return this.stream()
+                .map(QueryOrderByElement::toString)
+                .collect(Collectors.joining(","));
+    }
 }

src/main/java/org/javawebstack/orm/query/QueryOrderByElement.java

@@ -1,10 +1,12 @@
 package org.javawebstack.orm.query;
 
+import org.javawebstack.orm.TableInfo;
+
 import java.util.Objects;
 
 public class QueryOrderByElement {
-    private QueryColumn queryColumn;
-    private boolean desc;
+    private final QueryColumn queryColumn;
+    private final boolean desc;
 
     QueryOrderByElement(String columnName, boolean desc) {
         queryColumn = new QueryColumn(columnName);
@@ -50,4 +52,17 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(getQueryColumn(), isDesc());
     }
+
+    @Override
+    public String toString() {
+        return this.toString(null);
+    }
+
+    public String toString(TableInfo info) {
+        String stringifiedOrderBy = getQueryColumn().toString(info);
+        if (isDesc())
+            stringifiedOrderBy += " DESC";
+
+        return stringifiedOrderBy;
+    }
 }

src/main/java/org/javawebstack/orm/wrapper/builder/MySQLQueryStringBuilder.java

@@ -50,11 +50,13 @@ public SQLQueryString buildQuery(Query<?> query, boolean count) {
             sb.append(" WHERE ").append(qs.getQuery());
             parameters.addAll(qs.getParameters());
         }
-        if (query.getOrder() != null) {
-            sb.append(" ORDER BY ").append(query.getOrder().toString(repo.getInfo()));
-            if (query.isDescOrder())
-                sb.append(" DESC");
+
+        QueryOrderBy orderBy = query.getOrder();
+        if (!orderBy.isEmpty()) {
+            sb.append(" ORDER BY ")
+                .append(orderBy.toString());
         }
+
         Integer offset = query.getOffset();
         Integer limit = query.getLimit();
         if (offset != null && limit == null)

src/test/java/org/javawebstack/orm/test/querybuilding/OrderByClauseTest.java

@@ -65,8 +65,8 @@ void testMultipleOrderByClausesOfASCOrder() {
     @Test
     void testMultipleOrderByClausesOfDESCOrder() {
         Query<Datatype> query = setUpModel(Datatype.class).query()
-                .order("wrapper_integer")
-                .order("primitive_integer");
+                .order("wrapper_integer", true)
+                .order("primitive_integer", true);
 
         new QueryVerification(query)
                 .assertSectionContains("ORDER BY", "`wrapper_integer` DESC")