Merge branch 'main' into bhart-issue_1437_robust_jinja_raw_templated_…

…slice_mapping
sqlfluff · Oct 16, 2021 · 7ad47e2 · 7ad47e2
2 parents 31ea23e + 3970297
commit 7ad47e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/sqlfluff/dialects/dialect_tsql.py b/src/sqlfluff/dialects/dialect_tsql.py
@@ -1366,6 +1366,7 @@ class BeginEndSegment(BaseSegment):
         ),
         Dedent,
         "END",
+        Ref("DelimiterSegment", optional=True),
     )
 
 

diff --git a/test/fixtures/dialects/tsql/begin_end_nested.sql b/test/fixtures/dialects/tsql/begin_end_nested.sql
@@ -2,4 +2,4 @@ BEGIN
 	BEGIN
 		SELECT 'Weekend';
 	END
-END
+END;
diff --git a/test/fixtures/dialects/tsql/begin_end_nested.yml b/test/fixtures/dialects/tsql/begin_end_nested.yml
@@ -3,7 +3,7 @@
 # computed by SQLFluff when running the tests. Please run
 # `python test/generate_parse_fixture_yml.py`  to generate them after adding or
 # altering SQL files.
-_hash: 058daccf2c3f7800ef29a6e721f237159c6531c6d000ddea4f6432544b243e1a
+_hash: 0748e253db12e68d0d511436fac2128db13dfcce37347fc820ceb0872fa32ffe
 file:
   batch:
     begin_end_block:
@@ -19,3 +19,4 @@ file:
             statement_terminator: ;
       - keyword: END
     - keyword: END
+    - statement_terminator: ;