projects
/
postgresql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6805e02
)
Fix alternate regression test output file.
author
Robert Haas
Wed, 6 Aug 2014 15:18:38 +0000
(11:18 -0400)
committer
Robert Haas
Wed, 6 Aug 2014 15:30:32 +0000
(11:30 -0400)
Commit
0ef99bdce3a6cd3195d7df12093042c16328c71c
broke this.
Jeff Janes
src/test/regress/expected/json_1.out
patch
|
blob
|
blame
|
history
diff --git
a/src/test/regress/expected/json_1.out
b/src/test/regress/expected/json_1.out
index 2f8e8b0a9cbbb677e5d6afd220b827eb399e2ea4..bfec32ffe7edeeb3367e1e3de961186765da18d9 100644
(file)
--- a/
src/test/regress/expected/json_1.out
+++ b/
src/test/regress/expected/json_1.out
@@
-1146,7
+1146,8
@@
SELECT json_build_object(1,2);
-- keys must be scalar and not null
SELECT json_build_object(null,2);
-ERROR: arg 1: key cannot be null
+ERROR: argument 1 cannot be null
+HINT: Object keys should be text.
SELECT json_build_object(r,2) FROM (SELECT 1 AS a, 2 AS b) r;
ERROR: key value must be scalar, not array, composite, or json
SELECT json_build_object(json '{"a":1,"b":2}', 3);