Escape only single quotes in nvarchar fpco#32

spencerjanssen · Mar 16, 2021 · 107435a · 107435a
1 parent 7c0cea4
commit 107435a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Database/ODBC/SQLServer.hs b/src/Database/ODBC/SQLServer.hs
@@ -515,10 +515,10 @@ escapeChar8 ch =
 
 -- | A very conservative character escape.
 escapeChar :: Char -> Text
-escapeChar ch =
-  if allowedChar ch
-     then T.singleton ch
-     else "'+NCHAR(" <> Formatting.sformat Formatting.int (fromEnum ch) <> ")+'"
+escapeChar =
+  \case 
+    '\'' -> "''"
+    ch -> T.singleton ch
 
 -- | Is the character allowed to be printed unescaped? We only print a
 -- small subset of ASCII just for visually debugging later

diff --git a/test/Main.hs b/test/Main.hs
@@ -124,6 +124,7 @@ regressions = do
 bigData :: Spec
 bigData = do
   roundtrip @Text "2MB text" "Text" "ntext" (T.replicate (1024*1024*2) "A")
+  roundtrip @Text "2MB text special characters" "Text" "ntext" (T.replicate (1024*1024*2) "<")
   roundtrip @ByteString "2MB binary" "ByteString" "text" (S.replicate (1024*1024*2) 97)
 
 conversionTo :: Spec