Fix json tests

Nikita Glukhov · Nikita Glukhov · commit 7ace23a35594 · 2021-03-29T20:40:13.000+03:00
diff --git a/src/test/regress/expected/json.out b/src/test/regress/expected/json.out
@@ -4013,7 +4013,7 @@ select pg_column_size('{}'::json || '{}'::json) = pg_column_size('{}'::json);
  t
 (1 row)
 
-select pg_column_size('{"aa":1}'::json || '{"b":2}'::json) = pg_column_size('{"aa":1, "b":2}'::json);
+select pg_column_size('{"aa":1}'::json || '{"b":2}'::json) = pg_column_size('{"aa": 1, "b": 2}'::json);
  ?column? 
 ----------
  t
@@ -4091,7 +4091,7 @@ select '{"a":1 , "b":2, "c":3}'::json - 'd';
  {"a": 1, "b": 2, "c": 3}
 (1 row)
 
-select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a":1, "b":2}'::json);
+select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a": 1, "b": 2}'::json);
  ?column? 
 ----------
  t
diff --git a/src/test/regress/expected/json_encoding.out b/src/test/regress/expected/json_encoding.out
@@ -48,9 +48,9 @@ SELECT '"\uaBcD"'::json;		-- OK, uppercase and lower case both OK
 
 -- handling of unicode surrogate pairs
 select json '{ "a":  "\ud83d\ude04\ud83d\udc36" }' -> 'a' as correct_in_utf8;
-      correct_in_utf8       
-----------------------------
- "\ud83d\ude04\ud83d\udc36"
+ correct_in_utf8 
+-----------------
+ "😄🐶"
 (1 row)
 
 select json '{ "a":  "\ud83d\ud83d" }' -> 'a'; -- 2 high surrogates in a row
diff --git a/src/test/regress/sql/json.sql b/src/test/regress/sql/json.sql
@@ -1167,7 +1167,7 @@ select '{"c": 1}'::json || '["a", "b"]';
 select '{}'::json || '{"cq":"l", "b":"g", "fg":false}';
 
 select pg_column_size('{}'::json || '{}'::json) = pg_column_size('{}'::json);
-select pg_column_size('{"aa":1}'::json || '{"b":2}'::json) = pg_column_size('{"aa":1, "b":2}'::json);
+select pg_column_size('{"aa":1}'::json || '{"b":2}'::json) = pg_column_size('{"aa": 1, "b": 2}'::json);
 select pg_column_size('{"aa":1, "b":2}'::json || '{}'::json) = pg_column_size('{"aa":1, "b":2}'::json);
 select pg_column_size('{}'::json || '{"aa":1, "b":2}'::json) = pg_column_size('{"aa":1, "b":2}'::json);
 
@@ -1181,7 +1181,7 @@ select '{"a":null , "b":2, "c":3}'::json - 'a';
 select '{"a":1 , "b":2, "c":3}'::json - 'b';
 select '{"a":1 , "b":2, "c":3}'::json - 'c';
 select '{"a":1 , "b":2, "c":3}'::json - 'd';
-select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a":1, "b":2}'::json);
+select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a": 1, "b": 2}'::json);
 
 select '["a","b","c"]'::json - 3;
 select '["a","b","c"]'::json - 2;

Original file line number	Diff line number	Diff line change
`@@ -4013,7 +4013,7 @@ select pg_column_size('{}'::json \|\| '{}'::json) = pg_column_size('{}'::json);`
`4013`	`4013`	`t`
`4014`	`4014`	`(1 row)`
`4015`	`4015`
`4016`		`-select pg_column_size('{"aa":1}'::json \|\| '{"b":2}'::json) = pg_column_size('{"aa":1, "b":2}'::json);`
	`4016`	`+select pg_column_size('{"aa":1}'::json \|\| '{"b":2}'::json) = pg_column_size('{"aa": 1, "b": 2}'::json);`
`4017`	`4017`	`?column?`
`4018`	`4018`	`----------`
`4019`	`4019`	`t`
`@@ -4091,7 +4091,7 @@ select '{"a":1 , "b":2, "c":3}'::json - 'd';`
`4091`	`4091`	`{"a": 1, "b": 2, "c": 3}`
`4092`	`4092`	`(1 row)`
`4093`	`4093`
`4094`		`-select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a":1, "b":2}'::json);`
	`4094`	`+select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a": 1, "b": 2}'::json);`
`4095`	`4095`	`?column?`
`4096`	`4096`	`----------`
`4097`	`4097`	`t`