Fix race condition

Author: blkt

Taskfile.yml

@@ -177,7 +177,7 @@ tasks:
         silent: true
     cmds:
       # We have to use ldflags to avoid the LC_DYSYMTAB linker warning.
-      - go test -ldflags=-extldflags=-Wl,-w -race -json ./... | gotestfmt -hide "all"
+      - go test -count 1 -ldflags=-extldflags=-Wl,-w -race -json ./... | gotestfmt -hide "all"
 
   test-coverage:
     desc: Run registry API tests with coverage
@@ -186,7 +186,7 @@ tasks:
         silent: true
     cmds:
       # We have to use ldflags to avoid the LC_DYSYMTAB linker warning.
-      - go test -ldflags=-extldflags=-Wl,-w -race -json -coverprofile=coverage.out ./... | gotestfmt -hide "all"
+      - go test -count 1 -ldflags=-extldflags=-Wl,-w -race -json -coverprofile=coverage.out ./... | gotestfmt -hide "all"
       - go tool cover -func=coverage.out
       - echo "Generating HTML coverage report in coverage.html"
       - go tool cover -html=coverage.out -o coverage.html

database/migrate_test.go

@@ -13,7 +13,7 @@ func TestMigrations(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	db, cleanupFunc := SetupTestDBContaienr(t, ctx)
+	db, cleanupFunc := SetupTestDBContainer(t, ctx)
 	t.Cleanup(cleanupFunc)
 
 	connString := db.Config().ConnString()

database/queries/registry.sql

@@ -6,12 +6,14 @@ SELECT id,
        updated_at
   FROM registry
  WHERE (sqlc.narg(next)::timestamp with time zone IS NULL OR created_at > sqlc.narg(next))
-    OR (sqlc.narg(prev)::timestamp with time zone IS NULL AND created_at < sqlc.narg(prev))
+   AND (sqlc.narg(prev)::timestamp with time zone IS NULL OR created_at < sqlc.narg(prev))
  ORDER BY
   -- next page sorting
   CASE WHEN sqlc.narg(next)::timestamp with time zone IS NULL THEN created_at END ASC,
+  CASE WHEN sqlc.narg(next)::timestamp with time zone IS NULL THEN name END ASC,
   -- previous page sorting
-  CASE WHEN sqlc.narg(prev)::timestamp with time zone IS NULL THEN created_at END DESC
+  CASE WHEN sqlc.narg(prev)::timestamp with time zone IS NULL THEN created_at END DESC,
+  CASE WHEN sqlc.narg(prev)::timestamp with time zone IS NULL THEN name END DESC
  LIMIT sqlc.arg(size)::bigint;
 
 -- name: GetRegistry :one
@@ -24,4 +26,14 @@ SELECT id,
  WHERE id = sqlc.arg(id);
 
 -- name: InsertRegistry :one
-INSERT INTO registry (name, reg_type) VALUES ($1, $2) RETURNING id;
+INSERT INTO registry (
+    name,
+    reg_type,
+    created_at,
+    updated_at
+) VALUES (
+    sqlc.arg(name),
+    sqlc.arg(reg_type),
+    sqlc.arg(created_at),
+    sqlc.arg(updated_at)
+) RETURNING id;

database/queries/servers.sql

@@ -19,7 +19,7 @@ SELECT r.reg_type as registry_type,
   JOIN registry r ON s.reg_id = r.id
   LEFT JOIN latest_server_version l ON s.id = l.latest_server_id
  WHERE (sqlc.narg(next)::timestamp with time zone IS NULL OR s.created_at > sqlc.narg(next))
-    OR (sqlc.narg(prev)::timestamp with time zone IS NULL AND s.created_at < sqlc.narg(prev))
+   AND (sqlc.narg(prev)::timestamp with time zone IS NULL OR s.created_at < sqlc.narg(prev))
  ORDER BY
  -- next page sorting
  CASE WHEN sqlc.narg(next)::timestamp with time zone IS NULL THEN r.reg_type END ASC,
@@ -79,7 +79,7 @@ SELECT s.id,
   FROM mcp_server s
  WHERE s.name = sqlc.arg(name)
    AND ((sqlc.narg(next)::timestamp with time zone IS NULL OR s.created_at > sqlc.narg(next))
-       OR (sqlc.narg(prev)::timestamp with time zone IS NULL AND s.created_at < sqlc.narg(prev)))
+    AND (sqlc.narg(prev)::timestamp with time zone IS NULL OR s.created_at < sqlc.narg(prev)))
  ORDER BY
  CASE WHEN sqlc.narg(next)::timestamp with time zone IS NULL THEN s.created_at END ASC,
  CASE WHEN sqlc.narg(next)::timestamp with time zone IS NULL THEN s.version END DESC -- acts as tie breaker
@@ -105,8 +105,8 @@ INSERT INTO mcp_server (
     sqlc.arg(name),
     sqlc.arg(version),
     sqlc.arg(reg_id),
-    CURRENT_TIMESTAMP,
-    CURRENT_TIMESTAMP,
+    sqlc.arg(created_at),
+    sqlc.arg(updated_at),
     sqlc.narg(description),
     sqlc.narg(title),
     sqlc.narg(website),
@@ -118,7 +118,7 @@ INSERT INTO mcp_server (
     sqlc.narg(repository_type)
 ) ON CONFLICT (reg_id, name, version)
   DO UPDATE SET
-    updated_at = CURRENT_TIMESTAMP,
+    updated_at = sqlc.arg(updated_at),
     description = sqlc.narg(description),
     title = sqlc.narg(title),
     website = sqlc.narg(website),

database/queries/sync.sql

@@ -18,7 +18,7 @@ INSERT INTO registry_sync (
     sqlc.arg(reg_id),
     sqlc.arg(sync_status),
     sqlc.narg(error_msg),
-    CURRENT_TIMESTAMP
+    sqlc.arg(started_at)
 ) RETURNING id;
 
 -- name: UpdateRegistrySync :exec

database/testcontainers.go

@@ -23,10 +23,10 @@ var (
 	dbPass = "testpass"
 )
 
-// SetupTestDBContaienr creates a Postgres container using testcontainers and returns a connection to the database
+// SetupTestDBContainer creates a Postgres container using testcontainers and returns a connection to the database
 //
 //nolint:revive
-func SetupTestDBContaienr(t *testing.T, ctx context.Context) (*pgx.Conn, func()) {
+func SetupTestDBContainer(t *testing.T, ctx context.Context) (*pgx.Conn, func()) {
 	t.Helper()
 
 	// Start Postgres container
@@ -58,7 +58,7 @@ func SetupTestDB(t *testing.T) (*pgx.Conn, func()) {
 	t.Helper()
 
 	ctx := context.Background()
-	db, containerCleanupFunc := SetupTestDBContaienr(t, ctx)
+	db, containerCleanupFunc := SetupTestDBContainer(t, ctx)
 
 	// Apply migrations
 	err := MigrateUp(ctx, db)