A much more natural way of doing this

Author: TPeterW

README.md

@@ -31,15 +31,12 @@ Usage
 					.orderBy("pub_year", true)
 			.create();
 
-	// has to be LinkedHashMap to preserve order
-	LinkedHashMap<String, Boolean> order = new LinkedHashMap<String, Boolean>();
-	order.put("status", true);
-	order.put("author_id", false);
 	String query3 = new SQLQuery()
 			.select('*')
 			.from("manuscript")
 			.groupBy("author_id")
-			.orderBy(order)
+			.orderBy("author_id", false)
+			.orderBy("status", true)
 			.create();
 				
 	String insert1 = new SQLInsertion()

src/com/tpwang/sql/SQLQuery.java

@@ -1,11 +1,11 @@
 package com.tpwang.sql;
 
-import java.util.LinkedHashMap;
 import java.util.StringJoiner;
 
 public class SQLQuery {
 
-	protected StringBuilder builder;
+	protected StringBuilder builder = null;
+	protected StringJoiner orderJoiner = null;			// ordering
 
 	/***
 	 * Constructor
@@ -106,7 +106,9 @@ public SQLQuery where(SQLCondition condition) {
 	 * @return				query
 	 */
 	public SQLQuery orderBy(String attributeName, boolean ascending) {
-		builder.append("ORDER BY ").append(attributeName).append(ascending ? " " : " DESC ");
+		if (orderJoiner == null)
+			orderJoiner = new StringJoiner(", ");
+		orderJoiner.add(attributeName + (ascending ? "" : " DESC"));
 		return this;
 	}
 
@@ -117,21 +119,9 @@ public SQLQuery orderBy(String attributeName, boolean ascending) {
 	 * @return				query
 	 */
 	public SQLQuery orderBy(char attributeName, boolean ascending) {
-		builder.append("ORDER BY ").append(attributeName).append(ascending ? " " : " DESC ");
-		return this;
-	}
-	
-	/***
-	 * How to order
-	 * @param attributes	Selection order criteria
-	 * @return				query
-	 */
-	public SQLQuery orderBy(LinkedHashMap<String, Boolean> attributes) {
-		StringJoiner orderJoiner = new StringJoiner(", ");
-		for (String key : attributes.keySet()) {
-			orderJoiner.add(key + (attributes.get(key) ? "" : " DESC"));
-		}
-		builder.append("ORDER BY ").append(orderJoiner.toString()).append(' ');
+		if (orderJoiner == null)
+			orderJoiner = new StringJoiner(", ");
+		orderJoiner.add(attributeName + (ascending ? "" : " DESC"));;
 		return this;
 	}
 
@@ -177,7 +167,7 @@ public String create() {
 	 */
 	@Override
 	public String toString() {
-		return builder.toString().trim();
+		return builder.append(orderJoiner != null ? "ORDER BY " : "").append(orderJoiner != null ? orderJoiner.toString() : "").toString().trim();
 	}
 }
 

src/com/tpwang/sql/SQLSubQuery.java

@@ -1,6 +1,5 @@
 package com.tpwang.sql;
 
-import java.util.LinkedHashMap;
 import java.util.StringJoiner;
 
 public class SQLSubquery extends SQLQuery {
@@ -240,7 +239,6 @@ public SQLSubquery onAttribute(String tableName, String attributeName) {
 	@Override
 	public SQLSubquery orderBy(String attributeName, boolean ascending) {
 		super.orderBy(attributeName, ascending);
-		joinBuilder.append("ORDER BY ").append(attributeName).append(ascending ? " " : " DESC ");
 		return this;
 	}
 
@@ -253,23 +251,6 @@ public SQLSubquery orderBy(String attributeName, boolean ascending) {
 	@Override
 	public SQLSubquery orderBy(char attributeName, boolean ascending) {
 		super.orderBy(attributeName, ascending);
-		joinBuilder.append("ORDER BY ").append(attributeName).append(ascending ? " " : " DESC ");
-		return this;
-	}
-	
-	/***
-	 * How to order
-	 * @param attributes	Selection order criteria
-	 * @return				subquery
-	 */
-	@Override
-	public SQLSubquery orderBy(LinkedHashMap<String, Boolean> attributes) {
-		super.orderBy(attributes);
-		StringJoiner orderJoiner = new StringJoiner(", ");
-		for (String key : attributes.keySet()) {
-			orderJoiner.add(key + (attributes.get(key) ? "" : " DESC"));
-		}
-		joinBuilder.append("ORDER BY ").append(orderJoiner.toString()).append(' ');
 		return this;
 	}
 
@@ -347,7 +328,7 @@ public String create() {
 	@Override
 	public String toString() {
 		return (isJoinStmt 
-				? joinBuilder.toString()
+				? joinBuilder.append(super.orderJoiner != null ? "ORDER BY " : "").append(super.orderJoiner != null ? orderJoiner.toString() : "").toString()
 				: super.builder.toString()).trim();
 	}