578cf8104b
Merge commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38' * commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38': Fix SQL generated by updateWithOnConflict()