From db6587fd2928798dab9d815ea198e10c20090c42 Mon Sep 17 00:00:00 2001
From: Pavel Safronov <pavel@dolthub.com>
Date: Fri, 31 Mar 2023 16:11:34 -0700
Subject: [PATCH] Adding BATS fixes for GMS JSON change.

---
 integration-tests/bats/json-new-fmt.bats      | 65 ++++++++++---------
 .../bats/sql-vertical-format.expect           |  2 +-
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/integration-tests/bats/json-new-fmt.bats b/integration-tests/bats/json-new-fmt.bats
index 550ccd4d31..2209537fd2 100644
--- a/integration-tests/bats/json-new-fmt.bats
+++ b/integration-tests/bats/json-new-fmt.bats
@@ -33,23 +33,23 @@ SQL
 SQL
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":1}"' ]
-    [ "${lines[2]}" = '2,"{""b"":2}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 1}"' ]
+    [ "${lines[2]}" = '2,"{""b"": 2}"' ]
 
     dolt sql <<SQL
     UPDATE js SET js = '{"c":3}' WHERE pk = 2;
 SQL
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":1}"' ]
-    [ "${lines[2]}" = '2,"{""c"":3}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 1}"' ]
+    [ "${lines[2]}" = '2,"{""c"": 3}"' ]
 
     dolt sql <<SQL
     DELETE FROM js WHERE pk = 2;
 SQL
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":1}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 1}"' ]
 }
 
 @test "json-new-fmt: JSON value printing" {
@@ -63,18 +63,18 @@ SQL
 
     run dolt sql -q "SELECT * FROM js;"
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = '+----+---------+' ]
-    [ "${lines[1]}" = '| pk | js      |' ]
-    [ "${lines[2]}" = '+----+---------+' ]
-    [ "${lines[3]}" = '| 1  | {"a":1} |' ]
-    [ "${lines[4]}" = '| 2  | {"b":2} |' ]
-    [ "${lines[5]}" = '+----+---------+' ]
+    [ "${lines[0]}" = '+----+----------+' ]
+    [ "${lines[1]}" = '| pk | js       |' ]
+    [ "${lines[2]}" = '+----+----------+' ]
+    [ "${lines[3]}" = '| 1  | {"a": 1} |' ]
+    [ "${lines[4]}" = '| 2  | {"b": 2} |' ]
+    [ "${lines[5]}" = '+----+----------+' ]
 
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = 'pk,js' ]
-    [ "${lines[1]}" = '1,"{""a"":1}"' ]
-    [ "${lines[2]}" = '2,"{""b"":2}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 1}"' ]
+    [ "${lines[2]}" = '2,"{""b"": 2}"' ]
 
     dolt sql -q "SELECT * FROM js;" -r json
     run dolt sql -q "SELECT * FROM js;" -r json
@@ -111,16 +111,17 @@ SQL
 
     dolt diff
     run dolt diff
+    echo "output: $output"
     [ "$status" -eq 0 ]
     [ "${lines[0]}"  = 'diff --dolt a/js b/js' ]
-    [ "${lines[3]}"  = '+---+----+----------+' ]
-    [ "${lines[4]}"  = '|   | pk | js       |' ]
-    [ "${lines[5]}"  = '+---+----+----------+' ]
-    [ "${lines[6]}"  = '| < | 1  | {"a":1}  |' ]
-    [ "${lines[7]}"  = '| > | 1  | {"a":11} |' ]
-    [ "${lines[8]}"  = '| - | 2  | {"b":2}  |' ]
-    [ "${lines[9]}"  = '| + | 3  | {"c":3}  |' ]
-    [ "${lines[10]}" = '+---+----+----------+' ]
+    [ "${lines[3]}"  = '+---+----+-----------+' ]
+    [ "${lines[4]}"  = '|   | pk | js        |' ]
+    [ "${lines[5]}"  = '+---+----+-----------+' ]
+    [ "${lines[6]}"  = '| < | 1  | {"a": 1}  |' ]
+    [ "${lines[7]}"  = '| > | 1  | {"a": 11} |' ]
+    [ "${lines[8]}"  = '| - | 2  | {"b": 2}  |' ]
+    [ "${lines[9]}"  = '| + | 3  | {"c": 3}  |' ]
+    [ "${lines[10]}" = '+---+----+-----------+' ]
 }
 
 @test "json-new-fmt: merge JSON values" {
@@ -151,8 +152,8 @@ SQL
     dolt merge other --no-commit
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":11}"' ]
-    [ "${lines[2]}" = '2,"{""b"":22}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 11}"' ]
+    [ "${lines[2]}" = '2,"{""b"": 22}"' ]
     dolt commit -am "merged other into main"
 
     # test merge conflicts
@@ -169,8 +170,8 @@ SQL
     [ "$status" -eq 0 ]
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":1}"' ]
-    [ "${lines[2]}" = '2,"{""b"":99}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 1}"' ]
+    [ "${lines[2]}" = '2,"{""b"": 99}"' ]
 }
 
     @test "json-new-fmt: merge JSON values with stored procedure" {
@@ -201,8 +202,8 @@ SQL
     dolt merge other --no-commit
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":11}"' ]
-    [ "${lines[2]}" = '2,"{""b"":22}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 11}"' ]
+    [ "${lines[2]}" = '2,"{""b"": 22}"' ]
     dolt commit -am "merged other into main"
 
     # test merge conflicts
@@ -219,8 +220,8 @@ SQL
     [ "$status" -eq 0 ]
     run dolt sql -q "SELECT * FROM js;" -r csv
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":1}"' ]
-    [ "${lines[2]}" = '2,"{""b"":99}"' ]
+    [ "${lines[1]}" = '1,"{""a"": 1}"' ]
+    [ "${lines[2]}" = '2,"{""b"": 99}"' ]
 }
 
 @test "json-new-fmt: insert value with special characters" {
@@ -232,8 +233,9 @@ SQL
     INSERT INTO js VALUES (1, '{"a":"<>&"}');
 SQL
     run dolt sql -q "SELECT * FROM js;" -r csv
+    echo "output: $output"
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"{""a"":""<>&""}"' ]
+    [ "${lines[1]}" = '1,"{""a"": ""<>&""}"' ]
 }
 
 
@@ -246,8 +248,9 @@ SQL
     INSERT INTO js VALUES (1, '[{"a":"<>&"}]');
 SQL
     run dolt sql -q "SELECT * FROM js;" -r csv
+    echo "output: $output"
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = '1,"[{""a"":""<>&""}]"' ]
+    [ "${lines[1]}" = '1,"[{""a"": ""<>&""}]"' ]
 }
 
 @test "json-new-fmt: json casting behavior" {
diff --git a/integration-tests/bats/sql-vertical-format.expect b/integration-tests/bats/sql-vertical-format.expect
index ac0f094d2c..36db35af0a 100644
--- a/integration-tests/bats/sql-vertical-format.expect
+++ b/integration-tests/bats/sql-vertical-format.expect
@@ -42,7 +42,7 @@ expect {
 }
 
 expect {
-   "*JSON_OBJECT('id', 87, 'name', 'carrot'): {\"id\":87,\"name\":\"carrot\"}*" { exit 0 ; }
+   "*JSON_OBJECT('id', 87, 'name', 'carrot'): {\"id\": 87, \"name\": \"carrot\"}*" { exit 0 ; }
    timeout { puts "$TEST_FAILURE" }
    failed { puts "$TEST_FAILURE" }
 }