fix(master): review fixes for newer-tag suggestions (#11)

internal/master/store/merge.go

@@ -107,8 +107,8 @@ type mergeRow struct {
 // MergeService moves the live service toID onto the removed service fromID:
 // the old row keeps its id, first_seen_at, update mode and desired ref, takes
 // the location and inventory of the live row (and its available and newer-tag
-// suggestions), becomes live, and the live row is deleted. The jobs of the live row move to
-// the old one. This is the only place a services row is deleted.
+// suggestions), becomes live, and the live row is deleted. The jobs of the live
+// row move to the old one. This is the only place a services row is deleted.
 //
 // It returns *model.MergeRefusedError when the pair cannot be merged,
 // model.ErrJobActive when either row has a queued or running job,
@@ -213,8 +213,9 @@ func (s *Store) MergeService(ctx context.Context, fromID, toID int64) error {
 			config_files = $7, built = $8, swarm_cluster_id = $9, swarm_service = $10, container_name = $11,
 			image_repo = $12, actual_ref = $13, actual_digest = $14, status = $15, self = $16, updated_at = $17,
 			available_ref = $18, available_digest = $19, available_source = $20, available_at = $21,
-			last_poll_error = $22, newer_ref = $24, newer_at = $25,
+			last_poll_error = $22,
 			last_tag_digest = CASE WHEN last_tag_digest <> '' THEN last_tag_digest ELSE $23 END,
+			newer_ref = $24, newer_at = $25,
 			removed_at = NULL, awaiting_inventory = false
 		WHERE id = $1`,
 		fromID, t.AgentID, t.LocationKey, t.ComposeProject, t.ComposeService, t.WorkingDir,