Merge branch 'master' into dmateusp/sqlfluff#902/support_use

CHANGELOG.md

@@ -6,13 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+
+### Changed
+
+## [0.5.2] - 2021-04-11
 ### Changed
 - Fix false positive in L045 when CTE used in WHERE clause ([#944](https://github.com/sqlfluff/sqlfluff/issues/944))
 - Logging and readout now includes more detail and a notification of dbt compilation.
 - Fix bug in L048 which flagged adjoining commas as failures.
 - Fix bug in L019 with inline comments.
 - Fix bug in L036 with multiple newlines.
 - Support "USE" statement in ANSI ([#902](https://github.com/sqlfluff/sqlfluff/issues/902)).
+- Parse explain statement ([#893](https://github.com/sqlfluff/sqlfluff/issues/893)).
 
 ## [0.5.1] - 2021-04-09
 ### Changed

docs/source/configuration.rst

@@ -342,7 +342,7 @@ You already know you can pass arguments (:code:`--verbose`,
 
 .. code-block:: console
 
-    $ sqfluff lint my_code.sql -v -exclude_rules L022,L027
+    $ sqlfluff lint my_code.sql -v -exclude_rules L022,L027
 
 You might have arguments that you pass through every time, e.g rules you
 *always* want to ignore. These can also be configured:
@@ -408,11 +408,11 @@ ignored until a corresponding `-- noqa:enable=<rule>[,...] | all` directive.
 ^^^^^^^^^^^^^^^
 
 Similar to `Git's`_ :code:`.gitignore` and `Docker's`_ :code:`.dockerignore`,
-SQLFluff supports a :code:`.sqfluffignore` file to control which files are and
+SQLFluff supports a :code:`.sqlfluffignore` file to control which files are and
 aren't linted. Under the hood we use the python `pathspec library`_ which also
 has a brief tutorial in their documentation.
 
-An example of a potential :code:`.sqfluffignore` placed in the root of your
+An example of a potential :code:`.sqlfluffignore` placed in the root of your
 project would be:
 
 .. code-block:: cfg

src/sqlfluff/__main__.py

@@ -1,4 +1,4 @@
-"""Export cli to __main__ for use like python -m sqfluff."""
+"""Export cli to __main__ for use like python -m sqlfluff."""
 from sqlfluff.cli.commands import cli
 
 if __name__ == "__main__":

src/sqlfluff/dialects/ansi_keywords.py

@@ -375,6 +375,7 @@
 ISNULL
 ISOLATION
 ITERATE
+JSON
 K
 KEY
 KEY_MEMBER
@@ -860,7 +861,9 @@
 WRITE
 WRITETEXT
 X509
+XML
 XOR
+YAML
 YEAR
 YEAR_MONTH
 ZEROFILL

src/sqlfluff/dialects/dialect_ansi.py

@@ -2551,6 +2551,7 @@ class StatementSegment(BaseSegment):
         Ref("DropModelStatementSegment"),
         Ref("DescribeStatementSegment"),
         Ref("UseStatementSegment"),
+        Ref("ExplainStatementSegment"),
     )
 
     def get_table_references(self):
@@ -2621,3 +2622,26 @@ class UseStatementSegment(BaseSegment):
         OneOf("ROLE", "WAREHOUSE", "DATABASE", "SCHEMA", optional=True),
         Ref("ObjectReferenceSegment"),
     )
+
+
+class ExplainStatementSegment(BaseSegment):
+    """An `Explain` statement.
+
+    EXPLAIN explainable_stmt
+    """
+
+    type = "explain_statement"
+
+    explainable_stmt = OneOf(
+        Ref("SelectableGrammar"),
+        Ref("InsertStatementSegment"),
+        Ref("UpdateStatementSegment"),
+        Ref("DeleteStatementSegment"),
+    )
+
+    match_grammar = StartsWith("EXPLAIN")
+
+    parse_grammar = Sequence(
+        "EXPLAIN",
+        explainable_stmt,
+    )

src/sqlfluff/dialects/dialect_postgres.py

@@ -37,6 +37,17 @@
 postgres_dialect.sets("unreserved_keywords").remove("SPACE")
 # Reserve WITHIN (required for the WithinGroupClauseSegment)
 postgres_dialect.sets("unreserved_keywords").remove("WITHIN")
+postgres_dialect.sets("unreserved_keywords").update(
+    [
+        "WITHIN",
+        "ANALYZE",
+        "VERBOSE",
+        "COSTS",
+        "BUFFERS",
+        "FORMAT",
+        "XML",
+    ]
+)
 postgres_dialect.sets("reserved_keywords").add("WITHIN")
 # Add the EPOCH datetime unit
 postgres_dialect.sets("datetime_units").update(["EPOCH"])
@@ -112,3 +123,58 @@ class WithinGroupClauseSegment(BaseSegment):
         "GROUP",
         Bracketed(Ref("OrderByClauseSegment", optional=True)),
     )
+
+
+@postgres_dialect.segment(replace=True)
+class ExplainStatementSegment(ansi_dialect.get_segment("ExplainStatementSegment")):  # type: ignore
+    """An `Explain` statement.
+
+    EXPLAIN [ ( option [, ...] ) ] statement
+    EXPLAIN [ ANALYZE ] [ VERBOSE ] statement
+
+    https://www.postgresql.org/docs/9.1/sql-explain.html
+    """
+
+    parse_grammar = Sequence(
+        "EXPLAIN",
+        OneOf(
+            Sequence(
+                Ref.keyword("ANALYZE", optional=True),
+                Ref.keyword("VERBOSE", optional=True),
+            ),
+            Bracketed(
+                Delimited(Ref("ExplainOptionSegment"), delimiter=Ref("CommaSegment"))
+            ),
+            optional=True,
+        ),
+        ansi_dialect.get_segment("ExplainStatementSegment").explainable_stmt,
+    )
+
+
+@postgres_dialect.segment()
+class ExplainOptionSegment(BaseSegment):
+    """An `Explain` statement option.
+
+    ANALYZE [ boolean ]
+    VERBOSE [ boolean ]
+    COSTS [ boolean ]
+    BUFFERS [ boolean ]
+    FORMAT { TEXT | XML | JSON | YAML }
+
+    https://www.postgresql.org/docs/9.1/sql-explain.html
+    """
+
+    type = "explain_option"
+
+    flag_segment = Sequence(
+        OneOf("ANALYZE", "VERBOSE", "COSTS", "BUFFERS"),
+        OneOf(Ref("TrueSegment"), Ref("FalseSegment"), optional=True),
+    )
+
+    match_grammar = OneOf(
+        flag_segment,
+        Sequence(
+            "FORMAT",
+            OneOf("TEXT", "XML", "JSON", "YAML"),
+        ),
+    )

src/sqlfluff/dialects/dialect_snowflake.py

@@ -69,6 +69,7 @@
         "SEED",
         "TERSE",
         "UNSET",
+        "TABULAR",
     ]
 )
 
@@ -654,3 +655,23 @@ class AlterUserSegment(BaseSegment):
             Sequence("UNSET", Delimited(Ref("ParameterNameSegment"))),
         ),
     )
