- Notifications
You must be signed in to change notification settings - Fork5
Commit68d68ff
committed
Fix two-argument jsonb_object when called with empty arrays
Some over-eager copy-and-pasting on my part resulted in a nonsenseresult being returned in this case. I have adopted the same pattern forhandling this case as is used in the one argument form of the function,i.e. we just skip over the code that adds values to the object.Diagnosis and patch from Michael Paquier, although not quite hissolution.Fixes bug #13936.Backpatch to 9.5 where jsonb_object was introduced.1 parenta397f82 commit68d68ff
5 files changed
+44
-3
lines changedLines changed: 4 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1455 | 1455 |
| |
1456 | 1456 |
| |
1457 | 1457 |
| |
1458 |
| - | |
| 1458 | + | |
1459 | 1459 |
| |
1460 | 1460 |
| |
1461 | 1461 |
| |
| |||
1509 | 1509 |
| |
1510 | 1510 |
| |
1511 | 1511 |
| |
1512 |
| - | |
1513 |
| - | |
1514 | 1512 |
| |
1515 | 1513 |
| |
1516 | 1514 |
| |
1517 | 1515 |
| |
1518 | 1516 |
| |
| 1517 | + | |
| 1518 | + | |
| 1519 | + | |
1519 | 1520 |
| |
1520 | 1521 |
| |
1521 | 1522 |
| |
|
Lines changed: 14 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1510 | 1510 |
| |
1511 | 1511 |
| |
1512 | 1512 |
| |
| 1513 | + | |
| 1514 | + | |
| 1515 | + | |
| 1516 | + | |
| 1517 | + | |
| 1518 | + | |
| 1519 | + | |
| 1520 | + | |
| 1521 | + | |
| 1522 | + | |
| 1523 | + | |
| 1524 | + | |
| 1525 | + | |
| 1526 | + | |
1513 | 1527 |
| |
1514 | 1528 |
| |
1515 | 1529 |
| |
|
Lines changed: 14 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1410 | 1410 |
| |
1411 | 1411 |
| |
1412 | 1412 |
| |
| 1413 | + | |
| 1414 | + | |
| 1415 | + | |
| 1416 | + | |
| 1417 | + | |
| 1418 | + | |
| 1419 | + | |
| 1420 | + | |
| 1421 | + | |
| 1422 | + | |
| 1423 | + | |
| 1424 | + | |
| 1425 | + | |
| 1426 | + | |
1413 | 1427 |
| |
1414 | 1428 |
| |
1415 | 1429 |
| |
|
Lines changed: 6 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
462 | 462 |
| |
463 | 463 |
| |
464 | 464 |
| |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
465 | 471 |
| |
466 | 472 |
| |
467 | 473 |
| |
|
Lines changed: 6 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
352 | 352 |
| |
353 | 353 |
| |
354 | 354 |
| |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
355 | 361 |
| |
356 | 362 |
| |
357 | 363 |
| |
|
0 commit comments
Comments
(0)