Merge pull request #27 from rahelest/master

ukupat · web-flow · commit d60d204fc1c4 · 2017-07-12T10:18:09.000+03:00
Remove addition of newline to end of output.
diff --git a/src/core/Formatter.js b/src/core/Formatter.js
@@ -30,7 +30,7 @@ export default class Formatter {
         const tokens = this.tokenizer.tokenize(query);
         const formattedQuery = this.getFormattedQueryFromTokens(tokens);
 
-        return formattedQuery.trim() + "\n";
+        return formattedQuery.trim();
     }
 
     getFormattedQueryFromTokens(tokens) {
diff --git a/test/Db2FormatterTest.js b/test/Db2FormatterTest.js
@@ -16,7 +16,7 @@ describe("Db2Formatter", function() {
             "ORDER BY\n" +
             "  col2 DESC\n" +
             "FETCH FIRST\n" +
-            "  20 ROWS ONLY;\n"
+            "  20 ROWS ONLY;"
         );
     });
 
@@ -32,7 +32,7 @@ describe("Db2Formatter", function() {
             "  col\n" +
             "FROM\n" +
             "  -- This is a comment\n" +
-            "  MyTable;\n"
+            "  MyTable;"
         );
     });
 
@@ -46,14 +46,14 @@ describe("Db2Formatter", function() {
             "  col#1,\n" +
             "  @col2\n" +
             "FROM\n" +
-            "  tbl\n"
+            "  tbl"
         );
     });
 
     it("recognizes :variables", function() {
         expect(sqlFormatter.format("SELECT :variable;", {language: "db2"})).toBe(
             "SELECT\n" +
-            "  :variable;\n"
+            "  :variable;"
         );
     });
 
@@ -64,7 +64,7 @@ describe("Db2Formatter", function() {
         );
         expect(result).toBe(
             "SELECT\n" +
-            "  \"variable value\"\n"
+            "  \"variable value\""
         );
     });
 });
diff --git a/test/N1qlFormatterTest.js b/test/N1qlFormatterTest.js
@@ -10,7 +10,7 @@ describe("N1qlFormatter", function() {
             "SELECT\n" +
             "  orderlines[0].productId\n" +
             "FROM\n" +
-            "  orders;\n"
+            "  orders;"
         );
     });
 
@@ -26,7 +26,7 @@ describe("N1qlFormatter", function() {
             "FROM\n" +
             "  tutorial\n" +
             "USE KEYS\n" +
-            "  ['dave', 'ian'];\n"
+            "  ['dave', 'ian'];"
         );
     });
 
@@ -39,7 +39,7 @@ describe("N1qlFormatter", function() {
             "INSERT INTO\n" +
             "  heroes (KEY, VALUE)\n" +
             "VALUES\n" +
-            "  ('123', {'id': 1, 'type': 'Tarzan'});\n"
+            "  ('123', {'id': 1, 'type': 'Tarzan'});"
         );
     });
 
@@ -67,7 +67,7 @@ describe("N1qlFormatter", function() {
             "      ],\n" +
             "      'hello': 'world'\n" +
             "    }\n" +
-            "  );\n"
+            "  );"
         );
     });
 
@@ -82,7 +82,7 @@ describe("N1qlFormatter", function() {
             "FROM\n" +
             "  tutorial\n" +
             "UNNEST\n" +
-            "  tutorial.children c;\n"
+            "  tutorial.children c;"
         );
     });
 
@@ -101,7 +101,7 @@ describe("N1qlFormatter", function() {
             "USE KEYS\n" +
             "  'Elinor_33313792'\n" +
             "NEST\n" +
-            "  orders_with_users orders ON KEYS ARRAY s.order_id FOR s IN usr.shipped_order_history END;\n"
+            "  orders_with_users orders ON KEYS ARRAY s.order_id FOR s IN usr.shipped_order_history END;"
         );
     });
 
@@ -114,7 +114,7 @@ describe("N1qlFormatter", function() {
             "EXPLAIN DELETE FROM\n" +
             "  tutorial t\n" +
             "USE KEYS\n" +
-            "  'baldwin' RETURNING t\n"
+            "  'baldwin' RETURNING t"
         );
     });
 
@@ -129,7 +129,7 @@ describe("N1qlFormatter", function() {
             "USE KEYS\n" +
             "  'baldwin'\n" +
             "SET\n" +
-            "  type = 'actor' RETURNING tutorial.type\n"
+            "  type = 'actor' RETURNING tutorial.type"
         );
     });
 
@@ -143,7 +143,7 @@ describe("N1qlFormatter", function() {
             "  $variable,\n" +
             "  $'var name',\n" +
             "  $\"var name\",\n" +
-            "  $`var name`;\n"
+            "  $`var name`;"
         );
     });
 
@@ -162,7 +162,7 @@ describe("N1qlFormatter", function() {
             "  \"variable value\",\n" +
             "  'var value',\n" +
             "  'var value',\n" +
-            "  'var value';\n"
+            "  'var value';"
         );
     });
 
@@ -179,7 +179,7 @@ describe("N1qlFormatter", function() {
             "SELECT\n" +
             "  second,\n" +
             "  third,\n" +
-            "  first;\n"
+            "  first;"
         );
     });
 });
