Fully remove exasol_fs dialect and bump version (#1573)

* Fully remove exasol dialect and bump version

* Update tests and docs

* add legacy dialect test

* Remove Exasol FS fixtures

docs/source/dialects.rst

@@ -66,8 +66,7 @@ The dialect for `Google BigQuery`_.
 Exasol
 ------
 
-The dialect for `Exasol`_. Note that currently Exasol script and functions
-create statements are currently defined in a separate ``exasol_fs`` dialect.
+The dialect for `Exasol`_.
 
 .. _`Exasol`: https://www.exasol.com/
 

src/sqlfluff/cli/commands.py

@@ -41,6 +41,7 @@
     FluffConfig,
     SQLLintError,
     SQLTemplaterError,
+    SQLFluffUserError,
     dialect_selector,
     dialect_readout,
     TimingSummary,
@@ -208,8 +209,20 @@ def get_config(**kwargs) -> FluffConfig:
         try:
             # We're just making sure it exists at this stage - it will be fetched properly in the linter
             dialect_selector(kwargs["dialect"])
+        except SQLFluffUserError as err:
+            click.echo(
+                colorize(
+                    f"Error loading dialect '{kwargs['dialect']}': {str(err)}",
+                    color=Color.red,
+                )
+            )
+            sys.exit(66)
         except KeyError:
-            click.echo(f"Error: Unknown dialect '{kwargs['dialect']}'")
+            click.echo(
+                colorize(
+                    f"Error: Unknown dialect '{kwargs['dialect']}'", color=Color.red
+                )
+            )
             sys.exit(66)
     # Instantiate a config object (filtering out the nulls)
     overrides = {k: kwargs[k] for k in kwargs if kwargs[k] is not None}

src/sqlfluff/config.ini

@@ -1,4 +1,4 @@
 # Config file for SQLFluff, mostly for version info for now
 [sqlfluff]
-version=0.6.9
+version=0.7.0a1
 stable_version=0.6.9

src/sqlfluff/core/__init__.py

@@ -20,6 +20,7 @@
     SQLLexError,
     SQLParseError,
     SQLLintError,
+    SQLFluffUserError,
 )
 
 # Timing objects

src/sqlfluff/core/dialects/__init__.py

@@ -18,6 +18,7 @@
 # Eventually it would be a good to dynamically discover dialects
 # from any module beginning with "dialect_" within this folder.
 from sqlfluff.core.dialects.base import Dialect
+from sqlfluff.core.errors import SQLFluffUserError
 
 _dialect_lookup = {
     "ansi": ("dialect_ansi", "ansi_dialect"),
@@ -27,15 +28,24 @@
     "postgres": ("dialect_postgres", "postgres_dialect"),
     "snowflake": ("dialect_snowflake", "snowflake_dialect"),
     "exasol": ("dialect_exasol", "exasol_dialect"),
-    "exasol_fs": ("dialect_exasol_fs", "exasol_fs_dialect"),
     "tsql": ("dialect_tsql", "tsql_dialect"),
     "hive": ("dialect_hive", "hive_dialect"),
     "sqlite": ("dialect_sqlite", "sqlite_dialect"),
 }
 
+_legacy_dialects = {
+    "exasol_fs": (
+        "As of 0.7.0 the 'exasol_fs' dialect has been combined with "
+        "the 'exasol' dialect, and is no longer a standalone dialect. "
+        "Please use the 'exasol' dialect instead."
+    )
+}
+
 
 def load_raw_dialect(label: str, base_module: str = "sqlfluff.dialects") -> Any:
     """Dynamically load a dialect."""
+    if label in _legacy_dialects:
+        raise SQLFluffUserError(_legacy_dialects[label])
     module, name = _dialect_lookup[label]
     return getattr(import_module(f"{base_module}.{module}"), name)
 

src/sqlfluff/core/errors.py

@@ -195,3 +195,7 @@ def __repr__(self):
             len(self.fixes),
             self.description,
         )
+
+
+class SQLFluffUserError(ValueError):
+    """An error which should be fed back to the user."""

test/cli/commands_test.py

@@ -87,6 +87,23 @@ def test__cli__command_dialect():
     )
 
 
+def test__cli__command_dialect_legacy():
+    """Check the script raises the right exception on a legacy dialect."""
+    result = invoke_assert_code(
+        ret_code=66,
+        args=[
+            lint,
+            [
+                "-n",
+                "--dialect",
+                "exasol_fs",
+                "test/fixtures/linter/indentation_error_simple.sql",
+            ],
+        ],
+    )
+    assert "Please use the 'exasol' dialect instead." in result.stdout
+
+
 @pytest.mark.parametrize(
     "command",
     [

test/dialects/exasol_test.py

@@ -16,5 +16,5 @@
 def test_dialect_exasol_specific_segment_parses(
     segmentref, raw, caplog, dialect_specific_segment_parses
 ):
-    """Test exasol_fs specific segments."""
+    """Test exasol specific segments."""
     dialect_specific_segment_parses(TEST_DIALECT, segmentref, raw, caplog)