Some minor fixes

Author: mtxr

src/core/Tokenizer.js

@@ -54,7 +54,7 @@ export default class Tokenizer {
     // 2. square bracket quoted string (SQL Server) using ]] to escape
     // 3. double quoted string using "" or \" to escape
     // 4. single quoted string using '' or \' to escape
-    // 5. national character single quoted string using N'' or \' to escape
+    // 5. national character quoted string using N'' or N\' to escape
     createStringPattern(stringTypes) {
         const patterns = {
             "\"\"": "((\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*(\"|$))+)",

test/StandardSqlFormatterTest.js

@@ -210,41 +210,10 @@ describe("StandardSqlFormatter", function() {
         );
     });
 
-    it("formats simple SELECT with national character (MSSQL)", function() {
-        const result = sqlFormatter.format(
-            "SELECT N'value';"
-        );
-        expect(result).toBe(
-            "SELECT\n" +
-            "  N'value';\n"
-        );
-    });
-
     it("formats SELECT with complex WHERE", function() {
         const result = sqlFormatter.format(
-            "SELECT * FROM foo WHERE Column1 = 'testing' " +
-            "AND ( (Column2 = Column3 OR Column4 >= NOW()) );"
-        );
-        expect(result).toBe(
-            "SELECT\n" +
-            "  *\n" +
-            "FROM\n" +
-            "  foo\n" +
-            "WHERE\n" +
-            "  Column1 = 'testing'\n" +
-            "  AND (\n" +
-            "    (\n" +
-            "      Column2 = Column3\n" +
-            "      OR Column4 >= NOW()\n" +
-            "    )\n" +
-            "  );\n"
-        );
-    });
-
-    it("formats SELECT with complex WHERE with national characters (MSSQL)", function() {
-        const result = sqlFormatter.format(
-            "SELECT * FROM foo WHERE Column1 = N'testing' " +
-            "AND ( (Column2 = Column3 OR Column4 >= NOW()) );"
+            "SELECT * FROM foo WHERE Column1 = N'testing' AND Column2 = 'testing'" +
+            "AND ( (Column3 = Column4 OR Column5 >= NOW()) );"
         );
         expect(result).toBe(
             "SELECT\n" +
@@ -253,10 +222,11 @@ describe("StandardSqlFormatter", function() {
             "  foo\n" +
             "WHERE\n" +
             "  Column1 = N'testing'\n" +
+            "  AND Column2 = 'testing'\n" +
             "  AND (\n" +
             "    (\n" +
-            "      Column2 = Column3\n" +
-            "      OR Column4 >= NOW()\n" +
+            "      Column3 = Column4\n" +
+            "      OR Column5 >= NOW()\n" +
             "    )\n" +
             "  );\n"
         );

test/behavesLikeSqlFormatter.js

@@ -8,7 +8,7 @@ export default function behavesLikeSqlFormatter(language) {
     it("uses given indent config for indention", function() {
         const result = sqlFormatter.format(
             "SELECT count(*),Column1 FROM Table1;",
-            { language, indent: "    " }
+            {language, indent: "    "}
         );
 
         expect(result).toBe(