Skip to content

Commit a414ad2

Browse files
author
Uku Pattak
committed
Keep SET SCHEMA query on one line
More info about SET SCHEMA http://docs.oracle.com/javadb/10.8.3.0/ref/rrefsqlj32268.html
1 parent 8808a47 commit a414ad2

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

src/languages/N1qlFormatter.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ const reservedWords = [
1919
];
2020

2121
const reservedToplevelWords = [
22-
"SELECT", "FROM", "WHERE", "SET", "ORDER BY", "GROUP BY", "LIMIT", "VALUES", "EXPLAIN UPDATE", "UPDATE",
23-
"HAVING", "EXPLAIN DELETE FROM", "DELETE FROM", "UNION ALL", "UNION", "EXCEPT ALL", "EXCEPT", "INTERSECT ALL", "INTERSECT",
24-
"INFER", "EXPLAIN UPSERT", "UPSERT", "MERGE", "PREPARE", "LET", "USE KEYS", "UNNEST", "NEST", "INSERT INTO"
22+
"SET SCHEMA", "SET CURRENT SCHEMA", "SELECT", "FROM", "WHERE", "SET", "ORDER BY", "GROUP BY", "LIMIT", "VALUES",
23+
"EXPLAIN UPDATE", "UPDATE", "HAVING", "EXPLAIN DELETE FROM", "DELETE FROM", "UNION ALL", "UNION", "EXCEPT ALL",
24+
"EXCEPT", "INTERSECT ALL", "INTERSECT", "INFER", "EXPLAIN UPSERT", "UPSERT", "MERGE", "PREPARE", "LET", "USE KEYS",
25+
"UNNEST", "NEST", "INSERT INTO"
2526
];
2627

2728
const reservedNewlineWords = [

src/languages/StandardSqlFormatter.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ const reservedWords = [
3939
];
4040

4141
const reservedToplevelWords = [
42-
"SELECT", "FROM", "WHERE", "SET", "ORDER BY", "GROUP BY", "LIMIT", "ALTER TABLE", "ALTER COLUMN", "INSERT INTO",
43-
"VALUES", "UPDATE", "HAVING", "ADD", "AFTER", "DELETE FROM", "UNION ALL", "UNION", "EXCEPT", "INTERSECT", "MODIFY"
42+
"SET SCHEMA", "SET CURRENT SCHEMA", "SELECT", "FROM", "WHERE", "SET", "ORDER BY", "GROUP BY", "LIMIT",
43+
"ALTER TABLE", "ALTER COLUMN", "INSERT INTO", "VALUES", "UPDATE", "HAVING", "ADD", "AFTER", "DELETE FROM",
44+
"UNION ALL", "UNION", "EXCEPT", "INTERSECT", "MODIFY"
4445
];
4546

4647
const reservedNewlineWords = [

test/behavesLikeSqlFormatter.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ export default function behavesLikeSqlFormatter(language) {
2424
return sqlFormatter.format(query, {language});
2525
}
2626

27+
it("formats simple SET SCHEMA queries", function() {
28+
const result = format("SET SCHEMA tetrisdb; SET CURRENT SCHEMA bingodb;");
29+
expect(result).toBe(
30+
"SET SCHEMA\n" +
31+
" tetrisdb;\n" +
32+
"SET CURRENT SCHEMA\n" +
33+
" bingodb;\n"
34+
);
35+
});
36+
2737
it("formats simple SELECT query", function() {
2838
const result = format("SELECT count(*),Column1 FROM Table1;");
2939
expect(result).toBe(

0 commit comments

Comments
 (0)