+
+
+@snowflake_dialect.segment(replace=True)
+class ExplainStatementSegment(ansi_dialect.get_segment("ExplainStatementSegment")):  # type: ignore
+    """An `Explain` statement.
+
+    EXPLAIN [ USING { TABULAR | JSON | TEXT } ] <statement>
+
+    https://docs.snowflake.com/en/sql-reference/sql/explain.html
+    """
+
+    parse_grammar = Sequence(
+        "EXPLAIN",
+        Sequence(
+            "USING",
+            OneOf("TABULAR", "JSON", "TEXT"),
+            optional=True,
+        ),
+        ansi_dialect.get_segment("ExplainStatementSegment").explainable_stmt,
+    )

test/fixtures/parser/mysql/explain.sql

@@ -0,0 +1,7 @@
+explain select 1;
+
+explain update tbl set foo = 1 where bar = 2;
+
+explain delete from tbl where foo = 1;
+
+explain insert into tbl (col1) values (123);

test/fixtures/parser/mysql/explain.yml

@@ -0,0 +1,70 @@
+file:
+    - statement:
+        explain_statement:
+          keyword: explain
+          select_statement:
+            select_clause:
+              keyword: select
+              select_clause_element:
+                literal: '1'
+    - statement_terminator: ;
+    - statement:
+        explain_statement:
+          keyword: explain
+          update_statement:
+            keyword: update
+            table_reference:
+              identifier: tbl
+            set_clause_list:
+              keyword: set
+              set_clause:
+                column_reference:
+                  identifier: foo
+                comparison_operator: '='
+                literal: '1'
+            where_clause:
+              keyword: where
+              expression:
+                column_reference:
+                  identifier: bar
+                comparison_operator: '='
+                literal: '2'
+    - statement_terminator: ;
+    - statement:
+        explain_statement:
+          keyword: explain
+          delete_statement:
+            keyword: delete
+            from_clause:
+              keyword: from
+              from_expression:
+                from_expression_element:
+                  table_expression:
+                    table_reference:
+                      identifier: tbl
+            where_clause:
+              keyword: where
+              expression:
+                column_reference:
+                  identifier: foo
+                comparison_operator: '='
+                literal: '1'
+    - statement_terminator: ;
+    - statement:
+        explain_statement:
+          keyword: explain
+          insert_statement:
+          - keyword: insert
+          - keyword: into
+          - table_reference:
+              identifier: tbl
+          - start_bracket: (
+          - column_reference:
+              identifier: col1
+          - end_bracket: )
+          - values_clause:
+              keyword: values
+              start_bracket: (
+              literal: '123'
+              end_bracket: )
+    - statement_terminator: ;

