Skip to content

Commit ba2e913

Browse files
committed
Bump version of sql-formatter.
1 parent c10419f commit ba2e913

4 files changed

Lines changed: 121 additions & 31 deletions

File tree

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,41 @@
11
'use strict';
22

3-
import sqlFormatter from "sql-formatter";
3+
import { format } from "sql-formatter";
44

5-
var formatSQL = function(string) {
6-
var formatterStatement = sqlFormatter.format(string);
5+
var formatSQL = function(string, language) {
6+
var formatterStatement = format(string, {language: language});
77
return formatterStatement;
88
}
99

10-
export { formatSQL };
10+
var languageFromDriver = function(driver) {
11+
if (driver === undefined || driver === null) {
12+
return "postgresql";
13+
}
14+
switch (driver.toLowerCase()) {
15+
case "bigquery":
16+
return "bigquery";
17+
case "mysql":
18+
return "mysql";
19+
case "mariadb":
20+
return "mariadb";
21+
case "duckdb":
22+
case "sqlite":
23+
case "libsql":
24+
case "cloudflared1":
25+
return "sqlite";
26+
case "redshift":
27+
return "redshift";
28+
case "snowflake":
29+
return "snowflake";
30+
case "microsoftsqlserver":
31+
return "transactsql";
32+
case "oracle":
33+
return "plsql"
34+
default:
35+
/** Fallback to default */
36+
return "postgresql";
37+
}
38+
}
39+
40+
export { formatSQL, languageFromDriver };
41+

SQLFormatter.tableplusplugin/main.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
import { formatSQL } from './library/helper';
3+
import { formatSQL, languageFromDriver } from './library/helper';
44

55
var onRun = function(context) {
66
// Get table in opening tab
@@ -9,9 +9,11 @@ var onRun = function(context) {
99
context.alert('Error', 'No SQL Editor');
1010
return;
1111
}
12+
var driver = context.driver();
13+
var language = languageFromDriver(driver);
1214
var range = queryEditor.currentSelectedRange();
1315
var statement = queryEditor.currentSelectedString();
14-
var formattedStatement = formatSQL(statement);
16+
var formattedStatement = formatSQL(statement, language);
1517
queryEditor.replaceStringInRange(formattedStatement, range);
1618
};
1719

SQLFormatter.tableplusplugin/package-lock.json

Lines changed: 80 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SQLFormatter.tableplusplugin/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "com.tinyapp.TablePlus.SQLFormatter.tableplusplugin",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "This plugin helps fill your empty table with funny text and quote for testing purpose",
55
"main": "main.js",
66
"dependencies": {
7-
"sql-formatter": "^3.0.0"
7+
"sql-formatter": "^15.4.6"
88
},
99
"devDependencies": {
1010
"babel-core": "^6.25.0",

0 commit comments

Comments
 (0)