Improve parsing of string literals in columns.

andialbrecht · andialbrecht · commit 25dabec66163 · 2014-01-10T17:45:51.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -4,6 +4,7 @@ Development
 Bug Fixes
 * Fix incorrect parsing of string literals containing line breaks (issue118).
 * Fix typo in keywords, add MERGE keywords (issue122, by Cristian Orellana).
+* Improve parsing of string literals in columns.
 
 Enhancements
 * Classify DML keywords (issue116, by Victor Hahn).
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -157,6 +157,7 @@ def _consume_cycle(tl, i):
             lambda y: (y.ttype in (T.String.Symbol,
                                    T.Name,
                                    T.Wildcard,
+                                   T.Literal.String.Single,
                                    T.Literal.Number.Integer,
                                    T.Literal.Number.Float)
                        or isinstance(y, (sql.Parenthesis, sql.Function)))))
diff --git a/tests/test_grouping.py b/tests/test_grouping.py
@@ -238,6 +238,12 @@ def test_identifier_with_op_trailing_ws():
     assert p.tokens[1].ttype is T.Whitespace
 
 
+def test_identifier_with_string_literals():
+    p = sqlparse.parse('foo + \'bar\'')[0]
+    assert len(p.tokens) == 1
+    assert isinstance(p.tokens[0], sql.Identifier)
+
+
 # This test seems to be wrong. It was introduced when fixing #53, but #111
 # showed that this shouldn't be an identifier at all. I'm leaving this
 # commented in the source for a while.
