diff options
| author | Pavan Deolasee | 2017-06-15 07:41:07 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-06-15 07:41:07 +0000 |
| commit | 0ffa504a17f58f2bc045b0039f40e4917ee50d20 (patch) | |
| tree | c629c449bcfcc45de1d03b2586e89932d546e8ba /src/backend/utils/adt/json.c | |
| parent | 36ccc8d64e61fe9d77bb7ac62267945f7c146baa (diff) | |
| parent | e800656d9a9b40b2f55afabe76354ab6d93353b3 (diff) | |
Merge 'remotes/PGSQL/master' into xl10devel
Merge upstream master branch upto e800656d9a9b40b2f55afabe76354ab6d93353b3.
Code compiles and regression works ok (with lots and lots of failures though).
Diffstat (limited to 'src/backend/utils/adt/json.c')
| -rw-r--r-- | src/backend/utils/adt/json.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index 47371ab7cb..0f99b613f5 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -2008,7 +2008,7 @@ json_object_agg_transfn(PG_FUNCTION_ARGS) if (arg_type == InvalidOid) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("could not determine data type for argument 1"))); + errmsg("could not determine data type for argument %d", 1))); json_categorize_type(arg_type, &state->key_category, &state->key_output_func); @@ -2018,7 +2018,7 @@ json_object_agg_transfn(PG_FUNCTION_ARGS) if (arg_type == InvalidOid) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("could not determine data type for argument 2"))); + errmsg("could not determine data type for argument %d", 2))); json_categorize_type(arg_type, &state->val_category, &state->val_output_func); |