Merge pull request #58 from rafaelrpinto/master

feat: support multiple statements

Author: nene

src/core/Formatter.js

@@ -77,9 +77,12 @@ export default class Formatter {
             else if (token.value === ":") {
                 formattedQuery = this.formatWithSpaceAfter(token, formattedQuery);
             }
-            else if (token.value === "." || token.value === ";") {
+            else if (token.value === ".") {
                 formattedQuery = this.formatWithoutSpaces(token, formattedQuery);
             }
+            else if (token.value === ";") {
+                formattedQuery = this.formatQuerySeparator(token, formattedQuery);
+            }
             else {
                 formattedQuery = this.formatWithSpaces(token, formattedQuery);
             }
@@ -185,6 +188,10 @@ export default class Formatter {
         return query + token.value + " ";
     }
 
+    formatQuerySeparator(token, query) {
+        return this.trimTrailingWhitespace(query) + token.value + "\n";
+    }
+
     addNewline(query) {
         return trimEnd(query) + "\n" + this.indentation.getIndent();
     }

test/behavesLikeSqlFormatter.js

@@ -445,4 +445,24 @@ export default function behavesLikeSqlFormatter(language) {
         expect(format("foo !~* 'hello'")).toBe("foo !~* 'hello'");
         expect(format("foo !~~* 'hello'")).toBe("foo !~~* 'hello'");
     });
+
+    it("keeps separation between multiple statements", function() {
+        expect(format("foo;bar;")).toBe("foo;\nbar;");
+        expect(format("foo\n;bar;")).toBe("foo;\nbar;");
+        expect(format("foo\n\n\n;bar;\n\n")).toBe("foo;\nbar;");
+
+        const result = format("SELECT count(*),Column1 FROM Table1;\nSELECT count(*),Column1 FROM Table2;");
+        expect(result).toBe(
+            "SELECT\n" +
+            "  count(*),\n" +
+            "  Column1\n" +
+            "FROM\n" +
+            "  Table1;\n" + 
+            "SELECT\n" +
+            "  count(*),\n" +
+            "  Column1\n" +
+            "FROM\n" +
+            "  Table2;"
+        );
+    });
 }