Merge pull request #60 from matteobortolazzo/dev

1.2.1 Fix JSON content as value

Author: matteobortolazzo

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.2.1 (2020-02-25)
+
+## Bug Fix
+* **JSON content:** Fix issue with JSON content as a value. ([#PR59](https://github.com/matteobortolazzo/couchdb-net/pull/59))
+
 # 1.2.0 (2020-01-24)
 
 ## Features

LATEST_CHANGE.md

@@ -1,2 +1,2 @@
-## Features
-* **Attachments:** Adds support for attachments. ([#PR56](https://github.com/matteobortolazzo/couchdb-net/pull/56))
+## Bug Fix
+* **JSON content:** Fix issue with JSON content as a value. ([#PR59](https://github.com/matteobortolazzo/couchdb-net/pull/59))

src/CouchDB.Driver/Translators/ConstantExpressionTranslator.cs

@@ -36,7 +36,7 @@ private void HandleConstant(object constant)
                         _sb.Append(((bool)constant) ? "true" : "false");
                         break;
                     case TypeCode.String:
-                        _sb.Append($"\"{constant}\"");
+                        _sb.Append(JsonConvert.SerializeObject(constant));
                         break;
                     case TypeCode.DateTime:
                         _sb.Append(JsonConvert.SerializeObject(constant));

tests/CouchDB.Driver.UnitTests/Find/Find_Selector.cs

@@ -110,5 +110,11 @@ public void Variable_Bool_ExplicitNotFalse()
             var json = _rebels.Where(r => r.IsJedi != false).OrderBy(r => r.IsJedi).ToString();
             Assert.Equal(@"{""selector"":{""isJedi"":{""$ne"":false}},""sort"":[""isJedi""]}", json);
         }
+        [Fact]
+        public void Variable_String_IsJsonEscaped()
+        {
+            var json = _rebels.Where(r => r.Name == @"Chewbacca (""Chewie"")").ToString();
+            Assert.Equal(@"{""selector"":{""name"":""Chewbacca (\""Chewie\"")""}}", json);
+        }
     }
 }