Skip to content

feat: Improve SELECT DISTINCT formatting, #11

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

Open
antimirov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Improve SELECT DISTINCT formatting, #11

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/Db2Formatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ const reservedTopLevelWords = [
'INTERSECT',
'LIMIT',
'ORDER BY',
'SELECT DISTINCT',
'SELECT',
'SET CURRENT SCHEMA',
'SET SCHEMA',
Expand Down
1 change: 1 addition & 0 deletions src/languages/N1qlFormatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ const reservedTopLevelWords = [
'NEST',
'ORDER BY',
'PREPARE',
'SELECT DISTINCT',
'SELECT',
'SET CURRENT SCHEMA',
'SET SCHEMA',
Expand Down
2 changes: 1 addition & 1 deletion src/languages/PlSqlFormatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ const reservedWords = [
'DESC',
'DETERMINISTIC',
'DIRECTORY',
'DISTINCT',
'DO',
'DOUBLE',
'DROP',
Expand Down Expand Up @@ -379,6 +378,7 @@ const reservedTopLevelWords = [
'LOOP',
'MODIFY',
'ORDER BY',
'SELECT DISTINCT',
'SELECT',
'SET CURRENT SCHEMA',
'SET SCHEMA',
Expand Down
2 changes: 1 addition & 1 deletion src/languages/StandardSqlFormatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ const reservedWords = [
'DESC',
'DESCRIBE',
'DETERMINISTIC',
'DISTINCT',
'DISTINCTROW',
'DIV',
'DO',
Expand Down Expand Up @@ -293,6 +292,7 @@ const reservedTopLevelWords = [
'LIMIT',
'MODIFY',
'ORDER BY',
'SELECT DISTINCT',
'SELECT',
'SET CURRENT SCHEMA',
'SET SCHEMA',
Expand Down
12 changes: 6 additions & 6 deletions test/behavesLikeSqlFormatter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export default function behavesLikeSqlFormatter(language) {
"SELECT DISTINCT name, ROUND(age/7) field1, 18 + 20 AS field2, 'some string' FROM foo;"
);
expect(result).toBe(dedent/* sql */ `
SELECT
DISTINCT name,
SELECT DISTINCT
name,
ROUND(age / 7) field1,
18 + 20 AS field2,
'some string'
Expand Down Expand Up @@ -140,8 +140,8 @@ export default function behavesLikeSqlFormatter(language) {
it('preserves case of keywords', () => {
const result = format('select distinct * frOM foo left join bar WHERe a > 1 and b = 3');
expect(result).toBe(dedent/* sql */ `
select
distinct *
select distinct
*
frOM
foo
left join bar
Expand Down Expand Up @@ -483,8 +483,8 @@ export default function behavesLikeSqlFormatter(language) {
uppercase: true
});
expect(result).toBe(dedent/* sql */ `
SELECT
DISTINCT *
SELECT DISTINCT
*
FROM
foo
LEFT JOIN bar
Expand Down