Merge branch 'main' into snowsql-variables-with-curly-brackets

sqlfluff · Nov 20, 2021 · 905752b · 905752b
2 parents 0e69de4 + c66aefd
commit 905752b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/sqlfluff/cli/commands.py b/src/sqlfluff/cli/commands.py
@@ -305,7 +305,7 @@ def get_linter_and_formatter(
         return Linter(config=cfg), formatter
 
 
-@click.group()
+@click.group(context_settings={"help_option_names": ["-h", "--help"]})
 @click.version_option()
 def cli():
     """Sqlfluff is a modular sql linter for humans."""

diff --git a/src/sqlfluff/rules/L031.py b/src/sqlfluff/rules/L031.py
@@ -8,6 +8,15 @@
 from sqlfluff.core.rules.doc_decorators import document_fix_compatible
 
 
+class TableAliasInfo(NamedTuple):
+    """Structure yielded by_filter_table_expressions()."""
+
+    table_ref: BaseSegment
+    whitespace_ref: BaseSegment
+    alias_exp_ref: BaseSegment
+    alias_identifier_ref: BaseSegment
+
+
 @document_fix_compatible
 class Rule_L031(BaseRule):
     """Avoid table aliases in from clauses and join conditions.
@@ -102,14 +111,6 @@ def _eval(self, context: RuleContext) -> Optional[LintResult]:
             )
         return None
 
-    class TableAliasInfo(NamedTuple):
-        """Structure yielded by_filter_table_expressions()."""
-
-        table_ref: BaseSegment
-        whitespace_ref: BaseSegment
-        alias_exp_ref: BaseSegment
-        alias_identifier_ref: BaseSegment
-
     @classmethod
     def _filter_table_expressions(
         cls, base_table, from_expression_elements
@@ -142,7 +143,7 @@ def _filter_table_expressions(
                 continue
 
             alias_identifier_ref = alias_exp_ref.get_child("identifier")
-            yield cls.TableAliasInfo(
+            yield TableAliasInfo(
                 table_ref, whitespace_ref, alias_exp_ref, alias_identifier_ref
             )