Skip to content

Commit 851af81

Browse files
authored
Add INTO Clause and Remove Invalid Data Definition (#609)
Reverting a change I had made previously and adding `INTO` as a reserved clause.
2 parents 7f48f15 + 5939b1b commit 851af81

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

src/languages/transactsql/transactsql.formatter.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const reservedSelect = expandPhrases(['SELECT [ALL | DISTINCT]']);
88
const reservedClauses = expandPhrases([
99
// queries
1010
'WITH',
11+
'INTO',
1112
'FROM',
1213
'WHERE',
1314
'GROUP BY',
@@ -29,8 +30,8 @@ const reservedClauses = expandPhrases([
2930
'UPDATE SET',
3031
// Data definition
3132
'CREATE [OR ALTER] [MATERIALIZED] VIEW',
32-
'CREATE [OR ALTER] TABLE',
33-
'CREATE [OR ALTER] PROCEDURE',
33+
'CREATE TABLE',
34+
'CREATE [OR ALTER] {PROC | PROCEDURE}',
3435
]);
3536

3637
const onelineClauses = expandPhrases([

test/transactsql.test.ts

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,27 +118,24 @@ describe('TransactSqlFormatter', () => {
118118
`);
119119
});
120120

121-
it('formats SET NOCOUNT ON; GO CREATE OR ALTER TABLE', () => {
122-
const result = format('SET NOCOUNT ON; GO CREATE OR ALTER TABLE t');
121+
it('formats GO CREATE OR ALTER PROCEDURE', () => {
122+
const result = format('GO CREATE OR ALTER PROCEDURE p');
123123
expect(result).toBe(dedent`
124-
SET
125-
NOCOUNT ON;
126-
127-
GO
128-
CREATE OR ALTER TABLE
129-
t
124+
GO
125+
CREATE OR ALTER PROCEDURE
126+
p
130127
`);
131128
});
132129

133-
it('formats SET NOCOUNT ON; GO CREATE OR ALTER PROCEDURE', () => {
134-
const result = format('SET NOCOUNT ON; GO CREATE OR ALTER PROCEDURE p');
130+
it('formats SELECT ... INTO clause', () => {
131+
const result = format('SELECT col INTO #temp FROM tbl');
135132
expect(result).toBe(dedent`
136-
SET
137-
NOCOUNT ON;
138-
139-
GO
140-
CREATE OR ALTER PROCEDURE
141-
p
133+
SELECT
134+
col
135+
INTO
136+
#temp
137+
FROM
138+
tbl
142139
`);
143140
});
144141
});

0 commit comments

Comments
 (0)