Revert "Add all structured objects passed to pushJsonbValue piecewise."

This reverts commit 54547bd87f49326d67051254c363e6597d16ffda.

This appears to have been a thinko on my part. I will try to come up
wioth a better solution.

diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index 38e1db29e5a139fb8792cf3c18e3cad8a237f5de..4d733159d06de0279d5c267b2c5c135c4e70d83d 100644 (file)
--- 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.
  *
- * All non-scalar types (jvbBinary, jbvArray and jbvObject) passed as
- * elements or values are unpacked before being added to the result.
+ * Values of type jvbBinary, which are rolled up arrays and objects,
+ * are unpacked before being added to the result.
  */
 JsonbValue *
 pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq,
@@ -522,18 +522,14 @@ pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq,
        JsonbIteratorToken tok;
 
        if (!jbval || (seq != WJB_ELEM && seq != WJB_VALUE) ||
-               IsAJsonbScalar(jbval))
+               jbval->type != jbvBinary)
        {
                /* drop through */
                return pushJsonbValueScalar(pstate, seq, jbval);
        }
 
-       /* unpack the data and add each piece to the pstate */
-       if (jbval->type == jbvBinary)
-               it = JsonbIteratorInit(jbval->val.binary.data);
-       else
-               it = JsonbIteratorInit(jbval);
-
+       /* unpack the binary and add each piece to the pstate */
+       it = JsonbIteratorInit(jbval->val.binary.data);
        while ((tok = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
                res = pushJsonbValueScalar(pstate, tok,
                                                                   tok < WJB_BEGIN_ARRAY ? &v : NULL);