Properly group placeholders in identifier lists (fixes andialbrecht#52).

andialbrecht · andialbrecht · commit 3942d09bd0be · 2012-04-19T22:21:00.000+02:00
diff --git a/CHANGES b/CHANGES
@@ -2,9 +2,10 @@ Development
 -----------
 
 Bug Fixes
- * Avoid "stair case" effects when identifiers, functions or keywords
-   are mixed in identifier lists (issue45, issue49) and when asterisks
-   are used as operators (issue58).
+ * Avoid "stair case" effects when identifiers, functions,
+   placeholders or keywords are mixed in identifier lists (issue45,
+   issue49, issue52) and when asterisks are used as operators
+   (issue58).
  * Make keyword detection more restrict (issue47).
  * Improve handling of CASE statements (issue46).
  * Fix statement splitting when parsing recursive statements (issue57,
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -197,6 +197,7 @@ def group_identifier_list(tlist):
                    lambda t: t.match(T.Keyword, 'role'),
                    lambda t: t.ttype == T.Number.Integer,
                    lambda t: t.ttype == T.String.Single,
+                   lambda t: t.ttype == T.Name.Placeholder,
                    lambda t: isinstance(t, sql.Comparison),
                    lambda t: isinstance(t, sql.Comment),
                    ]

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ def group_identifier_list(tlist):`
`197`	`197`	`lambda t: t.match(T.Keyword, 'role'),`
`198`	`198`	`lambda t: t.ttype == T.Number.Integer,`
`199`	`199`	`lambda t: t.ttype == T.String.Single,`
	`200`	`+ lambda t: t.ttype == T.Name.Placeholder,`
`200`	`201`	`lambda t: isinstance(t, sql.Comparison),`
`201`	`202`	`lambda t: isinstance(t, sql.Comment),`
`202`	`203`	`]`