Skip to content

Commit 93f298c

Browse files
committed
Combine NATURAL JOIN + NATURAL INNER JOIN
1 parent 9043730 commit 93f298c

File tree

8 files changed

+8
-16
lines changed

8 files changed

+8
-16
lines changed

src/languages/mysql/mysql.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,8 @@ const reservedJoins = expandPhrases([
203203
'JOIN',
204204
'{LEFT | RIGHT} [OUTER] JOIN',
205205
'{INNER | CROSS} JOIN',
206-
'NATURAL JOIN',
206+
'NATURAL [INNER] JOIN',
207207
'NATURAL {LEFT | RIGHT} [OUTER] JOIN',
208-
'NATURAL INNER JOIN',
209208
// non-standard joins
210209
'STRAIGHT_JOIN',
211210
]);

src/languages/plsql/plsql.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ const reservedJoins = expandPhrases([
4747
'JOIN',
4848
'{LEFT | RIGHT | FULL} [OUTER] JOIN',
4949
'{INNER | CROSS} JOIN',
50-
'NATURAL JOIN',
51-
'NATURAL INNER JOIN',
50+
'NATURAL [INNER] JOIN',
5251
'NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN',
5352
// non-standard joins
5453
'{CROSS | OUTER} APPLY',

src/languages/postgresql/postgresql.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ const reservedJoins = expandPhrases([
217217
'JOIN',
218218
'{LEFT | RIGHT | FULL} [OUTER] JOIN',
219219
'{INNER | CROSS} JOIN',
220-
'NATURAL JOIN',
221-
'NATURAL INNER JOIN',
220+
'NATURAL [INNER] JOIN',
222221
'NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN',
223222
]);
224223

src/languages/redshift/redshift.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ const reservedJoins = expandPhrases([
112112
'JOIN',
113113
'{LEFT | RIGHT | FULL} [OUTER] JOIN',
114114
'{INNER | CROSS} JOIN',
115-
'NATURAL JOIN',
116-
'NATURAL INNER JOIN',
115+
'NATURAL [INNER] JOIN',
117116
'NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN',
118117
]);
119118

src/languages/spark/spark.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ const reservedJoins = expandPhrases([
9191
'JOIN',
9292
'{LEFT | RIGHT | FULL} [OUTER] JOIN',
9393
'{INNER | CROSS} JOIN',
94-
'NATURAL JOIN',
95-
'NATURAL INNER JOIN',
94+
'NATURAL [INNER] JOIN',
9695
'NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN',
9796
// non-standard-joins
9897
'[LEFT] {ANTI | SEMI} JOIN',

src/languages/sql/sql.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ const reservedJoins = expandPhrases([
4545
'JOIN',
4646
'{LEFT | RIGHT | FULL} [OUTER] JOIN',
4747
'{INNER | CROSS} JOIN',
48-
'NATURAL JOIN',
49-
'NATURAL INNER JOIN',
48+
'NATURAL [INNER] JOIN',
5049
'NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN',
5150
]);
5251

src/languages/sqlite/sqlite.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ const reservedJoins = expandPhrases([
4343
'JOIN',
4444
'{LEFT | RIGHT | FULL} [OUTER] JOIN',
4545
'{INNER | CROSS} JOIN',
46-
'NATURAL JOIN',
47-
'NATURAL INNER JOIN',
46+
'NATURAL [INNER] JOIN',
4847
'NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN',
4948
]);
5049

src/languages/trino/trino.formatter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ const reservedJoins = expandPhrases([
112112
'JOIN',
113113
'{LEFT | RIGHT | FULL} [OUTER] JOIN',
114114
'{INNER | CROSS} JOIN',
115-
'NATURAL JOIN',
116-
'NATURAL INNER JOIN',
115+
'NATURAL [INNER] JOIN',
117116
'NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN',
118117
]);
119118

0 commit comments

Comments
 (0)