- Notifications
You must be signed in to change notification settings - Fork28
Commite4942f7
committed
Attach ON CONFLICT SET ... WHERE to the correct planstate.
The previous coding was a leftover from attempting to hang all the onconflict logic onto modify table's child nodes. It appears to not haveactually caused problems except for explain.Add test exercising the broken and some other code paths.Author: Peter Geoghegan and Andres Freund1 parent4db485e commite4942f7
File tree
3 files changed
+19
-1
lines changed- src
- backend/executor
- test/regress
- expected
- sql
3 files changed
+19
-1
lines changedLines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1697 | 1697 |
| |
1698 | 1698 |
| |
1699 | 1699 |
| |
1700 |
| - | |
| 1700 | + | |
1701 | 1701 |
| |
1702 | 1702 |
| |
1703 | 1703 |
| |
|
Lines changed: 16 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
43 | 43 |
| |
44 | 44 |
| |
45 | 45 |
| |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
46 | 62 |
| |
47 | 63 |
| |
48 | 64 |
| |
|
Lines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
| 23 | + | |
| 24 | + | |
23 | 25 |
| |
24 | 26 |
| |
25 | 27 |
| |
|
0 commit comments
Comments
(0)