Fix json tests

Nikita Glukhov · Nikita Glukhov · commit 11c9650d8782 · 2020-12-07T21:22:35.000+03:00
diff --git a/src/test/regress/expected/json.out b/src/test/regress/expected/json.out
@@ -3970,7 +3970,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
@@ -4048,7 +4048,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
@@ -1150,7 +1150,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);
 
@@ -1164,7 +1164,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
`@@ -3970,7 +3970,7 @@ select pg_column_size('{}'::json \|\| '{}'::json) = pg_column_size('{}'::json);`
`3970`	`3970`	`t`
`3971`	`3971`	`(1 row)`
`3972`	`3972`
`3973`		`-select pg_column_size('{"aa":1}'::json \|\| '{"b":2}'::json) = pg_column_size('{"aa":1, "b":2}'::json);`
	`3973`	`+select pg_column_size('{"aa":1}'::json \|\| '{"b":2}'::json) = pg_column_size('{"aa": 1, "b": 2}'::json);`
`3974`	`3974`	`?column?`
`3975`	`3975`	`----------`
`3976`	`3976`	`t`
`@@ -4048,7 +4048,7 @@ select '{"a":1 , "b":2, "c":3}'::json - 'd';`
`4048`	`4048`	`{"a": 1, "b": 2, "c": 3}`
`4049`	`4049`	`(1 row)`
`4050`	`4050`
`4051`		`-select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a":1, "b":2}'::json);`
	`4051`	`+select pg_column_size('{"a":1 , "b":2, "c":3}'::json - 'b') = pg_column_size('{"a": 1, "b": 2}'::json);`
`4052`	`4052`	`?column?`
`4053`	`4053`	`----------`
`4054`	`4054`	`t`