update tests

mmkal · Apr 23, 2024 · 569fc38 · 569fc38
1 parent d30219f
commit 569fc38
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/client/test/api-usage.test.ts b/packages/client/test/api-usage.test.ts
@@ -190,7 +190,7 @@ test('sql.literalValue', async () => {
 
   expect(result).toEqual({search_path: 'abc'})
   const result2 = await client.one(sql`show search_path`)
-  expect(result2).toEqual({search_path: '"$user", public'})
+  expect(result2?.search_path).toMatch(/\bpublic\b/)
 })
 
 /**

diff --git a/packages/client/test/pgp.test.ts b/packages/client/test/pgp.test.ts
@@ -99,7 +99,7 @@ test('non-string array', async () => {
     values: [],
   })
   const result = await db.query(statement)
-  expect(result).toEqual([{one: 1, two: '{}'}])
+  expect(result).toEqual([{one: 1, two: '{M,F}'}])
 })
 
 test('prepare statement command does not accept values', async () => {
@@ -189,9 +189,9 @@ test('type parsers', async () => {
 
   const oidToTypname = Object.fromEntries(result.map(r => [r.oid, r]))
   const mappedBuiltins = Object.entries(pgp.pg.types.builtins).map(([name, oid]) => ({
+    ...oidToTypname[oid],
     oid,
     name,
-    ...oidToTypname[oid],
   }))
 
   expect(mappedBuiltins).toMatchInlineSnapshot(`

diff --git a/packages/client/test/slonik37.test.ts b/packages/client/test/slonik37.test.ts
@@ -234,7 +234,7 @@ test('sql.literalValue', async () => {
 
   expect(result).toEqual({search_path: 'abc'})
   const result2 = await client.one(sql`show search_path`)
-  expect(result2).toEqual({search_path: '"$user", public'})
+  expect(result2?.search_path).toMatch(/\bpublic\b/)
 })
 
 /**

diff --git a/packages/migrator/test/definitions.test.ts b/packages/migrator/test/definitions.test.ts
@@ -52,13 +52,13 @@ describe('sort sql statements', () => {
       {
         "01.one.sql": "create table patient(id int primary key, name text)",
         "02.two.sql": "
-            create type address as (street text, city text, state text, zip text);
-            create type patient_type as enum ('human', 'animal');
-          ",
+              create type address as (street text, city text, state text, zip text);
+              create type patient_type as enum ('human', 'animal');
+            ",
         "03.three.sql": "
-            alter table patient add column address address;
-            alter table patient add column type patient_type;
-          ",
+              alter table patient add column address address;
+              alter table patient add column type patient_type;
+            ",
         "definitions.sql": "create type "public"."patient_type" as enum ('human', 'animal');
 
       create type "public"."address" as ("street" text, "city" text, "state" text, "zip" text);