Support string json in json values (#4988)

knex · Jan 31, 2022 · 2986f8c · 2986f8c
1 parent f9f6a38
commit 2986f8c
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 3 deletions.
diff --git a/lib/query/querycompiler.js b/lib/query/querycompiler.js
@@ -1076,10 +1076,14 @@ class QueryCompiler {
   }
 
   _jsonWrapValue(jsonValue) {
-    if (this.builder._isJsonObject(jsonValue)) {
-      return JSON.stringify(jsonValue);
+    if (!this.builder._isJsonObject(jsonValue)) {
+      try {
+        return JSON.stringify(JSON.parse(jsonValue.replace(/\n|\t/g, '')));
+      } catch (e) {
+        return jsonValue;
+      }
     }
-    return jsonValue;
+    return JSON.stringify(jsonValue);
   }
 
   _jsonValueClause(statement) {

diff --git a/test/integration2/query/select/where.spec.js b/test/integration2/query/select/where.spec.js
@@ -637,6 +637,22 @@ describe('Where', function () {
           });
         });
 
+        it('where json object with string object', async () => {
+          const result = await knex('cities')
+            .select('name')
+            .whereJsonObject(
+              'descriptions',
+              `{
+              "type": "bigcity",
+              "short": "beautiful city",
+              "long": "beautiful and dirty city"
+            }`
+            );
+          expect(result[0]).to.eql({
+            name: 'Paris',
+          });
+        });
+
         it('where not json object', async () => {
           const result = await knex('cities')
             .select('name')
@@ -708,6 +724,24 @@ describe('Where', function () {
           ]);
         });
 
+        it('where json superset of with string', async function () {
+          if (!(isPostgreSQL(knex) || isMysql(knex))) {
+            this.skip();
+          }
+          const result = await knex('cities')
+            .select('name')
+            .whereJsonSupersetOf('descriptions', '{"type": "bigcity"}');
+          expect(result.length).to.equal(2);
+          assertJsonEquals(result, [
+            {
+              name: 'Paris',
+            },
+            {
+              name: 'Milan',
+            },
+          ]);
+        });
+
         it('where json subset of', async function () {
           if (!(isPostgreSQL(knex) || isMysql(knex))) {
             this.skip();

diff --git a/test/unit/query/builder.js b/test/unit/query/builder.js
@@ -10924,6 +10924,26 @@ describe('QueryBuilder', () => {
         );
       });
 
+      it('where a json column is a superset of value', async function () {
+        testsql(
+          qb().select().from('users').whereJsonSupersetOf('address', 'test'),
+          {
+            pg: {
+              sql: 'select * from "users" where "address" @> ?',
+              bindings: ['test'],
+            },
+            mysql: {
+              sql: 'select * from `users` where json_contains(`address`,?)',
+              bindings: ['test'],
+            },
+            cockroachdb: {
+              sql: 'select * from "users" where "address" @> ?',
+              bindings: ['test'],
+            },
+          }
+        );
+      });
+
       it('where a json column is not a superset of value', async function () {
         testsql(
           qb()