diff --git a/test/StandardSqlFormatterTest.js b/test/StandardSqlFormatterTest.js
@@ -12,7 +12,7 @@ describe("StandardSqlFormatter", function() {
             "ALTER TABLE\n" +
             "  supplier\n" +
             "MODIFY\n" +
-            "  supplier_name char(100) NOT NULL;\n"
+            "  supplier_name char(100) NOT NULL;"
         );
     });
 
@@ -24,13 +24,13 @@ describe("StandardSqlFormatter", function() {
             "ALTER TABLE\n" +
             "  supplier\n" +
             "ALTER COLUMN\n" +
-            "  supplier_name VARCHAR(100) NOT NULL;\n"
+            "  supplier_name VARCHAR(100) NOT NULL;"
         );
     });
 
     it("recognizes [] strings", function() {
-        expect(sqlFormatter.format("[foo JOIN bar]")).toBe("[foo JOIN bar]\n");
-        expect(sqlFormatter.format("[foo ]] JOIN bar]")).toBe("[foo ]] JOIN bar]\n");
+        expect(sqlFormatter.format("[foo JOIN bar]")).toBe("[foo JOIN bar]");
+        expect(sqlFormatter.format("[foo ]] JOIN bar]")).toBe("[foo ]] JOIN bar]");
     });
 
     it("recognizes @variables", function() {
@@ -44,7 +44,7 @@ describe("StandardSqlFormatter", function() {
             "  @'var name',\n" +
             "  @\"var name\",\n" +
             "  @`var name`,\n" +
-            "  @[var name];\n"
+            "  @[var name];"
         );
     });
 
@@ -68,7 +68,7 @@ describe("StandardSqlFormatter", function() {
             "  'var value',\n" +
             "  'var value',\n" +
             "  'var value',\n" +
-            "  'var\\ value';\n"
+            "  'var\\ value';"
         );
     });
 
@@ -83,7 +83,7 @@ describe("StandardSqlFormatter", function() {
             "  :'var name',\n" +
             "  :\"var name\",\n" +
             "  :`var name`,\n" +
-            "  :[var name];\n"
+            "  :[var name];"
         );
     });
 
@@ -110,7 +110,7 @@ describe("StandardSqlFormatter", function() {
             "  'var value',\n" +
             "  'var value',\n" +
             "  'weirder value',\n" +
-            "  'super weird value';\n"
+            "  'super weird value';"
         );
     });
 
@@ -120,7 +120,7 @@ describe("StandardSqlFormatter", function() {
             "SELECT\n" +
             "  ?1,\n" +
             "  ?25,\n" +
-            "  ?;\n"
+            "  ?;"
         );
     });
 
@@ -136,7 +136,7 @@ describe("StandardSqlFormatter", function() {
             "SELECT\n" +
             "  second,\n" +
             "  third,\n" +
-            "  first;\n"
+            "  first;"
         );
     });
 
@@ -148,7 +148,7 @@ describe("StandardSqlFormatter", function() {
             "SELECT\n" +
             "  first,\n" +
             "  second,\n" +
-            "  third;\n"
+            "  third;"
         );
     });
 
@@ -161,7 +161,7 @@ describe("StandardSqlFormatter", function() {
             "  1\n" +
             "GO\n" +
             "SELECT\n" +
-            "  2\n"
+            "  2"
         );
     });
 
@@ -175,7 +175,7 @@ describe("StandardSqlFormatter", function() {
             "  b\n" +
             "FROM\n" +
             "  t\n" +
-            "  CROSS JOIN t2 on t.id = t2.id_t\n"
+            "  CROSS JOIN t2 on t.id = t2.id_t"
         );
     });
 
@@ -189,7 +189,7 @@ describe("StandardSqlFormatter", function() {
             "  b\n" +
             "FROM\n" +
             "  t\n" +
-            "  CROSS APPLY fn(t.id)\n"
+            "  CROSS APPLY fn(t.id)"
         );
     });
 
@@ -200,15 +200,15 @@ describe("StandardSqlFormatter", function() {
             "  N,\n" +
             "  M\n" +
             "FROM\n" +
-            "  t\n"
+            "  t"
         );
     });
 
     it("formats simple SELECT with national characters (MSSQL)", function() {
         const result = sqlFormatter.format("SELECT N'value'");
         expect(result).toBe(
             "SELECT\n" +
-            "  N'value'\n"
+            "  N'value'"
         );
     });
 
@@ -222,7 +222,7 @@ describe("StandardSqlFormatter", function() {
             "  b\n" +
             "FROM\n" +
             "  t\n" +
-            "  OUTER APPLY fn(t.id)\n"
+            "  OUTER APPLY fn(t.id)"
         );
     });
 
@@ -231,7 +231,7 @@ describe("StandardSqlFormatter", function() {
             "SELECT\n" +
             "  a #comment, here\n" +
             "FROM\n" +
-            "  b --comment\n"
+            "  b --comment"
         );
     });
 });
diff --git a/test/behavesLikeSqlFormatter.js b/test/behavesLikeSqlFormatter.js

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export default class Formatter {`
`30`	`30`	`const tokens = this.tokenizer.tokenize(query);`
`31`	`31`	`const formattedQuery = this.getFormattedQueryFromTokens(tokens);`
`32`	`32`
`33`		`- return formattedQuery.trim() + "\n";`
	`33`	`+ return formattedQuery.trim();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`getFormattedQueryFromTokens(tokens) {`