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

Exasol: Improve function formatting #2678

Merged
merged 4 commits into from
Feb 17, 2022

Conversation

sti0
Copy link
Contributor

@sti0 sti0 commented Feb 17, 2022

Brief summary of the change made

Currently the function body don't gets formattet correctly. Even worse that it breaks existing formatting.

Current:

CREATE FUNCTION schem.func (
    p1 VARCHAR(6),
    p2 VARCHAR(10)
) RETURN VARCHAR (20)
IS
res VARCHAR(20);

BEGIN

IF p1 IS NOT NULL AND p2 IS NOT NULL THEN
IF p1 = 1 THEN
res:= 'Hello World';
ELSE
IF p2 = 3 THEN
res:= 'ABC';
END IF;
res:= 'WOHOOOO';
END IF;
END IF;
RETURN res;
END schem.func;
/

This PR improves the formatting.
After:

CREATE FUNCTION schem.func (
    p1 VARCHAR(6),
    p2 VARCHAR(10)
) RETURN VARCHAR (20)
IS
    res VARCHAR(20);

BEGIN

    IF p1 IS NOT NULL AND p2 IS NOT NULL THEN
        IF p1 = 1 THEN
            res:= 'Hello World';
        ELSE
            IF p2 = 3 THEN
                res:= 'ABC';
            END IF;
            res:= 'WOHOOOO';
        END IF;
    END IF;
    RETURN res;
END schem.func;
/

Are there any other side effects of this change that we should be aware of?

Nope

Pull Request checklist

  • Please confirm you have completed any of the necessary steps below.

  • Included test cases to demonstrate any code changes, which may be one or more of the following:

    • .yml rule test cases in test/fixtures/rules/std_rule_cases.
    • .sql/.yml parser test cases in test/fixtures/dialects (note YML files can be auto generated with tox -e generate-fixture-yml).
    • Full autofix test cases in test/fixtures/linter/autofix.
    • Other.
  • Added appropriate documentation for the change.

  • Created GitHub issues for any relevant followup/future enhancements if appropriate.

@codecov
Copy link

codecov bot commented Feb 17, 2022

Codecov Report

Merging #2678 (e9f37aa) into main (0f6981a) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##              main     #2678   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          163       163           
  Lines        12023     12023           
=========================================
  Hits         12023     12023           
Impacted Files Coverage Δ
src/sqlfluff/dialects/dialect_exasol.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0f6981a...e9f37aa. Read the comment docs.

@tunetheweb
Copy link
Member

The dialect test fixtures do not test indentation. Do you want to add a test case to the L003.yml to truly test this works (and ensure this won’t regress?).

@sti0
Copy link
Contributor Author

sti0 commented Feb 17, 2022

Thanks for the hint. Your right. This would make more sense.

@tunetheweb
Copy link
Member

No problem leaving the old ones in as well as grammar checks.

@sti0
Copy link
Contributor Author

sti0 commented Feb 17, 2022

Added L003 testcases

@tunetheweb tunetheweb merged commit c6b9789 into sqlfluff:main Feb 17, 2022
@sti0 sti0 deleted the feature/exasol-function-format branch February 19, 2022 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants