feat(config): use FluffConfig object, default require final semicolon to false

Author: CobySim01

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sqlxfluff"
-version = "0.1.1"
+version = "0.2.0"
 description = ""
 authors = ["Coby Simmons <cobysimmons01@gmail.com>"]
 readme = "README.md"

sqlxfluff/config_utils.py

@@ -1,14 +1,15 @@
 import sqlfluff
+from sqlfluff.core import FluffConfig
 
 from .base import format_config, format_template
 from .indent import replace_with_indentation
 
 
-def format_sqlx(deconstructed_file: dict, dialect, config):
+def format_sqlx(deconstructed_file: dict, config: FluffConfig):
     """Formats Dataform SQLX files using SQLFluff"""
     # run fix on modified text
-    bq_fix_result = sqlfluff.fix(
-        deconstructed_file["main"], dialect=dialect, config_path=config
+    bq_fix_result = sqlfluff.fix(deconstructed_file["main"], config=config).rstrip(
+        ";\n"
     )
     # place the templates back into the SQLX
     for mask, template in deconstructed_file["templates"].items():
@@ -19,4 +20,4 @@ def format_sqlx(deconstructed_file: dict, dialect, config):
 
     # recombine the config block and the fixed SQL
     formatted_config_block = format_config(deconstructed_file["config"])
-    return formatted_config_block + "\n\n" + bq_fix_result
+    return formatted_config_block + "\n\n" + bq_fix_result + "\n"

sqlxfluff/formatters/sqlx.py

@@ -3,10 +3,10 @@
 from termcolor import colored
 
 
-def parse_sql(sql_string: str, dialect):
+def parse_sql(sql_string: str, config):
     """Returns whether or not the provided SQL is parseable by SQLFluff."""
     try:
-        sqlfluff.parse(sql_string, dialect=dialect)
+        sqlfluff.parse(sql_string, config=config)
     except APIParsingError as error:
         return error.msg
     return None

sqlxfluff/linting.py

@@ -2,9 +2,9 @@
 from sys import exit  # pylint: disable=redefined-builtin
 
 import sqlfluff
+from sqlfluff.core import FluffConfig
 from termcolor import cprint
 
-from .config_utils import find_config_file, load_config
 from .constants import EXIT_FAIL
 from .formatters.javascript import validate_prettier_installation
 from .formatters.sqlx import format_sqlx
@@ -21,7 +21,7 @@ def main():
         description="A script that formats and lints Dataform SQLX files."
     )
     parser.add_argument(
-        "-c", "--config", help="Path to the configuration file", default=None
+        "-c", "--config-path", help="Path to the configuration file", default=None
     )
     dialects = [d.name for d in sqlfluff.core.dialect_readout()]
     parser.add_argument(
@@ -33,38 +33,37 @@ def main():
     opts = parser.parse_args()
 
     for filename in opts.files:
-        if opts.config is None:
-            opts.config = find_config_file(filename)
-        if opts.dialect is None:
-            opts.dialect = load_config(opts.config).get("sqlfluff", {}).get("dialect")
+        config = FluffConfig.from_path(
+            filename if opts.config_path is None else opts.config_path
+        )
+        config.set_value(
+            ["rules", "convention.terminator", "require_final_semicolon"], False
+        )
+        if opts.dialect is not None:
+            config.set_value(["dialect"], opts.dialect)
 
         with open(filename, "r", encoding="utf-8") as f:
             raw_file_contents = f.read()
         parsed_file_contents = parse_sqlx(raw_file_contents)
 
-        parsing_violations = parse_sql(parsed_file_contents["main"], opts.dialect)
+        cprint(filename, attrs=["bold"], end=" ")
+
+        parsing_violations = parse_sql(parsed_file_contents["main"], config)
         if parsing_violations is not None:
             cprint(parsing_violations, "red")
             exit(EXIT_FAIL)
 
-        lint_result = sqlfluff.lint(
-            parsed_file_contents["main"],
-            dialect=opts.dialect,
-            config_path=opts.config,
-        )
-        cprint(filename, attrs=["bold"], end=" ")
+        lint_result = sqlfluff.lint(parsed_file_contents["main"], config=config)
         if not lint_result:
             cprint("PASS", color="green")
         else:
             cprint("FAIL", color="red")
             for result in lint_result:
                 print_lint_result(result)
 
-        formatted_file_contents = format_sqlx(
-            parsed_file_contents, opts.dialect, opts.config
-        )
+        formatted_file_contents = format_sqlx(parsed_file_contents, config)
         formatted_file_contents_again = format_sqlx(
-            parse_sqlx(formatted_file_contents), opts.dialect, opts.config
+            parse_sqlx(formatted_file_contents), config
         )
         if formatted_file_contents != formatted_file_contents_again:
             cprint("Formatter unable to determine final formatted form.", "red")