firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:43:02 +01:00
Code Issues

Finish MERGE improvements documentation (CORE-2005, CORE-3020, CORE-3639).

Browse Source
This commit is contained in:
asfernandes 2013-04-26 15:29:48 +00:00
parent 492e4b588f
commit 9f16366d27
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/WhatsNew
View File

@ -31,6 +31,8 @@
* Improvement CORE-3639
Allow the use of multiple WHEN MATCHED / NOT MATCHED clauses in MERGE, as per the SQL 2008 specification
See also:
/doc/README.merge.txt
Contributor(s):
Adriano dos Santos Fernandes <adrianosf at gmail.com>
@ -82,7 +84,7 @@
* Improvement CORE-3020
Add RETURNING ... INTO ... clause to the MERGE statement
See also:
/doc/sql.extensions/README.returning
/doc/sql.extensions/README.returning, /doc/README.merge.txt
Contributor(s):
Adriano dos Santos Fernandes <adrianosf at gmail.com>
@ -175,6 +177,8 @@
* Improvement CORE-2005
Support SQL 2008 syntax for MERGE statement with DELETE extension
See also:
/doc/README.merge.txt
Contributor(s):
Adriano dos Santos Fernandes <adrianosf at gmail.com>

2
doc/sql.extensions/README.merge.txt
View File

@ -24,7 +24,7 @@ MERGE statement
<merge when matched> ::=
WHEN MATCHED [ AND <condition> ] THEN
UPDATE SET <assignment list>
{ UPDATE SET <assignment list> | DELETE }
<merge when not matched> ::=
WHEN NOT MATCHED [ AND <condition> ] THEN

1
doc/sql.extensions/README.returning
View File

@ -17,6 +17,7 @@ RETURNING clause
UPDATE OR INSERT INTO ... VALUES (...) ... [RETURNING <column_list> [INTO <variable_list>]]
UPDATE ... [RETURNING <column_list> [INTO <variable_list>]]
DELETE FROM ... [RETURNING <column_list> [INTO <variable_list>]]
MERGE INTO ... [RETURNING <column_list> [INTO <variable_list>]]
Scope:
DSQL, PSQL