Merge pull request #21 from mtxr/master

Better formatting for MSSQL when using National Characters

Author: ukupat

src/core/Tokenizer.js

@@ -54,10 +54,12 @@ 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 quoted string using N'' or N\' to escape
     createStringPattern(stringTypes) {
         const patterns = {
             "\"\"": "((\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*(\"|$))+)",
             "''": "(('[^'\\\\]*(?:\\\\.[^'\\\\]*)*('|$))+)",
+            "N''": "((N'[^N'\\\\]*(?:\\\\.[^N'\\\\]*)*('|$))+)",
             "``": "((`[^`]*($|`))+)",
             "[]": "((\\[[^\\]]*($|\\]))(\\][^\\]]*($|\\]))*)",
         };

src/languages/StandardSqlFormatter.js

@@ -73,7 +73,7 @@ export default class StandardSqlFormatter {
                 reservedWords,
                 reservedToplevelWords,
                 reservedNewlineWords,
-                stringTypes: [`""`, "''", "``", "[]"],
+                stringTypes: [`""`, "N''", "''", "``", "[]"],
                 openParens: ["("],
                 closeParens: [")"],
                 indexedPlaceholderTypes: ["?"],

test/StandardSqlFormatterTest.js

@@ -202,6 +202,36 @@ describe("StandardSqlFormatter", function() {
         );
     });
 
+    it("formats simple SELECT", function() {
+        const result = sqlFormatter.format("SELECT 'value'", );
+        expect(result).toBe(
+            "SELECT\n" +
+            "  'value'\n"
+        );
+    });
+
+    it("formats SELECT with complex WHERE", function() {
+        const result = sqlFormatter.format(
+            "SELECT * FROM foo WHERE Column1 = N'testing' AND Column2 = 'testing'" +
+            "AND ( (Column3 = Column4 OR Column5 >= NOW()) );"
+        );
+        expect(result).toBe(
+            "SELECT\n" +
+            "  *\n" +
+            "FROM\n" +
+            "  foo\n" +
+            "WHERE\n" +
+            "  Column1 = N'testing'\n" +
+            "  AND Column2 = 'testing'\n" +
+            "  AND (\n" +
+            "    (\n" +
+            "      Column3 = Column4\n" +
+            "      OR Column5 >= NOW()\n" +
+            "    )\n" +
+            "  );\n"
+        );
+    });
+
     it("formats SELECT query with OUTER APPLY", function() {
         const result = sqlFormatter.format("SELECT a, b FROM t OUTER APPLY fn(t.id)", {
             language: "sql",

test/behavesLikeSqlFormatter.js

@@ -60,27 +60,6 @@ export default function behavesLikeSqlFormatter(language) {
         );
     });
 
-    it("formats SELECT with complex WHERE", function() {
-        const result = 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 toplevel reserved words", function() {
         const result = format(
             "SELECT * FROM foo WHERE name = 'John' GROUP BY some_column " +