Update to deno 1.17 🎉 + fix tests

edgedb · Dec 17, 2021 · af20963 · af20963
1 parent ccdaeba
commit af20963
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/.github/workflows/deno-release.yml b/.github/workflows/deno-release.yml
@@ -26,7 +26,7 @@ jobs:
 
       - uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.16.x
+          deno-version: v1.17.x
 
       - name: Install dev deps
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -65,7 +65,7 @@ jobs:
         uses: denoland/setup-deno@v1
         if: steps.release.outputs.version == 0
         with:
-          deno-version: v1.16.x
+          deno-version: v1.17.x
 
       - name: Install dev deps
         if: steps.release.outputs.version == 0

diff --git a/src/adapter.deno.ts b/src/adapter.deno.ts
@@ -6,6 +6,7 @@ import {
   HmacSha256,
 } from "https://deno.land/[email protected]/hash/sha256.ts";
 import path from "https://deno.land/[email protected]/node/path.ts";
+import * as _fs from "https://deno.land/[email protected]/fs/mod.ts";
 import EventEmitter from "https://deno.land/[email protected]/node/events.ts";
 import util from "https://deno.land/[email protected]/node/util.ts";
 import {iterateReader} from "https://deno.land/[email protected]/streams/conversion.ts";

diff --git a/test/client.test.ts b/test/client.test.ts
@@ -51,6 +51,8 @@ function setStringCodecs(codecs: string[], client: Client) {
   );
 }
 
+class CancelTransaction extends Error {}
+
 test("query: basic scalars", async () => {
   const con = getClient();
   let res: any;
@@ -1219,32 +1221,38 @@ test("fetch: uuid", async () => {
 test("fetch: enum", async () => {
   const client = getClient();
 
-  await client.withRetryOptions({attempts: 1}).transaction(async tx => {
-    await tx.execute(`
+  try {
+    await client.withRetryOptions({attempts: 1}).transaction(async tx => {
+      await tx.execute(`
         CREATE SCALAR TYPE MyEnum EXTENDING enum<"A", "B">;
       `);
 
-    // await tx.query("declare savepoint s1");
-    // await tx
-    //   .querySingle("SELECT <MyEnum><str>$0", ["Z"])
-    //   .then(() => {
-    //     throw new Error("an exception was expected");
-    //   })
-    //   .catch((e) => {
-    //     expect(e.toString()).toMatch(/invalid input value for enum/);
-    //   });
-    // await tx.query("rollback to savepoint s1");
+      // await tx.query("declare savepoint s1");
+      // await tx
+      //   .querySingle("SELECT <MyEnum><str>$0", ["Z"])
+      //   .then(() => {
+      //     throw new Error("an exception was expected");
+      //   })
+      //   .catch((e) => {
+      //     expect(e.toString()).toMatch(/invalid input value for enum/);
+      //   });
+      // await tx.query("rollback to savepoint s1");
 
-    let ret = await tx.querySingle("SELECT <MyEnum><str>$0", ["A"]);
-    expect(ret).toBe("A");
+      let ret = await tx.querySingle("SELECT <MyEnum><str>$0", ["A"]);
+      expect(ret).toBe("A");
 
-    ret = await tx.querySingle("SELECT <MyEnum>$0", ["A"]);
-    expect(ret).toBe("A");
+      ret = await tx.querySingle("SELECT <MyEnum>$0", ["A"]);
+      expect(ret).toBe("A");
 
-    await tx.rollback();
-  });
-
-  await client.close();
+      throw new CancelTransaction();
+    });
+  } catch (e) {
+    if (!(e instanceof CancelTransaction)) {
+      throw e;
+    }
+  } finally {
+    await client.close();
+  }
 });
 
 test("fetch: namedtuple", async () => {
@@ -1572,8 +1580,12 @@ test("fetch/optimistic cache invalidation", async () => {
         expect(res).toBe(123);
       }
 
-      await tx.rollback();
+      throw new CancelTransaction();
     });
+  } catch (e) {
+    if (!(e instanceof CancelTransaction)) {
+      throw e;
+    }
   } finally {
     await client.close();
   }