forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit5defdef
committed
Update MERGE docs to mention that ONLY is supported.
Commit7103ebb added support for MERGE, which included support forinheritance hierarchies, but didn't document the fact that ONLY couldbe specified before the source and/or target tables to exclude tablesinheriting from the tables specified.Update merge.sgml to mention this, and while at it, add someregression tests to cover it.Dean Rasheed, reviewed by Nathan Bossart.Backpatch to 15, where MERGE was added.Discussion:https://postgr.es/m/CAEZATCU0XM-bJCvpJuVRU3UYNRqEBS6g4-zH%3Dj9Ye0caX8F6uQ%40mail.gmail.com1 parent07c29ca commit5defdef
File tree
3 files changed
+115
-4
lines changed- doc/src/sgml/ref
- src/test/regress
- expected
- sql
3 files changed
+115
-4
lines changedOriginal file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
22 | 22 |
| |
23 | 23 |
| |
24 | 24 |
| |
25 |
| - | |
| 25 | + | |
26 | 26 |
| |
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
| 31 | + | |
32 | 32 |
| |
33 | 33 |
| |
34 | 34 |
| |
| |||
129 | 129 |
| |
130 | 130 |
| |
131 | 131 |
| |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
132 | 140 |
| |
133 | 141 |
| |
134 | 142 |
| |
| |||
151 | 159 |
| |
152 | 160 |
| |
153 | 161 |
| |
154 |
| - | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
155 | 168 |
| |
156 | 169 |
| |
157 | 170 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1886 | 1886 |
| |
1887 | 1887 |
| |
1888 | 1888 |
| |
| 1889 | + | |
1889 | 1890 |
| |
1890 | 1891 |
| |
1891 | 1892 |
| |
| |||
1917 | 1918 |
| |
1918 | 1919 |
| |
1919 | 1920 |
| |
| 1921 | + | |
1920 | 1922 |
| |
1921 | 1923 |
| |
1922 | 1924 |
| |
1923 | 1925 |
| |
1924 | 1926 |
| |
1925 | 1927 |
| |
1926 |
| - | |
| 1928 | + | |
1927 | 1929 |
| |
1928 | 1930 |
| |
| 1931 | + | |
1929 | 1932 |
| |
1930 | 1933 |
| |
1931 | 1934 |
| |
1932 | 1935 |
| |
1933 | 1936 |
| |
1934 | 1937 |
| |
1935 | 1938 |
| |
| 1939 | + | |
| 1940 | + | |
| 1941 | + | |
| 1942 | + | |
| 1943 | + | |
| 1944 | + | |
| 1945 | + | |
| 1946 | + | |
| 1947 | + | |
| 1948 | + | |
| 1949 | + | |
| 1950 | + | |
| 1951 | + | |
| 1952 | + | |
| 1953 | + | |
| 1954 | + | |
| 1955 | + | |
| 1956 | + | |
| 1957 | + | |
| 1958 | + | |
| 1959 | + | |
| 1960 | + | |
| 1961 | + | |
| 1962 | + | |
| 1963 | + | |
| 1964 | + | |
| 1965 | + | |
| 1966 | + | |
| 1967 | + | |
| 1968 | + | |
| 1969 | + | |
1936 | 1970 |
| |
1937 | 1971 |
| |
1938 | 1972 |
| |
| |||
1946 | 1980 |
| |
1947 | 1981 |
| |
1948 | 1982 |
| |
| 1983 | + | |
1949 | 1984 |
| |
1950 | 1985 |
| |
1951 | 1986 |
| |
1952 | 1987 |
| |
1953 | 1988 |
| |
1954 | 1989 |
| |
1955 | 1990 |
| |
| 1991 | + | |
| 1992 | + | |
| 1993 | + | |
| 1994 | + | |
| 1995 | + | |
| 1996 | + | |
| 1997 | + | |
| 1998 | + | |
| 1999 | + | |
| 2000 | + | |
| 2001 | + | |
| 2002 | + | |
| 2003 | + | |
| 2004 | + | |
| 2005 | + | |
| 2006 | + | |
| 2007 | + | |
1956 | 2008 |
| |
1957 | 2009 |
| |
| 2010 | + | |
| 2011 | + | |
| 2012 | + | |
| 2013 | + | |
| 2014 | + | |
| 2015 | + | |
| 2016 | + | |
| 2017 | + | |
| 2018 | + | |
| 2019 | + | |
| 2020 | + | |
| 2021 | + | |
1958 | 2022 |
| |
1959 | 2023 |
| |
1960 | 2024 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1231 | 1231 |
| |
1232 | 1232 |
| |
1233 | 1233 |
| |
| 1234 | + | |
1234 | 1235 |
| |
1235 | 1236 |
| |
1236 | 1237 |
| |
| |||
1264 | 1265 |
| |
1265 | 1266 |
| |
1266 | 1267 |
| |
| 1268 | + | |
1267 | 1269 |
| |
1268 | 1270 |
| |
1269 | 1271 |
| |
| |||
1272 | 1274 |
| |
1273 | 1275 |
| |
1274 | 1276 |
| |
| 1277 | + | |
| 1278 | + | |
| 1279 | + | |
| 1280 | + | |
| 1281 | + | |
| 1282 | + | |
| 1283 | + | |
| 1284 | + | |
| 1285 | + | |
| 1286 | + | |
| 1287 | + | |
| 1288 | + | |
| 1289 | + | |
| 1290 | + | |
| 1291 | + | |
1275 | 1292 |
| |
1276 | 1293 |
| |
1277 | 1294 |
| |
| |||
1284 | 1301 |
| |
1285 | 1302 |
| |
1286 | 1303 |
| |
| 1304 | + | |
| 1305 | + | |
| 1306 | + | |
| 1307 | + | |
| 1308 | + | |
| 1309 | + | |
| 1310 | + | |
| 1311 | + | |
| 1312 | + | |
| 1313 | + | |
| 1314 | + | |
| 1315 | + | |
| 1316 | + | |
| 1317 | + | |
| 1318 | + | |
| 1319 | + | |
| 1320 | + | |
1287 | 1321 |
| |
1288 | 1322 |
| |
1289 | 1323 |
| |
|
0 commit comments
Comments
(0)