git.ipfire.org Git - thirdparty/sqlite.git/commit

]> git.ipfire.org Git - thirdparty/sqlite.git/commit

projects / thirdparty / sqlite.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 59964b4 1c19848)

author	drh <drh@noemail.net>
	Mon, 14 Dec 2020 15:39:12 +0000 (15:39 +0000)
committer	drh <drh@noemail.net>
	Mon, 14 Dec 2020 15:39:12 +0000 (15:39 +0000)
commit	9f023ce539ef4cab79b9ba29eafe2d02ce46f4f3
tree	4a5a69109bafa79b77faff82108acf6910bcae4e	tree \| snapshot
parent	59964b40103d530aa1e84ca873ecc146dc13fc80	commit \| diff
parent	1c19848386babe4056e0e825433fcbe4b4ef1a5d	commit \| diff

Enhance UPSERT so that it allows multiple ON CONFLICT clauses and does
not require a conflict target for DO UPDATE.

FossilOrigin-Name: 6b01a24daab1e5bcb0768ebf994368d941b1dfc217bf6b661211d900331e68cf

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/insert.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/sqlite/sqlite.git