Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename keyword files #1584

Merged
merged 7 commits into from
Oct 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/sqlfluff/dialects/dialect_ansi.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
from sqlfluff.core.dialects.common import AliasInfo
from sqlfluff.core.parser.segments.base import BracketedSegment

from sqlfluff.dialects.ansi_keywords import (
from sqlfluff.dialects.dialect_ansi_keywords import (
tunetheweb marked this conversation as resolved.
Show resolved Hide resolved
ansi_reserved_keywords,
ansi_unreserved_keywords,
)
Expand Down
2 changes: 1 addition & 1 deletion src/sqlfluff/dialects/dialect_bigquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

from sqlfluff.core.dialects import load_raw_dialect

from sqlfluff.dialects.bigquery_keywords import (
from sqlfluff.dialects.dialect_bigquery_keywords import (
bigquery_reserved_keywords,
bigquery_unreserved_keywords,
)
Expand Down
2 changes: 1 addition & 1 deletion src/sqlfluff/dialects/dialect_exasol.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
)
from sqlfluff.core.dialects import load_raw_dialect
from sqlfluff.core.parser.segments.generator import SegmentGenerator
from sqlfluff.dialects.exasol_keywords import (
from sqlfluff.dialects.dialect_exasol_keywords import (
BARE_FUNCTIONS,
RESERVED_KEYWORDS,
SESSION_PARAMETERS,
Expand Down
5 changes: 4 additions & 1 deletion src/sqlfluff/dialects/dialect_hive.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@

from sqlfluff.core.dialects import load_raw_dialect
from sqlfluff.core.parser.segments.raw import CodeSegment
from sqlfluff.dialects.hive_keywords import RESERVED_KEYWORDS, UNRESERVED_KEYWORDS
from sqlfluff.dialects.dialect_hive_keywords import (
RESERVED_KEYWORDS,
UNRESERVED_KEYWORDS,
)

ansi_dialect = load_raw_dialect("ansi")
hive_dialect = ansi_dialect.copy_as("hive")
Expand Down
2 changes: 1 addition & 1 deletion src/sqlfluff/dialects/dialect_postgres.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
)

from sqlfluff.core.dialects import load_raw_dialect
from sqlfluff.dialects.postgres_keywords import postgres_keywords, get_keywords
from sqlfluff.dialects.dialect_postgres_keywords import postgres_keywords, get_keywords

ansi_dialect = load_raw_dialect("ansi")

Expand Down
5 changes: 4 additions & 1 deletion src/sqlfluff/dialects/dialect_tsql.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
)

from sqlfluff.core.dialects import load_raw_dialect
from sqlfluff.dialects.tsql_keywords import RESERVED_KEYWORDS, UNRESERVED_KEYWORDS
from sqlfluff.dialects.dialect_tsql_keywords import (
RESERVED_KEYWORDS,
UNRESERVED_KEYWORDS,
)

ansi_dialect = load_raw_dialect("ansi")
tsql_dialect = ansi_dialect.copy_as("tsql")
Expand Down
5 changes: 4 additions & 1 deletion test/dialects/postgres_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
from _pytest.logging import LogCaptureFixture

from sqlfluff.core import FluffConfig, Linter
from sqlfluff.dialects.postgres_keywords import get_keywords, priority_keyword_merge
from sqlfluff.dialects.dialect_postgres_keywords import (
get_keywords,
priority_keyword_merge,
)


@pytest.mark.parametrize(
Expand Down