- Notifications
You must be signed in to change notification settings - Fork28
Commitf1464c5
committed
Improve parse representation for MERGE
Separation of parser data structures from executor, asrequested by Tom Lane. Further improvements possible.While there, implement error for multiple VALUES clauses via parserto allow line number of error, as requested by Andres Freund.Author: Pavan DeolaseeDiscussion:https://www.postgresql.org/message-id/CABOikdPpqjectFchg0FyTOpsGXyPoqwgC==OLKWuxgBOsrDDZw@mail.gmail.com1 parent3b0b4f3 commitf1464c5
File tree
11 files changed
+207
-148
lines changed- src
- backend
- nodes
- parser
- rewrite
- include/nodes
- test/regress/expected
11 files changed
+207
-148
lines changedLines changed: 26 additions & 9 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2136 | 2136 |
| |
2137 | 2137 |
| |
2138 | 2138 |
| |
| 2139 | + | |
| 2140 | + | |
| 2141 | + | |
| 2142 | + | |
| 2143 | + | |
| 2144 | + | |
| 2145 | + | |
| 2146 | + | |
| 2147 | + | |
| 2148 | + | |
| 2149 | + | |
| 2150 | + | |
| 2151 | + | |
| 2152 | + | |
2139 | 2153 |
| |
2140 | 2154 |
| |
2141 | 2155 |
| |
| |||
3054 | 3068 |
| |
3055 | 3069 |
| |
3056 | 3070 |
| |
3057 |
| - | |
| 3071 | + | |
3058 | 3072 |
| |
3059 | 3073 |
| |
3060 | 3074 |
| |
3061 | 3075 |
| |
3062 | 3076 |
| |
3063 |
| - | |
3064 |
| - | |
| 3077 | + | |
| 3078 | + | |
3065 | 3079 |
| |
3066 |
| - | |
| 3080 | + | |
3067 | 3081 |
| |
3068 | 3082 |
| |
3069 | 3083 |
| |
3070 | 3084 |
| |
3071 |
| - | |
3072 |
| - | |
3073 | 3085 |
| |
3074 |
| - | |
| 3086 | + | |
| 3087 | + | |
| 3088 | + | |
3075 | 3089 |
| |
3076 | 3090 |
| |
3077 | 3091 |
| |
| |||
5059 | 5073 |
| |
5060 | 5074 |
| |
5061 | 5075 |
| |
| 5076 | + | |
| 5077 | + | |
| 5078 | + | |
5062 | 5079 |
| |
5063 | 5080 |
| |
5064 | 5081 |
| |
| |||
5140 | 5157 |
| |
5141 | 5158 |
| |
5142 | 5159 |
| |
5143 |
| - | |
5144 |
| - | |
| 5160 | + | |
| 5161 | + | |
5145 | 5162 |
| |
5146 | 5163 |
| |
5147 | 5164 |
| |
|
Lines changed: 22 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
812 | 812 |
| |
813 | 813 |
| |
814 | 814 |
| |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
| 825 | + | |
| 826 | + | |
815 | 827 |
| |
816 | 828 |
| |
817 | 829 |
| |
| |||
1050 | 1062 |
| |
1051 | 1063 |
| |
1052 | 1064 |
| |
1053 |
| - | |
| 1065 | + | |
1054 | 1066 |
| |
1055 | 1067 |
| |
1056 | 1068 |
| |
1057 | 1069 |
| |
1058 | 1070 |
| |
1059 | 1071 |
| |
1060 |
| - | |
| 1072 | + | |
1061 | 1073 |
| |
1062 | 1074 |
| |
1063 | 1075 |
| |
1064 | 1076 |
| |
1065 |
| - | |
1066 |
| - | |
1067 | 1077 |
| |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
1068 | 1081 |
| |
1069 | 1082 |
| |
1070 | 1083 |
| |
| |||
3192 | 3205 |
| |
3193 | 3206 |
| |
3194 | 3207 |
| |
| 3208 | + | |
| 3209 | + | |
| 3210 | + | |
3195 | 3211 |
| |
3196 | 3212 |
| |
3197 | 3213 |
| |
| |||
3263 | 3279 |
| |
3264 | 3280 |
| |
3265 | 3281 |
| |
3266 |
| - | |
3267 |
| - | |
| 3282 | + | |
| 3283 | + | |
3268 | 3284 |
| |
3269 | 3285 |
| |
3270 | 3286 |
| |
|
Lines changed: 9 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3444 | 3444 |
| |
3445 | 3445 |
| |
3446 | 3446 |
| |
3447 |
| - | |
| 3447 | + | |
3448 | 3448 |
| |
3449 | 3449 |
| |
3450 | 3450 |
| |
3451 | 3451 |
| |
3452 | 3452 |
| |
3453 |
| - | |
| 3453 | + | |
3454 | 3454 |
| |
3455 |
| - | |
| 3455 | + | |
3456 | 3456 |
| |
3457 |
| - | |
| 3457 | + | |
3458 | 3458 |
| |
3459 |
| - | |
| 3459 | + | |
| 3460 | + | |
| 3461 | + | |
| 3462 | + | |
| 3463 | + | |
3460 | 3464 |
| |
3461 | 3465 |
| |
3462 | 3466 |
| |
|
Lines changed: 21 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
396 | 396 |
| |
397 | 397 |
| |
398 | 398 |
| |
399 |
| - | |
| 399 | + | |
400 | 400 |
| |
401 |
| - | |
| 401 | + | |
402 | 402 |
| |
403 | 403 |
| |
404 | 404 |
| |
405 | 405 |
| |
406 |
| - | |
407 |
| - | |
408 | 406 |
| |
| 407 | + | |
| 408 | + | |
| 409 | + | |
409 | 410 |
| |
410 | 411 |
| |
411 | 412 |
| |
| |||
1724 | 1725 |
| |
1725 | 1726 |
| |
1726 | 1727 |
| |
| 1728 | + | |
| 1729 | + | |
| 1730 | + | |
| 1731 | + | |
| 1732 | + | |
| 1733 | + | |
| 1734 | + | |
| 1735 | + | |
| 1736 | + | |
| 1737 | + | |
| 1738 | + | |
1727 | 1739 |
| |
1728 | 1740 |
| |
1729 | 1741 |
| |
| |||
3679 | 3691 |
| |
3680 | 3692 |
| |
3681 | 3693 |
| |
3682 |
| - | |
3683 |
| - | |
| 3694 | + | |
| 3695 | + | |
3684 | 3696 |
| |
3685 | 3697 |
| |
3686 | 3698 |
| |
| |||
3958 | 3970 |
| |
3959 | 3971 |
| |
3960 | 3972 |
| |
| 3973 | + | |
| 3974 | + | |
| 3975 | + | |
3961 | 3976 |
| |
3962 | 3977 |
| |
3963 | 3978 |
| |
|
Lines changed: 27 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1331 | 1331 |
| |
1332 | 1332 |
| |
1333 | 1333 |
| |
| 1334 | + | |
| 1335 | + | |
| 1336 | + | |
| 1337 | + | |
| 1338 | + | |
| 1339 | + | |
| 1340 | + | |
| 1341 | + | |
| 1342 | + | |
| 1343 | + | |
| 1344 | + | |
| 1345 | + | |
| 1346 | + | |
| 1347 | + | |
| 1348 | + | |
| 1349 | + | |
1334 | 1350 |
| |
1335 | 1351 |
| |
1336 | 1352 |
| |
| |||
1602 | 1618 |
| |
1603 | 1619 |
| |
1604 | 1620 |
| |
1605 |
| - | |
| 1621 | + | |
1606 | 1622 |
| |
1607 |
| - | |
1608 |
| - | |
| 1623 | + | |
| 1624 | + | |
1609 | 1625 |
| |
1610 |
| - | |
| 1626 | + | |
1611 | 1627 |
| |
1612 | 1628 |
| |
1613 | 1629 |
| |
1614 | 1630 |
| |
1615 |
| - | |
1616 |
| - | |
1617 | 1631 |
| |
| 1632 | + | |
| 1633 | + | |
| 1634 | + | |
1618 | 1635 |
| |
1619 | 1636 |
| |
1620 | 1637 |
| |
| |||
2596 | 2613 |
| |
2597 | 2614 |
| |
2598 | 2615 |
| |
| 2616 | + | |
| 2617 | + | |
2599 | 2618 |
| |
2600 | 2619 |
| |
2601 | 2620 |
| |
| |||
2618 | 2637 |
| |
2619 | 2638 |
| |
2620 | 2639 |
| |
2621 |
| - | |
2622 |
| - | |
| 2640 | + | |
| 2641 | + | |
2623 | 2642 |
| |
2624 | 2643 |
| |
2625 | 2644 |
| |
|
0 commit comments
Comments
(0)