From 9e7a1f7a219e1d4c3d4c6b9495ab220ab62bd6a7 Mon Sep 17 00:00:00 2001
From: Brian Carlson <brian.m.carlson@gmail.com>
Date: Mon, 21 Apr 2025 16:32:07 -0500
Subject: [PATCH] Add more cf compat and update tests

---
 packages/pg/Makefile                      | 2 +-
 packages/pg/test/worker/src/index.test.js | 6 +++++-
 packages/pg/test/worker/src/index.ts      | 4 ++++
 packages/pg/test/worker/tsconfig.json     | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/pg/Makefile b/packages/pg/Makefile
index ea65b518..dae2b185 100644
--- a/packages/pg/Makefile
+++ b/packages/pg/Makefile
@@ -55,4 +55,4 @@ test-pool:
 
 test-worker:
 	@echo "***Testing Cloudflare Worker support***"
-	@node test/worker/src/index.test.js
+	yarn vitest -c test/vitest.config.mts test/cloudflare/ --no-watch
diff --git a/packages/pg/test/worker/src/index.test.js b/packages/pg/test/worker/src/index.test.js
index a706a5e8..d3b8a891 100644
--- a/packages/pg/test/worker/src/index.test.js
+++ b/packages/pg/test/worker/src/index.test.js
@@ -22,9 +22,13 @@ async function test() {
     },
     logLevel: 'ERROR',
   })
+  console.log('worker made')
   try {
-    const resp = await worker.fetch('/')
+    console.log('requesting from worker')
+    const resp = await worker.fetch('http://example.com/')
+    console.log('got resp')
     const res = await resp.json()
+    console.log('get response', res)
     const { rows } = res
     assert.same(rows[0].text, 'Hello, World!')
   } finally {
diff --git a/packages/pg/test/worker/src/index.ts b/packages/pg/test/worker/src/index.ts
index 61597c3c..43a71e8b 100644
--- a/packages/pg/test/worker/src/index.ts
+++ b/packages/pg/test/worker/src/index.ts
@@ -8,18 +8,22 @@ export interface Env {
 
 export default {
   async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+    console.log('worker received request')
     const url = new URL(request.url)
     if (url.pathname === '/favicon.ico') return new Response(null, { status: 404 })
 
     const params = url.searchParams
     const ssl = params.has('ssl')
 
+    console.log('making client')
     var client = new Client({
       user: env.PGUSER || env.USER,
       password: env.PGPASSWORD,
       ssl,
     })
+    console.log('connecting')
     await client.connect()
+    console.log('doing query')
     const resp = Response.json(await client.query('SELECT $1::text', ['Hello, World!']))
     // Clean up the client, ensuring we don't kill the worker before that is completed.
     ctx.waitUntil(client.end())
diff --git a/packages/pg/test/worker/tsconfig.json b/packages/pg/test/worker/tsconfig.json
index 5614137a..038fd6be 100644
--- a/packages/pg/test/worker/tsconfig.json
+++ b/packages/pg/test/worker/tsconfig.json
@@ -4,8 +4,8 @@
 		"lib": [
 			"es2021"
 		],
-		"module": "es2022",
-		"moduleResolution": "node",
+		"module": "node16",
+		"moduleResolution": "node16",
 		"types": [
 			"@cloudflare/workers-types"
 		],