Merge pull request #2157 from cockroachdb/pmattis/sql-order-by

Add semantic actions for ORDER BY.

sql/parser/parse_test.go

@@ -234,6 +234,10 @@ func TestParse(t *testing.T) {
 		{`SELECT FROM t WHERE a = COUNT(*)`},
 		{`SELECT (a.b) FROM t WHERE (b.c) = 2`},
 
+		{`SELECT FROM t ORDER BY a`},
+		{`SELECT FROM t ORDER BY a ASC`},
+		{`SELECT FROM t ORDER BY a DESC`},
+
 		{`SELECT FROM t HAVING a = b`},
 
 		{`SELECT FROM t UNION SELECT 1 FROM t`},
@@ -395,9 +399,6 @@ func TestParseSyntax(t *testing.T) {
 		{`SELECT e'\'\"\b\n\r\t\\' FROM t`},
 		{`SELECT '\x' FROM t`},
 		{`SELECT 1 FROM t GROUP BY a`},
-		{`SELECT 1 FROM t ORDER BY a`},
-		{`SELECT 1 FROM t ORDER BY a ASC`},
-		{`SELECT 1 FROM t ORDER BY a DESC`},
 		{`CREATE INDEX a ON b (c)`},
 		{`CREATE INDEX a ON b.c (d)`},
 		{`CREATE INDEX ON a (b)`},

sql/parser/select.go

@@ -284,20 +284,40 @@ func (node OrderBy) String() string {
 	return buf.String()
 }
 
+// Direction for ordering results.
+type Direction int
+
+// Direction values.
+const (
+	DefaultDirection Direction = iota
+	Ascending
+	Descending
+)
+
+var directionName = [...]string{
+	DefaultDirection: "",
+	Ascending:        "ASC",
+	Descending:       "DESC",
+}
+
+func (d Direction) String() string {
+	if d < 0 || d > Direction(len(directionName)-1) {
+		return fmt.Sprintf("Direction(%d)", d)
+	}
+	return directionName[d]
+}
+
 // Order represents an ordering expression.
 type Order struct {
 	Expr      Expr
-	Direction string
+	Direction Direction
 }
 
-// Order.Direction
-const (
-	astAsc  = " ASC"
-	astDesc = " DESC"
-)
-
 func (node *Order) String() string {
-	return fmt.Sprintf("%s%s", node.Expr, node.Direction)
+	if node.Direction == DefaultDirection {
+		return node.Expr.String()
+	}
+	return fmt.Sprintf("%s %s", node.Expr, node.Direction)
 }
 
 // Limit represents a LIMIT clause.