fix json encoding with execute

isoos · Aug 22, 2021 · e2d6a83 · e2d6a83
1 parent dc135e5
commit e2d6a83
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.4.1+2
+
+- Fix error when sending json data with `execute()` [#11](https://github.com/isoos/postgresql-dart/pull/11)
+
 ## 2.4.1+1
 
 - Fix error when passing `allowReuse: null` into `query()` [#8](https://github.com/isoos/postgresql-dart/pull/8)

diff --git a/lib/src/text_codec.dart b/lib/src/text_codec.dart
@@ -29,7 +29,7 @@ class PostgresTextEncoder {
     }
 
     if (value is Map) {
-      return _encodeJSON(value);
+      return _encodeJSON(value, escapeStrings);
     }
 
     if (value is PgPoint) {
@@ -152,7 +152,7 @@ class PostgresTextEncoder {
     return "'$string'";
   }
 
-  String _encodeJSON(dynamic value) {
+  String _encodeJSON(dynamic value, bool escapeStrings) {
     if (value == null) {
       return 'null';
     }
@@ -161,7 +161,7 @@ class PostgresTextEncoder {
       return "'${json.encode(value)}'";
     }
 
-    return json.encode(value);
+    return _encodeString(json.encode(value), escapeStrings);
   }
 
   String _encodePoint(PgPoint value) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: postgres
 description: PostgreSQL database driver. Supports statement reuse and binary protocol.
-version: 2.4.1+1
+version: 2.4.1+2
 homepage: https://github.com/isoos/postgresql-dart
 
 environment:

diff --git a/test/encoding_test.dart b/test/encoding_test.dart
@@ -546,9 +546,12 @@ void main() {
     });
 
     test('Encode JSONB', () {
-      expect(encoder.convert({'a': 'b'}), '{"a":"b"}');
-      expect(encoder.convert({'a': true}), '{"a":true}');
-      expect(encoder.convert({'b': false}), '{"b":false}');
+      expect(encoder.convert({'a': 'b'}, escapeStrings: false), '{"a":"b"}');
+      expect(encoder.convert({'a': true}, escapeStrings: false), '{"a":true}');
+      expect(
+          encoder.convert({'b': false}, escapeStrings: false), '{"b":false}');
+      expect(encoder.convert({'a': true}), '\'{"a":true}\'');
+      expect(encoder.convert({'b': false}), '\'{"b":false}\'');
     });
 
     test('Attempt to infer unknown type throws exception', () {