Grouping of function/procedure calls.

2 files changed, 31 insertions, 0 deletions

diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index 471116e..66f4df5 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -245,8 +245,25 @@ def group_typecasts(tlist):
     _group_left_right(tlist, T.Punctuation, '::', Identifier)
 
 
+def group_functions(tlist):
+    [group_functions(sgroup) for sgroup in tlist.get_sublists()
+     if not isinstance(sgroup, Function)]
+    idx = 0
+    token = tlist.token_next_by_type(idx, T.Name)
+    while token:
+        next_ = tlist.token_next(token)
+        if not isinstance(next_, Parenthesis):
+            idx = tlist.token_index(token)+1
+        else:
+            func = tlist.group_tokens(Function,
+                                      tlist.tokens_between(token, next_))
+            idx = tlist.token_index(func)+1
+        token = tlist.token_next_by_type(idx, T.Name)
+
+
 def group(tlist):
     for func in [group_parenthesis,
+                 group_functions,
                  group_comments,
                  group_where,
                  group_case,
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 7c607c4..4502fa2 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -455,3 +455,17 @@ class Case(TokenList):
             elif in_value:
                 ret[-1][1].append(token)
         return ret
+
+
+class Function(TokenList):
+    """A function or procedure call."""
+
+    __slots__ = ('value', 'ttype', 'tokens')
+
+    def get_parameters(self):
+        """Return a list of parameters."""
+        parenthesis = self.tokens[-1]
+        for t in parenthesis.tokens:
+            if isinstance(t, IdentifierList):
+                return t.get_identifiers()
+        return []