diff --git a/main.go b/main.go
index 0b674a05..573c9355 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,6 @@ import (
"html/template"
"io/ioutil"
"log"
- "math/rand"
"net/http"
"os"
"os/signal"
@@ -36,11 +35,10 @@ type Specification struct {
var (
prettyCfg = tree.DefaultPrettyCfg()
+ flagExpanded = flag.Bool("expanded", false, "use a verbose, expansive format")
flagPrintWidth = flag.Int("print-width", 60, "line length where sqlfmt will try to wrap")
flagUseSpaces = flag.Bool("use-spaces", false, "indent with spaces instead of tabs")
flagTabWidth = flag.Int("tab-width", 4, "number of spaces per indentation level")
- flagNoSimplify = flag.Bool("no-simplify", false, "don't simplify the output")
- flagAlign = flag.Bool("align", false, "right-align keywords")
flagStmts = flag.StringArray("stmt", nil, "instead of reading from stdin, specify statements as arguments")
flagHelp = flag.BoolP("help", "h", false, "display help")
flagVersion = flag.BoolP("version", "v", false, "display version")
@@ -113,9 +111,11 @@ func runCmd() error {
cfg.UseTabs = !*flagUseSpaces
cfg.LineWidth = *flagPrintWidth
cfg.TabWidth = *flagTabWidth
- cfg.Simplify = !*flagNoSimplify
- cfg.Align = tree.PrettyNoAlign
- if *flagAlign {
+ if *flagExpanded {
+ cfg.Simplify = false
+ cfg.Align = tree.PrettyNoAlign
+ } else {
+ cfg.Simplify = false
cfg.Align = tree.PrettyAlignAndDeindent
}
@@ -323,15 +323,10 @@ func fmtSQLRequest(r *http.Request) (string, error) {
if err != nil {
return "", err
}
- simplify, err := parseBool(r.FormValue("simplify"))
+ expanded, err := parseBool(r.FormValue("expanded"))
if err != nil {
return "", err
}
- align, err := strconv.Atoi(r.FormValue("align"))
- if err != nil {
- return "", err
- }
- casemode := caseModes[r.FormValue("case")]
spaces, err := parseBool(r.FormValue("spaces"))
if err != nil {
return "", err
@@ -341,31 +336,16 @@ func fmtSQLRequest(r *http.Request) (string, error) {
pcfg.LineWidth = n
pcfg.UseTabs = !spaces
pcfg.TabWidth = tabWidth
- pcfg.Simplify = simplify
- pcfg.Align = tree.PrettyAlignMode(align)
- pcfg.Case = casemode
-
- return fmtsql(pcfg, []string{sql})
-}
-
-var caseModes = map[string]func(string) string{
- "upper": strings.ToUpper,
- "lower": strings.ToLower,
- "title": titleCase,
- "spongebob": spongeBobCase,
-}
-
-func titleCase(s string) string {
- return strings.Title(strings.ToLower(s))
-}
+ pcfg.Case = strings.ToUpper
-func spongeBobCase(s string) string {
- var b strings.Builder
- b.Grow(len(s))
- for _, c := range s {
- b.WriteRune(unicode.To(rand.Intn(2), c))
+ if expanded {
+ pcfg.Simplify = false
+ pcfg.Align = tree.PrettyNoAlign
+ } else {
+ pcfg.Simplify = true
+ pcfg.Align = tree.PrettyAlignAndDeindent
}
- return b.String()
+ return fmtsql(pcfg, []string{sql})
}
const (
@@ -435,32 +415,12 @@ Its purpose is to beautifully format SQL statements.
Usage
-There is a box in which to paste or type SQL statements. Multiple statements are supported by separating them with a semicolon (;). The slider below the box controls the desired maximum line width in characters. Various options on the side control tab/indentation width, the use of spaces or tabs, simplification, and alignment modes. Simplification causes the formatter to remove unneeded parentheses and words when the meaning will be the same without them.
-
-There are four alignment modes. The default, no, uses left alignment. partial right aligns keywords at the width of the longest keyword at the beginning of all lines immediately below. full is the same as partial but the keywords AND and OR are deindented, in a style similar to the sqlite tests. other is like partial but instead of deindenting AND and OR, their arguments are instead indented.
-
-no:
-
-SELECT
- a
-FROM
- t
-WHERE
- c
- AND b
- OR d
-
+There is a box in which to paste or type SQL statements. Multiple statements are supported by separating them with a semicolon (;). The slider below the box controls the desired maximum line width in characters. Various options on the side control tab/indentation width, and the use of spaces or tabs.
-partial:
-
-SELECT a
- FROM t
- WHERE c
- AND b
- OR d
-
+There are two formatting modes. The default "compact" format, simplifies expressions and collapses clauses using alignment to clarify between clauses.
+The "expanded" format avoids simplifying expressions and reveals the full structure of SQL queries.
-full:
+compact:
SELECT a
FROM t
@@ -469,14 +429,16 @@ SELECT a
OR d
-other:
+expanded:
-SELECT a
- FROM t
- WHERE c
- AND
- b
- OR d
+SELECT
+ a
+FROM
+ t
+WHERE
+ c
+ AND b
+ OR d
Background
@@ -504,18 +466,8 @@ sqlfmt was inspired by prettier . It is based
options:
tab width
simplify
use spaces
- no
- full
- partial
- other
- UPPER
- lower
- Title
- sPOngEboB
+ expanded
reset to defaults clear auto paste