Skip to content

Commit b733777

Browse files
committed
test: add upload_cleanup_jobs table to test databases
1 parent cff6529 commit b733777

5 files changed

Lines changed: 42 additions & 0 deletions

File tree

‎worker/test/admin-auth.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ describe('administrator cookie session', () => {
5353
created_at TEXT NOT NULL,
5454
orphaned_at TEXT
5555
)`),
56+
env.DB.prepare(`CREATE TABLE IF NOT EXISTS upload_cleanup_jobs (
57+
id TEXT PRIMARY KEY,
58+
upload_id TEXT NOT NULL,
59+
r2_key TEXT NOT NULL,
60+
size_bytes INTEGER NOT NULL,
61+
claimed_at TEXT NOT NULL
62+
)`),
5663
env.DB.prepare(`CREATE TRIGGER IF NOT EXISTS test_file_blobs_orphan_after_share_soft_delete
5764
AFTER UPDATE OF deleted_at ON shares
5865
WHEN OLD.type = 'file'

‎worker/test/instant-upload.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@ describe('verified instant upload', () => {
7373
object_uploaded_at TEXT, status TEXT NOT NULL,
7474
created_at TEXT NOT NULL, orphaned_at TEXT
7575
)`),
76+
env.DB.prepare(`CREATE TABLE IF NOT EXISTS upload_cleanup_jobs (
77+
id TEXT PRIMARY KEY,
78+
upload_id TEXT NOT NULL,
79+
r2_key TEXT NOT NULL,
80+
size_bytes INTEGER NOT NULL,
81+
claimed_at TEXT NOT NULL
82+
)`),
7683
env.DB.prepare(`CREATE UNIQUE INDEX IF NOT EXISTS test_file_blobs_active_fingerprint
7784
ON file_blobs(fingerprint_algorithm, content_fingerprint, size_bytes)
7885
WHERE status = 'active' AND fingerprint_algorithm IS NOT NULL
@@ -126,6 +133,7 @@ describe('verified instant upload', () => {
126133
beforeEach(async () => {
127134
await env.DB.prepare('DELETE FROM shares').run()
128135
await env.DB.prepare('DELETE FROM upload_sessions').run()
136+
await env.DB.prepare('DELETE FROM upload_cleanup_jobs').run()
129137
await env.DB.prepare('DELETE FROM file_blobs').run()
130138
await env.DB.prepare('DELETE FROM audit_logs').run()
131139
await env.DB.prepare('DELETE FROM abuse_counters').run()

‎worker/test/scheduled.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ describe('scheduled cleanup reporting', () => {
4646
created_at TEXT NOT NULL,
4747
orphaned_at TEXT
4848
)`),
49+
env.DB.prepare(`CREATE TABLE IF NOT EXISTS upload_cleanup_jobs (
50+
id TEXT PRIMARY KEY,
51+
upload_id TEXT NOT NULL,
52+
r2_key TEXT NOT NULL,
53+
size_bytes INTEGER NOT NULL,
54+
claimed_at TEXT NOT NULL
55+
)`),
4956
env.DB.prepare(`CREATE TRIGGER IF NOT EXISTS test_scheduled_orphan_after_share_soft_delete
5057
AFTER UPDATE OF deleted_at ON shares
5158
WHEN OLD.type = 'file'
@@ -70,6 +77,7 @@ describe('scheduled cleanup reporting', () => {
7077
await env.DB.batch([
7178
env.DB.prepare('DELETE FROM shares'),
7279
env.DB.prepare('DELETE FROM upload_sessions'),
80+
env.DB.prepare('DELETE FROM upload_cleanup_jobs'),
7381
env.DB.prepare('DELETE FROM file_blobs'),
7482
env.DB.prepare('DELETE FROM abuse_counters'),
7583
env.DB.prepare('DELETE FROM audit_logs'),

‎worker/test/share-download.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ describe('share download accounting', () => {
7272
created_at TEXT NOT NULL,
7373
orphaned_at TEXT
7474
)`),
75+
env.DB.prepare(`CREATE TABLE IF NOT EXISTS upload_cleanup_jobs (
76+
id TEXT PRIMARY KEY,
77+
upload_id TEXT NOT NULL,
78+
r2_key TEXT NOT NULL,
79+
size_bytes INTEGER NOT NULL,
80+
claimed_at TEXT NOT NULL
81+
)`),
7582
env.DB.prepare(`CREATE TABLE IF NOT EXISTS storage_usage (
7683
id INTEGER PRIMARY KEY CHECK (id = 1),
7784
active_bytes INTEGER NOT NULL DEFAULT 0
@@ -172,6 +179,10 @@ describe('share download accounting', () => {
172179

173180
beforeEach(async () => {
174181
await env.DB.batch([
182+
env.DB.prepare('DELETE FROM shares'),
183+
env.DB.prepare('DELETE FROM upload_sessions'),
184+
env.DB.prepare('DELETE FROM upload_cleanup_jobs'),
185+
env.DB.prepare('DELETE FROM file_blobs'),
175186
env.DB.prepare('DELETE FROM abuse_counters'),
176187
env.DB.prepare('DELETE FROM settings'),
177188
])

‎worker/test/storage-accounting.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ describe('storage accounting with D1 triggers', () => {
4040
created_at TEXT NOT NULL,
4141
orphaned_at TEXT
4242
)`),
43+
env.DB.prepare(`CREATE TABLE IF NOT EXISTS upload_cleanup_jobs (
44+
id TEXT PRIMARY KEY,
45+
upload_id TEXT NOT NULL,
46+
r2_key TEXT NOT NULL,
47+
size_bytes INTEGER NOT NULL,
48+
claimed_at TEXT NOT NULL
49+
)`),
4350
env.DB.prepare(`CREATE UNIQUE INDEX IF NOT EXISTS test_active_blob_fingerprint
4451
ON file_blobs(fingerprint_algorithm, content_fingerprint, size_bytes)
4552
WHERE status = 'active'
@@ -128,6 +135,7 @@ describe('storage accounting with D1 triggers', () => {
128135
beforeEach(async () => {
129136
await env.DB.prepare('DELETE FROM shares').run()
130137
await env.DB.prepare('DELETE FROM upload_sessions').run()
138+
await env.DB.prepare('DELETE FROM upload_cleanup_jobs').run()
131139
await env.DB.prepare('DELETE FROM file_blobs').run()
132140
await env.DB.prepare('UPDATE storage_usage SET active_bytes = 0 WHERE id = 1').run()
133141
})

0 commit comments

Comments
 (0)