Skip to content

fix(transactsql): format OUTPUT as a clause #1007

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.

Sign up for GitHub

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

Closed
emirmrkaljevic wants to merge 1 commit into from
Closed

fix(transactsql): format OUTPUT as a clause #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/languages/transactsql/transactsql.formatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const reservedClauses = expandPhrases([
'FETCH {FIRST | NEXT}',
'FOR {BROWSE | XML | JSON}',
'OPTION',
'OUTPUT',
// Data manipulation
// - insert:
'INSERT [INTO]',
Expand Down
30 changes: 29 additions & 1 deletion test/transactsql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,35 @@ describe('TransactSqlFormatter', () => {
it('supports special $ACTION keyword', () => {
expect(format(`MERGE INTO tbl OUTPUT $action AS act;`)).toBe(dedent`
MERGE INTO
tbl OUTPUT $action AS act;
tbl
OUTPUT
$action AS act;
`);
});

// Issue #888
it('formats OUTPUT clause on a separate line', () => {
expect(
format(
`UPDATE tbl SET a = 1 OUTPUT inserted.id, deleted.a INTO @log WHERE b = 2; DELETE FROM tbl OUTPUT deleted.id WHERE b = 3;`
)
).toBe(dedent`
UPDATE tbl
SET
a = 1
OUTPUT
inserted.id,
deleted.a
INTO
@log
WHERE
b = 2;

DELETE FROM tbl
OUTPUT
deleted.id
WHERE
b = 3;
`);
});

Expand Down