Commit ff3ca169 authored by Maxim Ivanov's avatar Maxim Ivanov
Browse files

Adjust ON CONFLICT to match new pkey 

It is not necessary as index matching is based on a set of columns, not order, but it is neater.
parent 45d6941b

server/core_storage.go

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ func storageWriteObject(ctx context.Context, logger *zap.Logger, metrics Metrics 
	case !dbVersion.Valid && object.Version == "":

		// An existing storage object was not present, and no OCC of any kind is specified.

		// Separate to the case above to handle concurrent non-OCC object creations, where all but the first must become updates.

		query = "INSERT INTO storage (collection, key, user_id, value, version, read, write, create_time, update_time) VALUES ($1, $2, $3::UUID, $4, $5, $6, $7, now(), now()) ON CONFLICT (collection, key, user_id) DO UPDATE SET value = $4, version = $5, read = $6, write = $7, update_time = now()"

		query = "INSERT INTO storage (collection, key, user_id, value, version, read, write, create_time, update_time) VALUES ($1, $2, $3::UUID, $4, $5, $6, $7, now(), now()) ON CONFLICT (collection, user_id, key) DO UPDATE SET value = $4, version = $5, read = $6, write = $7, update_time = now()"

		// Respect permissions in non-authoritative writes, where this operation also loses the race to insert the object.

		if !authoritativeWrite {

			query += " WHERE storage.write = 1"