diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/jsonb_util.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index 4d733159d06..38e1db29e5a 100644 --- a/src/backend/utils/adt/jsonb_util.c +++ b/src/backend/utils/adt/jsonb_util.c @@ -509,8 +509,8 @@ fillJsonbValue(JsonbContainer *container, int index, * "raw scalar" pseudo array to append it - the actual scalar should be passed * next and it will be added as the only member of the array. * - * Values of type jvbBinary, which are rolled up arrays and objects, - * are unpacked before being added to the result. + * All non-scalar types (jvbBinary, jbvArray and jbvObject) passed as + * elements or values are unpacked before being added to the result. */ JsonbValue * pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq, @@ -522,14 +522,18 @@ pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq, JsonbIteratorToken tok; if (!jbval || (seq != WJB_ELEM && seq != WJB_VALUE) || - jbval->type != jbvBinary) + IsAJsonbScalar(jbval)) { /* drop through */ return pushJsonbValueScalar(pstate, seq, jbval); } - /* unpack the binary and add each piece to the pstate */ - it = JsonbIteratorInit(jbval->val.binary.data); + /* unpack the data and add each piece to the pstate */ + if (jbval->type == jbvBinary) + it = JsonbIteratorInit(jbval->val.binary.data); + else + it = JsonbIteratorInit(jbval); + while ((tok = JsonbIteratorNext(&it, &v, false)) != WJB_DONE) res = pushJsonbValueScalar(pstate, tok, tok < WJB_BEGIN_ARRAY ? &v : NULL); |