Miscellaneous database cleanup

riverdriver/river_driver_interface.go

@@ -872,8 +872,10 @@ func MigrationLineMainTruncateTables(version int) []string {
 		return []string{"river_job", "river_leader"}
 	case 4:
 		return []string{"river_job", "river_leader", "river_queue"}
+	case 5, 6:
+		return []string{"river_job", "river_leader", "river_queue", "river_client", "river_client_queue"}
 	}
 
-	// 0 (zero value), 5, 6
-	return []string{"river_job", "river_leader", "river_queue", "river_client", "river_client_queue"}
+	// 0 (zero value), 7
+	return []string{"river_job", "river_leader", "river_queue"}
 }

riverdriver/riverdatabasesql/internal/dbsqlc/sqlc.yaml

@@ -3,17 +3,13 @@ sql:
   - engine: "postgresql"
     queries:
       - ../../../riverpgxv5/internal/dbsqlc/pg_misc.sql
-      - ../../../riverpgxv5/internal/dbsqlc/river_client.sql
-      - ../../../riverpgxv5/internal/dbsqlc/river_client_queue.sql
       - ../../../riverpgxv5/internal/dbsqlc/river_job.sql
       - ../../../riverpgxv5/internal/dbsqlc/river_leader.sql
       - ../../../riverpgxv5/internal/dbsqlc/river_migration.sql
       - ../../../riverpgxv5/internal/dbsqlc/river_queue.sql
       - ../../../riverpgxv5/internal/dbsqlc/schema.sql
     schema:
       - ../../../riverpgxv5/internal/dbsqlc/pg_misc.sql
-      - ../../../riverpgxv5/internal/dbsqlc/river_client.sql
-      - ../../../riverpgxv5/internal/dbsqlc/river_client_queue.sql
       - ../../../riverpgxv5/internal/dbsqlc/river_job.sql
       - ../../../riverpgxv5/internal/dbsqlc/river_leader.sql
       - ../../../riverpgxv5/internal/dbsqlc/river_migration.sql

riverdriver/riverdatabasesql/migration/main/007_misc_cleanup.down.sql

@@ -0,0 +1,41 @@
+--
+-- Add back unused tables `river_client` and `river_client_queue`.
+--
+
+CREATE UNLOGGED TABLE /* TEMPLATE: schema */river_client (
+    id text PRIMARY KEY NOT NULL,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    metadata jsonb NOT NULL DEFAULT '{}',
+    paused_at timestamptz,
+    updated_at timestamptz NOT NULL,
+    CONSTRAINT name_length CHECK (char_length(id) > 0 AND char_length(id) < 128)
+);
+
+CREATE UNLOGGED TABLE /* TEMPLATE: schema */river_client_queue (
+    river_client_id text NOT NULL REFERENCES /* TEMPLATE: schema */river_client (id) ON DELETE CASCADE,
+    name text NOT NULL,
+    created_at timestamptz NOT NULL DEFAULT now(),
+    max_workers bigint NOT NULL DEFAULT 0,
+    metadata jsonb NOT NULL DEFAULT '{}',
+    num_jobs_completed bigint NOT NULL DEFAULT 0,
+    num_jobs_running bigint NOT NULL DEFAULT 0,
+    updated_at timestamptz NOT NULL,
+    PRIMARY KEY (river_client_id, name),
+    CONSTRAINT name_length CHECK (char_length(name) > 0 AND char_length(name) < 128),
+    CONSTRAINT num_jobs_completed_zero_or_positive CHECK (num_jobs_completed >= 0),
+    CONSTRAINT num_jobs_running_zero_or_positive CHECK (num_jobs_running >= 0)
+);
+
+--
+-- Revert addition of `DEFAULT 25` to `river_job.max_attempts`.
+--
+
+ALTER TABLE /* TEMPLATE: schema */river_job
+    ALTER COLUMN max_attempts DROP DEFAULT;
+
+-- 
+-- Changes `river_queue.updated_at` to revert the default of `CURRENT_TIMESTAMP`.
+--
+
+ALTER TABLE /* TEMPLATE: schema */river_queue
+    ALTER COLUMN updated_at DROP DEFAULT;

riverdriver/riverdatabasesql/migration/main/007_misc_cleanup.up.sql

@@ -0,0 +1,20 @@
+--
+-- Drop unused tables `river_client` and `river_client_queue`.
+--
+
+DROP TABLE /* TEMPLATE: schema */river_client_queue;
+DROP TABLE /* TEMPLATE: schema */river_client;
+
+--
+-- Adds `DEFAULT 25` to `river_job.max_attempts`.
+--
+
+ALTER TABLE /* TEMPLATE: schema */river_job
+    ALTER COLUMN max_attempts SET DEFAULT 25;
+
+-- 
+-- Changes `river_queue.updated_at` to have a default of `CURRENT_TIMESTAMP`.
+--
+
+ALTER TABLE /* TEMPLATE: schema */river_queue
+    ALTER COLUMN updated_at SET DEFAULT CURRENT_TIMESTAMP;

riverdriver/riverdrivertest/riverdrivertest.go

@@ -108,7 +108,9 @@ func Exercise[TTx any](ctx context.Context, t *testing.T,
 				driver.GetMigrationTruncateTables(riverdriver.MigrationLineMain, 5))
 			require.Equal(t, []string{"river_job", "river_leader", "river_queue", "river_client", "river_client_queue"},
 				driver.GetMigrationTruncateTables(riverdriver.MigrationLineMain, 6))
-			require.Equal(t, []string{"river_job", "river_leader", "river_queue", "river_client", "river_client_queue"},
+			require.Equal(t, []string{"river_job", "river_leader", "river_queue"},
+				driver.GetMigrationTruncateTables(riverdriver.MigrationLineMain, 7))
+			require.Equal(t, []string{"river_job", "river_leader", "river_queue"},
 				driver.GetMigrationTruncateTables(riverdriver.MigrationLineMain, 0))
 		})
 	})