/ Check-in [54d96772]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge changes from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | upsert
Files: files | file ages | folders
SHA3-256: 54d96772e78b7f57d5b590aebe34a139ade73629aebe16677372650b33513b1d
User & Date: drh 2018-04-16 10:47:38
Context
2018-04-16
13:00
Add support for the "excluded.*" names in the UPDATE clause of an upsert. check-in: 0203f34f user: drh tags: upsert
10:47
Merge changes from trunk. check-in: 54d96772 user: drh tags: upsert
10:41
Increase the version number to 3.24.0 check-in: f94528e1 user: drh tags: trunk
2018-04-14
22:35
Get upsert working on WITHOUT ROWID tables. check-in: d3c53fd3 user: drh tags: upsert
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to VERSION.

Changes to configure.

Changes to src/expr.c.

Changes to src/resolve.c.

Changes to src/select.c.

Changes to src/sqliteInt.h.