* Added missing SET keyword.

andialbrecht · andialbrecht · commit a00bf24ad555 · 2009-05-05T07:01:39.000+02:00
* IdentifierList.get_identifiers() now returns not only Identifier instances.
diff --git a/CHANGES b/CHANGES
@@ -5,6 +5,7 @@ In Development
    prefixed with @.
  * Improved parsing of identifier lists (issue2).
  * Recursive recognition of AS (issue4) and CASE.
+ * Improved support for UPDATE statements.
 
 
 Release 0.1.0
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -139,6 +139,7 @@ def group_identifier_list(tlist):
                    lambda t: t.match(T.Keyword, 'null'),
                    lambda t: t.ttype == T.Number.Integer,
                    lambda t: t.ttype == T.String.Single,
+                   lambda t: isinstance(t, Comparsion),
                    ]
     tcomma = tlist.token_next_match(idx, T.Punctuation, ',')
     start = None
diff --git a/sqlparse/filters.py b/sqlparse/filters.py
@@ -162,7 +162,8 @@ def nl(self):
 
     def _split_kwds(self, tlist):
         split_words = ('FROM', 'JOIN$', 'AND', 'OR',
-                       'GROUP', 'ORDER', 'UNION', 'VALUES')
+                       'GROUP', 'ORDER', 'UNION', 'VALUES',
+                       'SET')
         idx = 0
         token = tlist.token_next_match(idx, T.Keyword, split_words,
                                        regex=True)
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
@@ -565,6 +565,7 @@
     'LIKE': Keyword,
     'ON': Keyword,
     'IN': Keyword,
+    'SET': Keyword,
 
     'BY': Keyword,
     'GROUP': Keyword,
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -386,7 +386,8 @@ def get_identifiers(self):
 
         Whitespaces and punctuations are not included in this list.
         """
-        return [x for x in self.tokens if isinstance(x, Identifier)]
+        return [x for x in self.tokens
+                if not x.is_whitespace() and not x.match(T.Punctuation, ',')]
 
 
 class Parenthesis(TokenList):

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ def group_identifier_list(tlist):`
`139`	`139`	`lambda t: t.match(T.Keyword, 'null'),`
`140`	`140`	`lambda t: t.ttype == T.Number.Integer,`
`141`	`141`	`lambda t: t.ttype == T.String.Single,`
	`142`	`+ lambda t: isinstance(t, Comparsion),`
`142`	`143`	`]`
`143`	`144`	`tcomma = tlist.token_next_match(idx, T.Punctuation, ',')`
`144`	`145`	`start = None`