Fix handling of semicolon when grouping assignments (fixes #359).

When grouping assignments that contain a semicolon itself, the
engine was too greedy. Assignments with semicolon were introduced
in 691c0400e5a7d8229b7dce09bf47176539add328.

3 files changed, 12 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index db33585..31d3c8e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ Bug Fixes
 * Fix parsing of MySQL table names starting with digits (issue337).
 * Fix detection of identifiers using comparisons (issue327).
 * Fix parsing of UNION ALL after WHERE (issue349).
+* Fix handling of semicolon in assignments (issue359, issue358).
 
 
 
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index 6684c13..fa87c9f 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -134,7 +134,7 @@ def group_assignment(tlist):
         return token.match(T.Assignment, ':=')
 
     def valid(token):
-        return token is not None
+        return token is not None and token.ttype not in (T.Keyword)
 
     def post(tlist, pidx, tidx, nidx):
         m_semicolon = T.Punctuation, ';'
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index cc553c2..89828f0 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -356,3 +356,13 @@ def test_issue322_concurrently_is_keyword():
     assert p.tokens[4].value == 'CONCURRENTLY'
     assert isinstance(p.tokens[6], sql.Identifier)
     assert p.tokens[6].value == 'myindex'
+
+
+@pytest.mark.parametrize('s', [
+    'SELECT @min_price:=MIN(price), @max_price:=MAX(price) FROM shop;',
+    'SELECT @min_price:=MIN(price), @max_price:=MAX(price) FROM shop',
+
+])
+def test_issue359_index_error_assignments(s):
+    sqlparse.parse(s)
+    sqlparse.format(s, strip_comments=True)