move dir & delete some useless function

client/orm/structs/clauses/const.go

@@ -0,0 +1,5 @@
+package clauses
+
+const (
+	ExprSep                = "__"
+)

client/orm/structs/clauses/order.go

@@ -0,0 +1,40 @@
+package clauses
+
+type Sort int8
+
+const (
+	ASCENDING  Sort = 1
+	DESCENDING Sort = 2
+)
+
+type Order struct {
+	column string
+	sort   Sort
+}
+
+func (o *Order) GetColumn() string {
+	return o.column
+}
+
+func (o *Order) GetSort() Sort {
+	return o.sort
+}
+
+func ParseOrder(expressions ...string) []*Order {
+	var orders []*Order
+	for _, expression := range expressions {
+		sort := ASCENDING
+		column := expression
+		if expression[0] == '-' {
+			sort = DESCENDING
+			column = expression[1:]
+		}
+
+		orders = append(orders, &Order{
+			column: column,
+			sort:   sort,
+		})
+	}
+
+	return orders
+}

client/orm/structs/order_phrase.go

@@ -1,48 +0,0 @@
-package structs
-
-import "fmt"
-
-type Sort int8
-
-const (
-	ASCENDING  Sort = 1
-	DESCENDING Sort = 2
-)
-
-type OrderClause struct {
-	Column string
-	Sort   Sort
-}
-
-var _ fmt.Stringer = new(OrderClause)
-
-func (o *OrderClause) String() string {
-	sort := ``
-	if o.Sort == ASCENDING {
-		sort = `ASC`
-	} else if o.Sort == DESCENDING {
-		sort = `DESC`
-	} else {
-		return fmt.Sprintf("%s", o.Column)
-	}
-	return fmt.Sprintf("%s %s", o.Column, sort)
-}
-
-func ParseOrderClause(expressions ...string) []*OrderClause {
-	var orders []*OrderClause
-	for _, expression := range expressions {
-		sort := ASCENDING
-		column := expression
-		if expression[0] == '-' {
-			sort = DESCENDING
-			column = expression[1:]
-		}
-
-		orders = append(orders, &OrderClause{
-			Column: column,
-			Sort:   sort,
-		})
-	}
-
-	return orders
-}