projects
/
postgresql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b981275
)
MERGE syntax diagram correction
author
Simon Riggs
<
[email protected]
>
Thu, 5 Apr 2018 19:36:23 +0000
(20:36 +0100)
committer
Simon Riggs
<
[email protected]
>
Thu, 5 Apr 2018 19:36:23 +0000
(20:36 +0100)
Reported-by: Andrew Gierth
doc/src/sgml/ref/merge.sgml
patch
|
blob
|
blame
|
history
diff --git
a/doc/src/sgml/ref/merge.sgml
b/doc/src/sgml/ref/merge.sgml
index 31ba7a841d127fc6e927dec5e3e2e2aabdf6f53e..b2a9f67cfa9f16a411b9ab187aef78f11c68495c 100644
(file)
--- a/
doc/src/sgml/ref/merge.sgml
+++ b/
doc/src/sgml/ref/merge.sgml
@@
-41,7
+41,7
@@
and <replaceable class="parameter">merge_insert</replaceable> is
INSERT [( <replaceable class="parameter">column_name</replaceable> [, ...] )]
[ OVERRIDING { SYSTEM | USER } VALUE ]
-{ VALUES ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } ) | DEFAULT VALUES }
+{ VALUES ( { <replaceable class="parameter">expression</replaceable> | DEFAULT }
[, ...]
) | DEFAULT VALUES }
and <replaceable class="parameter">merge_update</replaceable> is