Merge branch 'main' into redshift-dialect

src/sqlfluff/dialects/dialect_tsql.py

@@ -746,9 +746,12 @@ class ProcedureDefinitionGrammar(BaseSegment):
     type = "procedure_statement"
     name = "procedure_statement"
 
-    match_grammar = OneOf(
-        Ref("StatementSegment"),
-        Ref("BeginEndSegment"),
+    match_grammar = AnyNumberOf(
+        OneOf(
+            Ref("BeginEndSegment"),
+            Ref("StatementSegment"),
+        ),
+        min_times=1,
     )
 
 

test/fixtures/dialects/tsql/stored_procedured_mixed_statements.sql

@@ -0,0 +1,17 @@
+CREATE PROC [Reporting].[PowerPlan] AS 
+
+DECLARE @DATEFUNCTION DATE = GETDATE()
+
+DROP TABLE [Reporting].[PowerPlan_BASE];
+
+
+BEGIN
+	SELECT 1
+
+	CREATE TABLE #TempTest
+	WITH (DISTRIBUTION = ROUND_ROBIN, HEAP) AS
+	(SELECT 2 AS Two,
+			3 AS Three, 
+			4 AS Four
+	)
+END

test/fixtures/dialects/tsql/stored_procedured_mixed_statements.yml

@@ -0,0 +1,90 @@
+# YML test files are auto-generated from SQL files and should not be edited by
+# hand. To help enforce this, the "hash" field in the file must match a hash
+# 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: 5a9199e249ff2e03ef14c6833eb96ea0924cd942867ba7b8fa5f128d3a0f3986
+file:
+  batch:
+    create_procedure_statement:
+    - keyword: CREATE
+    - keyword: PROC
+    - object_reference:
+      - identifier: '[Reporting]'
+      - dot: .
+      - identifier: '[PowerPlan]'
+    - keyword: AS
+    - procedure_statement:
+      - statement:
+          declare_segment:
+            keyword: DECLARE
+            parameter: '@DATEFUNCTION'
+            data_type:
+              identifier: DATE
+            comparison_operator: '='
+            function:
+              function_name:
+                function_name_identifier: GETDATE
+              bracketed:
+                start_bracket: (
+                end_bracket: )
+      - statement:
+          drop_statement:
+          - keyword: DROP
+          - keyword: TABLE
+          - table_reference:
+            - identifier: '[Reporting]'
+            - dot: .
+            - identifier: '[PowerPlan_BASE]'
+          - statement_terminator: ;
+      - begin_end_block:
+        - keyword: BEGIN
+        - statement:
+            select_statement:
+              select_clause:
+                keyword: SELECT
+                select_clause_element:
+                  literal: '1'
+        - statement:
+            create_table_as_select_statement:
+            - keyword: CREATE
+            - keyword: TABLE
+            - table_reference:
+                identifier: '#TempTest'
+            - table_distribution_index_clause:
+                keyword: WITH
+                bracketed:
+                  start_bracket: (
+                  table_distribution_clause:
+                  - keyword: DISTRIBUTION
+                  - comparison_operator: '='
+                  - keyword: ROUND_ROBIN
+                  comma: ','
+                  table_index_clause:
+                    keyword: HEAP
+                  end_bracket: )
+            - keyword: AS
+            - bracketed:
+                start_bracket: (
+                select_statement:
+                  select_clause:
+                  - keyword: SELECT
+                  - select_clause_element:
+                      literal: '2'
+                      alias_expression:
+                        keyword: AS
+                        identifier: Two
+                  - comma: ','
+                  - select_clause_element:
+                      literal: '3'
+                      alias_expression:
+                        keyword: AS
+                        identifier: Three
+                  - comma: ','
+                  - select_clause_element:
+                      literal: '4'
+                      alias_expression:
+                        keyword: AS
+                        identifier: Four
+                end_bracket: )
+        - keyword: END