diff options
| author | Peter Eisentraut | 2014-07-15 12:25:27 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2014-07-15 12:31:50 +0000 |
| commit | d38228fe4029cce3af396bf5b1728d8000ab32c8 (patch) | |
| tree | 92124e3c246ba17e838ba43179945cbcf0aac5ec /src/test | |
| parent | a16bac36eca8158cbf78987e95376f610095f792 (diff) | |
Add missing serial commas
Also update one place where the wal_level "logical" was not added to an
error message.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/expected/json.out | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/json_1.out | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/regress/expected/json.out b/src/test/regress/expected/json.out index 99036a23ca8..cd6ea5b12d5 100644 --- a/src/test/regress/expected/json.out +++ b/src/test/regress/expected/json.out @@ -1152,11 +1152,11 @@ SELECT json_build_object(1,2); SELECT json_build_object(null,2); ERROR: arg 1: key cannot be null 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 +ERROR: key value must be scalar, not array, composite, or json SELECT json_build_object(json '{"a":1,"b":2}', 3); -ERROR: key value must be scalar, not array, composite or json +ERROR: key value must be scalar, not array, composite, or json SELECT json_build_object('{1,2,3}'::int[], 3); -ERROR: key value must be scalar, not array, composite or json +ERROR: key value must be scalar, not array, composite, or json CREATE TEMP TABLE foo (serial_num int, name text, type text); INSERT INTO foo VALUES (847001,'t15','GE1043'); INSERT INTO foo VALUES (847002,'t16','GE1043'); diff --git a/src/test/regress/expected/json_1.out b/src/test/regress/expected/json_1.out index e74aabec8a1..51657a8d70f 100644 --- a/src/test/regress/expected/json_1.out +++ b/src/test/regress/expected/json_1.out @@ -1148,11 +1148,11 @@ SELECT json_build_object(1,2); SELECT json_build_object(null,2); ERROR: arg 1: key cannot be null 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 +ERROR: key value must be scalar, not array, composite, or json SELECT json_build_object(json '{"a":1,"b":2}', 3); -ERROR: key value must be scalar, not array, composite or json +ERROR: key value must be scalar, not array, composite, or json SELECT json_build_object('{1,2,3}'::int[], 3); -ERROR: key value must be scalar, not array, composite or json +ERROR: key value must be scalar, not array, composite, or json CREATE TEMP TABLE foo (serial_num int, name text, type text); INSERT INTO foo VALUES (847001,'t15','GE1043'); INSERT INTO foo VALUES (847002,'t16','GE1043'); |