From cd961dad860b95ec5199b57de814435fac126a96 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 11 Jul 2024 17:19:47 -0500
Subject: [PATCH] delay -> sleep, style tweaks

---
 scripts/db-migrate.ts            | 9 +++++----
 src/db/adapters/DittoPostgres.ts | 2 +-
 src/test.ts                      | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/db-migrate.ts b/scripts/db-migrate.ts
index 20729f22..b4a00d8c 100644
--- a/scripts/db-migrate.ts
+++ b/scripts/db-migrate.ts
@@ -1,9 +1,10 @@
+import { Conf } from '@/config.ts';
 import { DittoDB } from '@/db/DittoDB.ts';
-import { delay } from '@/test.ts';
+import { sleep } from '@/test.ts';
 
-if (Deno.env.get('CI') && Deno.env.get('DATABASE_URL')?.startsWith('postgres')) {
-  console.info('Waiting 15 seconds for postgres to start...');
-  await delay(15000);
+if (Deno.env.get('CI') && Conf.db.dialect === 'postgres') {
+  console.info('Waiting 1 second for postgres to start...');
+  await sleep(1_000);
 }
 
 const kysely = await DittoDB.getInstance();
diff --git a/src/db/adapters/DittoPostgres.ts b/src/db/adapters/DittoPostgres.ts
index e8e44b91..ac33a8c3 100644
--- a/src/db/adapters/DittoPostgres.ts
+++ b/src/db/adapters/DittoPostgres.ts
@@ -19,7 +19,7 @@ export class DittoPostgres {
     if (!this.db) {
       this.db = new Kysely({
         dialect: new PostgresJSDialect({
-          postgres: this.postgres as any,
+          postgres: this.postgres,
         }),
         log: KyselyLogger,
       });
diff --git a/src/test.ts b/src/test.ts
index f0c1eac5..a982e1a9 100644
--- a/src/test.ts
+++ b/src/test.ts
@@ -63,4 +63,6 @@ export async function getTestDB() {
   };
 }
 
-export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+export function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}