From 341143e294c842d700dfd3c6a6224c05d8b8b8d6 Mon Sep 17 00:00:00 2001
From: Andi Albrecht <albrecht.andi@gmail.com>
Date: Fri, 5 Apr 2013 05:46:41 +0200
Subject: Add order criterion to identifier in ORDER BY clause (fixes #89).

---
 sqlparse/engine/grouping.py | 15 +++++++++++++++
 sqlparse/keywords.py        |  4 ++--
 sqlparse/sql.py             |  7 +++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'sqlparse')

diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index 0f39dd2..d03e483 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -332,6 +332,20 @@ def group_functions(tlist):
         token = tlist.token_next_by_type(idx, T.Name)
 
 
+def group_order(tlist):
+    idx = 0
+    token = tlist.token_next_by_type(idx, T.Keyword.Order)
+    while token:
+        prev = tlist.token_prev(token)
+        if isinstance(prev, sql.Identifier):
+            ido = tlist.group_tokens(sql.Identifier,
+                                     tlist.tokens_between(prev, token))
+            idx = tlist.token_index(ido) + 1
+        else:
+            idx = tlist.token_index(token) + 1
+        token = tlist.token_next_by_type(idx, T.Keyword.Order)
+
+
 def group(tlist):
     for func in [
             group_comments,
@@ -340,6 +354,7 @@ def group(tlist):
             group_where,
             group_case,
             group_identifier,
+            group_order,
             group_typecasts,
             group_as,
             group_aliased,
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
index c11a3a6..ed741d4 100644
--- a/sqlparse/keywords.py
+++ b/sqlparse/keywords.py
@@ -17,7 +17,7 @@ KEYWORDS = {
     'ANALYZE': tokens.Keyword,
     'ANY': tokens.Keyword,
     'ARE': tokens.Keyword,
-    'ASC': tokens.Keyword,
+    'ASC': tokens.Keyword.Order,
     'ASENSITIVE': tokens.Keyword,
     'ASSERTION': tokens.Keyword,
     'ASSIGNMENT': tokens.Keyword,
@@ -124,7 +124,7 @@ KEYWORDS = {
     'DELIMITER': tokens.Keyword,
     'DELIMITERS': tokens.Keyword,
     'DEREF': tokens.Keyword,
-    'DESC': tokens.Keyword,
+    'DESC': tokens.Keyword.Order,
     'DESCRIBE': tokens.Keyword,
     'DESCRIPTOR': tokens.Keyword,
     'DESTROY': tokens.Keyword,
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 6fb99c6..7b495a9 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -495,6 +495,13 @@ class Identifier(TokenList):
             return None
         return unicode(next_)
 
+    def get_ordering(self):
+        """Returns the ordering or ``None`` as uppercase string."""
+        ordering = self.token_next_by_type(0, T.Keyword.Order)
+        if ordering is None:
+            return None
+        return ordering.value.upper()
+
 
 class IdentifierList(TokenList):
     """A list of :class:`~sqlparse.sql.Identifier`\'s."""
-- 
cgit v1.2.1