test/fixtures/parser/postgres/postgres_explain.sql

@@ -0,0 +1,11 @@
+explain (analyze true, costs false, verbose true, buffers true, format xml) select 1;
+
+explain analyze verbose select 1;
+
+explain analyze select 1;
+
+explain (format text) select 1;
+
+explain (format json) select 1;
+
+explain (format yaml) select 1;

test/fixtures/parser/postgres/postgres_explain.yml

@@ -0,0 +1,94 @@
+file:
+- statement:
+    explain_statement:
+    - keyword: explain
+    - start_bracket: (
+    - explain_option:
+        keyword: analyze
+        literal: 'true'
+    - comma: ','
+    - explain_option:
+        keyword: costs
+        literal: 'false'
+    - comma: ','
+    - explain_option:
+        keyword: verbose
+        literal: 'true'
+    - comma: ','
+    - explain_option:
+        keyword: buffers
+        literal: 'true'
+    - comma: ','
+    - explain_option:
+      - keyword: format
+      - keyword: xml
+    - end_bracket: )
+    - select_statement:
+        select_clause:
+          keyword: select
+          select_clause_element:
+            literal: '1'
+- statement_terminator: ;
+- statement:
+    explain_statement:
+    - keyword: explain
+    - keyword: analyze
+    - keyword: verbose
+    - select_statement:
+        select_clause:
+          keyword: select
+          select_clause_element:
+            literal: '1'
+- statement_terminator: ;
+- statement:
+    explain_statement:
+    - keyword: explain
+    - keyword: analyze
+    - select_statement:
+        select_clause:
+          keyword: select
+          select_clause_element:
+            literal: '1'
+- statement_terminator: ;
+- statement:
+    explain_statement:
+      keyword: explain
+      start_bracket: (
+      explain_option:
+      - keyword: format
+      - keyword: text
+      end_bracket: )
+      select_statement:
+        select_clause:
+          keyword: select
+          select_clause_element:
+            literal: '1'
+- statement_terminator: ;
+- statement:
+    explain_statement:
+      keyword: explain
+      start_bracket: (
+      explain_option:
+      - keyword: format
+      - keyword: json
+      end_bracket: )
+      select_statement:
+        select_clause:
+          keyword: select
+          select_clause_element:
+            literal: '1'
+- statement_terminator: ;
+- statement:
+    explain_statement:
+      keyword: explain
+      start_bracket: (
+      explain_option:
+      - keyword: format
+      - keyword: yaml
+      end_bracket: )
+      select_statement:
+        select_clause:
+          keyword: select
+          select_clause_element:
+            literal: '1'
+- statement_terminator: ;