summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Frost2014-09-29 17:59:32 +0000
committerStephen Frost2014-09-29 17:59:32 +0000
commit08da8947f4b52ad41770f260a3962b032de77120 (patch)
tree3e71c3bafb341ee7bcd59f228725c2760bbd14c2
parentc8a026e4f15e2063cd7fe6cb9ffe44f2a81398bd (diff)
Also revert e3ec0728, JSON regression tests
Managed to forget to update the other JSON regression test output, again. Revert the commit which fixed it before. Per buildfarm.
-rw-r--r--src/test/regress/expected/json_1.out58
1 files changed, 0 insertions, 58 deletions
diff --git a/src/test/regress/expected/json_1.out b/src/test/regress/expected/json_1.out
index f3baf32ae29..83c1d7d492c 100644
--- a/src/test/regress/expected/json_1.out
+++ b/src/test/regress/expected/json_1.out
@@ -397,70 +397,12 @@ FROM rows q;
"y":"txt3"}
(3 rows)
-SELECT row_to_json(q,pretty := true)
-FROM rows q;
- row_to_json
---------------
- {"x":1, +
- "y":"txt1"}
- {"x":2, +
- "y":"txt2"}
- {"x":3, +
- "y":"txt3"}
-(3 rows)
-
SELECT row_to_json(row((select array_agg(x) as d from generate_series(5,10) x)),false);
row_to_json
-----------------------
{"f1":[5,6,7,8,9,10]}
(1 row)
-WITH x AS (SELECT a,b,c FROM (VALUES(10,20,30),
- (10,NULL, NULL),
- (NULL, NULL, NULL)) g(a,b,c))
- SELECT row_to_json(x, false, false) FROM x;
- row_to_json
-------------------------------
- {"a":10,"b":20,"c":30}
- {"a":10,"b":null,"c":null}
- {"a":null,"b":null,"c":null}
-(3 rows)
-
-WITH x AS (SELECT a,b,c FROM (VALUES(10,20,30),
- (10,NULL, NULL),
- (NULL, NULL, NULL)) g(a,b,c))
- SELECT row_to_json(x, false, true) FROM x;
- row_to_json
-------------------------
- {"a":10,"b":20,"c":30}
- {"a":10}
- {}
-(3 rows)
-
-WITH x AS (SELECT a,b,c FROM (VALUES(10,20,30),
- (10,NULL, NULL),
- (NULL, NULL, NULL)) g(a,b,c))
- SELECT row_to_json(x, ignore_nulls := true) FROM x;
- row_to_json
-------------------------
- {"a":10,"b":20,"c":30}
- {"a":10}
- {}
-(3 rows)
-
-WITH x AS (SELECT a,b,c FROM (VALUES(10,20,30),
- (10,NULL, NULL),
- (NULL, NULL, NULL)) g(a,b,c))
- SELECT row_to_json(x, ignore_nulls := true, pretty := true) FROM x;
- row_to_json
--------------
- {"a":10, +
- "b":20, +
- "c":30}
- {"a":10}
- {}
-(3 rows)
-
-- to_json, timestamps
select to_json(timestamp '2014-05-28 12:22:35.614298');
to_json