forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit8c55244
committed
Fix transition tables for ON CONFLICT.
We now disallow having triggers with both transition tables and ONINSERT OR UPDATE (which was a PG extension to the spec anyway),because in this case it's not at all clear how the transition tablesshould work for an INSERT ... ON CONFLICT query. Separate ON INSERTand ON UPDATE triggers with transition tables are allowed, and thetransition tables for these reflect only the inserted and only theupdated tuples respectively.Patch by Thomas MunroDiscussion:https://postgr.es/m/CAEepm%3D11KHQ0JmETJQihSvhZB5mUZL2xrqHeXbCeLhDiqQ39%3Dw%40mail.gmail.com1 parentc46c0e5 commit8c55244
File tree
6 files changed
+155
-13
lines changed- src
- backend/commands
- include/commands
- test/regress
- expected
- sql
6 files changed
+155
-13
lines changedLines changed: 52 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
401 | 401 |
| |
402 | 402 |
| |
403 | 403 |
| |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
404 | 421 |
| |
405 | 422 |
| |
406 | 423 |
| |
| |||
2128 | 2145 |
| |
2129 | 2146 |
| |
2130 | 2147 |
| |
2131 |
| - | |
2132 |
| - | |
| 2148 | + | |
| 2149 | + | |
| 2150 | + | |
| 2151 | + | |
2133 | 2152 |
| |
2134 | 2153 |
| |
2135 | 2154 |
| |
| |||
2147 | 2166 |
| |
2148 | 2167 |
| |
2149 | 2168 |
| |
2150 |
| - | |
2151 |
| - | |
| 2169 | + | |
| 2170 | + | |
| 2171 | + | |
| 2172 | + | |
2152 | 2173 |
| |
2153 | 2174 |
| |
2154 | 2175 |
| |
| |||
3993 | 4014 |
| |
3994 | 4015 |
| |
3995 | 4016 |
| |
3996 |
| - | |
| 4017 | + | |
| 4018 | + | |
| 4019 | + | |
| 4020 | + | |
| 4021 | + | |
| 4022 | + | |
| 4023 | + | |
| 4024 | + | |
| 4025 | + | |
| 4026 | + | |
| 4027 | + | |
| 4028 | + | |
| 4029 | + | |
| 4030 | + | |
| 4031 | + | |
| 4032 | + | |
| 4033 | + | |
| 4034 | + | |
| 4035 | + | |
| 4036 | + | |
| 4037 | + | |
| 4038 | + | |
| 4039 | + | |
3997 | 4040 |
| |
3998 | 4041 |
| |
3999 | 4042 |
| |
| |||
5241 | 5284 |
| |
5242 | 5285 |
| |
5243 | 5286 |
| |
5244 |
| - | |
| 5287 | + | |
| 5288 | + | |
| 5289 | + | |
| 5290 | + | |
5245 | 5291 |
| |
5246 | 5292 |
| |
5247 | 5293 |
| |
|
Lines changed: 11 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
73 | 73 |
| |
74 | 74 |
| |
75 | 75 |
| |
76 |
| - | |
77 |
| - | |
78 |
| - | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
79 | 87 |
| |
80 | 88 |
| |
81 | 89 |
| |
|
Lines changed: 7 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5847 | 5847 |
| |
5848 | 5848 |
| |
5849 | 5849 |
| |
5850 |
| - | |
5851 |
| - | |
| 5850 | + | |
| 5851 | + | |
| 5852 | + | |
| 5853 | + | |
| 5854 | + | |
| 5855 | + | |
| 5856 | + | |
5852 | 5857 |
| |
5853 | 5858 |
| |
5854 | 5859 |
| |
|
Lines changed: 38 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2214 | 2214 |
| |
2215 | 2215 |
| |
2216 | 2216 |
| |
| 2217 | + | |
| 2218 | + | |
| 2219 | + | |
| 2220 | + | |
| 2221 | + | |
| 2222 | + | |
| 2223 | + | |
| 2224 | + | |
| 2225 | + | |
| 2226 | + | |
| 2227 | + | |
| 2228 | + | |
| 2229 | + | |
| 2230 | + | |
| 2231 | + | |
| 2232 | + | |
| 2233 | + | |
| 2234 | + | |
| 2235 | + | |
| 2236 | + | |
| 2237 | + | |
| 2238 | + | |
| 2239 | + | |
| 2240 | + | |
| 2241 | + | |
| 2242 | + | |
| 2243 | + | |
| 2244 | + | |
| 2245 | + | |
| 2246 | + | |
| 2247 | + | |
| 2248 | + | |
| 2249 | + | |
| 2250 | + | |
| 2251 | + | |
| 2252 | + | |
| 2253 | + | |
| 2254 | + | |
2217 | 2255 |
| |
2218 | 2256 |
| |
2219 | 2257 |
| |
|
Lines changed: 8 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
4639 | 4639 |
| |
4640 | 4640 |
| |
4641 | 4641 |
| |
4642 |
| - | |
4643 |
| - | |
| 4642 | + | |
| 4643 | + | |
| 4644 | + | |
| 4645 | + | |
| 4646 | + | |
| 4647 | + | |
| 4648 | + | |
| 4649 | + | |
4644 | 4650 |
| |
4645 | 4651 |
| |
4646 | 4652 |
| |
|
Lines changed: 39 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1725 | 1725 |
| |
1726 | 1726 |
| |
1727 | 1727 |
| |
| 1728 | + | |
| 1729 | + | |
| 1730 | + | |
| 1731 | + | |
| 1732 | + | |
| 1733 | + | |
| 1734 | + | |
| 1735 | + | |
| 1736 | + | |
| 1737 | + | |
| 1738 | + | |
| 1739 | + | |
| 1740 | + | |
| 1741 | + | |
| 1742 | + | |
| 1743 | + | |
| 1744 | + | |
| 1745 | + | |
| 1746 | + | |
| 1747 | + | |
| 1748 | + | |
| 1749 | + | |
| 1750 | + | |
| 1751 | + | |
| 1752 | + | |
| 1753 | + | |
| 1754 | + | |
| 1755 | + | |
| 1756 | + | |
| 1757 | + | |
| 1758 | + | |
| 1759 | + | |
| 1760 | + | |
| 1761 | + | |
| 1762 | + | |
| 1763 | + | |
| 1764 | + | |
| 1765 | + | |
| 1766 | + | |
1728 | 1767 |
| |
1729 | 1768 |
| |
1730 | 1769 |
| |
|
0 commit comments
Comments
(0)