diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/json.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/json.out
--- C:/cirrus/src/test/regress/expected/json.out	2024-09-21 22:21:22.930466100 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/json.out	2024-09-21 22:24:47.210708000 +0000
@@ -2728,19 +2728,19 @@
 select (test_json_dot.test_json).b, json_query(test_json, 'lax $.b' WITH CONDITIONAL WRAPPER NULL ON EMPTY NULL ON ERROR) as expected from test_json_dot;
       b      |  expected   
 -------------+-------------
- [42]        | [42]
+ 42          | 42
  {"c": 42}   | {"c": 42}
  {"c": "42"} | {"c": "42"}
  {"c": "42"} | {"c": "42"}
 (4 rows)
 
 select (test_json_dot.test_json).b.c, json_query(test_json, 'lax $.b.c' WITH CONDITIONAL WRAPPER NULL ON EMPTY NULL ON ERROR) as expected from test_json_dot;
-   c    | expected 
---------+----------
-        | 
- [42]   | [42]
- ["42"] | ["42"]
- ["42"] | ["42"]
+  c   | expected 
+------+----------
+      | 
+ 42   | 42
+ "42" | "42"
+ "42" | "42"
 (4 rows)
 
 select (test_json_dot.test_json).d, json_query(test_json, 'lax $.d' WITH CONDITIONAL WRAPPER NULL ON EMPTY NULL ON ERROR) as expected from test_json_dot;
@@ -2780,7 +2780,7 @@
 -----------------+-----------------
                  | 
                  | 
- [11]            | [11]
+ 11              | 11
  {"x": [11, 12]} | {"x": [11, 12]}
 (4 rows)
 
@@ -2789,7 +2789,7 @@
 -----------------+-----------------
                  | 
                  | 
- [12]            | [12]
+ 12              | 12
  {"y": [21, 22]} | {"y": [21, 22]}
 (4 rows)
 
diff --strip-trailing-cr -U3 C:/cirrus/src/test/regress/expected/jsonb.out C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb.out
--- C:/cirrus/src/test/regress/expected/jsonb.out	2024-09-21 22:21:22.933386700 +0000
+++ C:/cirrus/build/testrun/pg_upgrade/002_pg_upgrade/data/results/jsonb.out	2024-09-21 22:24:47.757580900 +0000
@@ -5726,17 +5726,17 @@
 select (test_jsonb_dot.test_jsonb).b from test_jsonb_dot;
       b      
 -------------
- [42]
+ 42
  {"c": 42}
  {"c": "42"}
 (3 rows)
 
 select (test_jsonb_dot.test_jsonb).b.c from test_jsonb_dot;
-   c    
---------
+  c   
+------
  
- [42]
- ["42"]
+ 42
+ "42"
 (3 rows)
 
 select (test_json_dot.test_json).d from test_json_dot;
@@ -5763,11 +5763,11 @@
                                          ^
 -- array element access
 select (test_jsonb_dot.test_jsonb).d[0] from test_jsonb_dot;
-  d   
-------
+ d  
+----
  
  
- [11]
+ 11
 (3 rows)
 
 -- wildcard member access