Merge pull request #16 from 2023-2-Design-Pattern/lsj/orderbyASC_DESC

feat: asc, desc 키워드 추가, 내림차순 구현
2023-2-Design-Pattern · Nov 19, 2023 · 18461c7 · 18461c7
2 parents d155679 + 5e7a741
commit 18461c7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/com/holub/database/ConcreteTable.java b/src/com/holub/database/ConcreteTable.java
@@ -601,7 +601,7 @@ public Table select(Selector where, Collection requestedColumns, Collection othe
 			resultTable = distinct(resultTable);
 		}
 		if(queryOptions.isOrderBy()) {
-			resultTable = orderBy(resultTable, queryOptions.getOrderByColumns());
+			resultTable = orderBy(resultTable, queryOptions.getOrderByColumns(), queryOptions.isOrderByASC());
 		}
 
 		return new UnmodifiableTable(resultTable);
@@ -639,7 +639,7 @@ private Table distinct(Table table) {
 		return resultTable;
 	}
 
-	private Table orderBy(Table table, List orderByColumns) {
+	private Table orderBy(Table table, List orderByColumns, boolean ascending) {
 		ArrayList<String> cols = new ArrayList<>();
 		for(int i = 0; i < table.rows().columnCount(); i++) {
 			cols.add(table.rows().columnName(i));
@@ -669,6 +669,9 @@ private Table orderBy(Table table, List orderByColumns) {
 				Comparable<Object> value1 = (Comparable<Object>) o1[index];
 				Comparable<Object> value2 = (Comparable<Object>) o2[index];
 				int result = value1.compareTo(value2);
+				if (!ascending) {
+					result = -result;
+				}
 				if (result != 0) {
 					return result;
 				}

diff --git a/src/com/holub/database/Database.java b/src/com/holub/database/Database.java
@@ -417,6 +417,8 @@ public boolean	containsValue(Object v)
 		//additional token
 		DISTINCT	= tokens.create( "'DISTINCT" ),
 		ORDER_BY	= tokens.create( "'ORDER BY" ),
+		ASC			= tokens.create( "'ASC" ),
+		DESC		= tokens.create( "'DESC" ),
 
 		IDENTIFIER	= tokens.create( "[a-zA-Z_0-9/\\\\:~]+"		); //{=Database.lastToken}
 
@@ -823,6 +825,14 @@ else if( in.matchAdvance(SELECT) != null )
 			{
 				queryOptions.setOrderBy();
 				queryOptions.setOrderByColumns(idList());
+
+				if ( in.matchAdvance(DESC) != null ) {
+					queryOptions.setOrderByASC(false);
+				} else if ( in.matchAdvance(ASC) != null ) {
+					queryOptions.setOrderByASC(true);
+				} else {
+					queryOptions.setOrderByASC(true);
+				}
 			}
 
 			Table result = doSelect(columns, into,

diff --git a/src/com/holub/database/QueryOptions.java b/src/com/holub/database/QueryOptions.java
@@ -7,6 +7,7 @@ public class QueryOptions {
     private boolean orderBy = false;
 
     private List orderByColumns;
+    private boolean orderByASC = false;
 
     public QueryOptions() {
     }
@@ -34,4 +35,12 @@ public List getOrderByColumns() {
     public void setOrderByColumns(List orderByColumns) {
         this.orderByColumns = orderByColumns;
     }
+
+    public boolean isOrderByASC() {
+        return orderByASC;
+    }
+
+    public void setOrderByASC(boolean bool) {
+        this.orderByASC = bool;
+    }
 }