PG: emits Watch API checkpoints outside of changes

internal/datastore/postgres/watch.go

@@ -158,18 +158,6 @@
 						optionalNanosTimestamp: currentTxn.optionalNanosTimestamp,
 					}
 				}
-
-				// If checkpoints were requested, output a checkpoint. While the Postgres datastore does not
-				// move revisions forward outside of changes, these could be necessary if the caller is
-				// watching only a *subset* of changes.
-				if options.Content&datastore.WatchCheckpoints == datastore.WatchCheckpoints {
-					if !sendChange(&datastore.RevisionChanges{
-						Revision:     currentTxn,
-						IsCheckpoint: true,
-					}) {
-						return
-					}
-				}
 			} else {
 				sleep := time.NewTimer(watchSleep)
 
@@ -181,6 +169,18 @@
 					return
 				}
 			}
+
+			// If checkpoints were requested, output a checkpoint. While the Postgres datastore does not
+			// move revisions forward outside of changes, these could be necessary if the caller is
+			// watching only a *subset* of changes.
+			if options.Content&datastore.WatchCheckpoints == datastore.WatchCheckpoints {
+				if !sendChange(&datastore.RevisionChanges{
+					Revision:     currentTxn,
+					IsCheckpoint: true,
+				}) {
+					return
+				}
+			}
 		}
 	}()
 
@@ -402,7 +402,7 @@
 	return nil
 }
 
 func (pgd *pgDatastore) loadCaveatChanges(ctx context.Context, min uint64, max uint64, txidToRevision map[uint64]postgresRevision, filter map[uint64]int, tracked *common.Changes[postgresRevision, uint64]) error {
 	sql, args, err := queryChangedCaveats.Where(sq.Or{
 		sq.And{
 			sq.LtOrEq{colCreatedXid: max},