Handle END IF correctly when splitting statements (fixes andialbrecht#194).

andialbrecht · andialbrecht · commit 5d71c27e5194 · 2015-07-28T20:24:06.000+02:00
diff --git a/CHANGES b/CHANGES
@@ -1,7 +1,8 @@
 Development Version
 -------------------
 
-Nothing yet.
+Bug Fixes
+* Fix another splitter bug regarding DECLARE (issue194).
 
 
 Release 0.1.16 (Jul 26, 2015)
diff --git a/sqlparse/engine/filter.py b/sqlparse/engine/filter.py
@@ -51,6 +51,9 @@ def _change_splitlevel(self, ttype, value):
                 return 1
             return 0
 
+        if unified in ('END IF', 'END FOR'):
+            return -1
+
         if unified == 'END':
             # Should this respect a preceeding BEGIN?
             # In CASE ... WHEN ... END this results in a split level -1.
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
@@ -256,6 +256,19 @@ def test_issue193_splitting_function():
     splitted = sqlparse.split(sql)
     assert len(splitted) == 2
 
+def test_issue194_splitting_function():
+    sql = """CREATE FUNCTION a(x VARCHAR(20)) RETURNS VARCHAR(20)
+BEGIN
+ DECLARE y VARCHAR(20);
+ IF (1 = 1) THEN
+ SET x = y;
+ END IF;
+ RETURN x;
+END;
+SELECT * FROM a.b;"""
+    splitted = sqlparse.split(sql)
+    assert len(splitted) == 2
+
 
 def test_issue186_get_type():
     sql = "-- comment\ninsert into foo"
