chore: deprecated if and call usage at tests (#444)

kysely-org · Apr 24, 2023 · 8b1cede · 8b1cede · vercel · Apr 24, 2023
1 parent b529407
commit 8b1cede
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/test/node/src/delete.test.ts b/test/node/src/delete.test.ts
@@ -148,7 +148,7 @@ for (const dialect of DIALECTS) {
           .deleteFrom('person')
           .where('gender', '=', 'female')
           .returning('first_name')
-          .if(condition, (qb) => qb.returning('last_name'))
+          .$if(condition, (qb) => qb.returning('last_name'))
 
         testSql(query, dialect, {
           postgres: {

diff --git a/test/node/src/group-by.test.ts b/test/node/src/group-by.test.ts
@@ -245,7 +245,7 @@ for (const dialect of DIALECTS) {
       const result = await ctx.db
         .selectFrom('person')
         .select('person.first_name')
-        .if(filterByPetCount, (qb) =>
+        .$if(filterByPetCount, (qb) =>
           qb
             .innerJoin('pet', 'pet.owner_id', 'person.id')
             .having(count('pet.id'), '>', 1)

diff --git a/test/node/src/insert.test.ts b/test/node/src/insert.test.ts
@@ -765,7 +765,7 @@ for (const dialect of DIALECTS) {
               gender: 'other',
             })
             .returning('first_name')
-            .if(condition, (qb) => qb.returning('last_name'))
+            .$if(condition, (qb) => qb.returning('last_name'))
 
           const result = await query.executeTakeFirstOrThrow()
 

diff --git a/test/node/src/schema.test.ts b/test/node/src/schema.test.ts
@@ -797,7 +797,7 @@ for (const dialect of DIALECTS) {
         const builder = ctx.db.schema
           .createTable('test')
           .addColumn('id', 'integer', (col) => col.notNull())
-          .call((builder) =>
+          .$call((builder) =>
             builder.addColumn('call_me', 'varchar(10)', (col) =>
               col.defaultTo('maybe')
             )
@@ -2447,7 +2447,7 @@ for (const dialect of DIALECTS) {
       it('should alter a table calling query builder functions', async () => {
         const builder = ctx.db.schema
           .alterTable('test')
-          .call((builder) =>
+          .$call((builder) =>
             builder.addColumn('abc', 'integer', (col) => col.defaultTo('42'))
           )
 

diff --git a/test/node/src/update.test.ts b/test/node/src/update.test.ts
@@ -301,7 +301,7 @@ for (const dialect of DIALECTS) {
           .updateTable('person')
           .set({ last_name: 'Barson' })
           .returning('first_name')
-          .if(condition, (qb) => qb.returning('last_name'))
+          .$if(condition, (qb) => qb.returning('last_name'))
 
         const result = await query.executeTakeFirstOrThrow()
 

diff --git a/test/typings/test-d/index.test-d.ts b/test/typings/test-d/index.test-d.ts
@@ -371,7 +371,7 @@ async function testCall(db: Kysely<Database>) {
   const [r1] = await db
     .selectFrom('pet as p')
     .select('p.species')
-    .call((qb) => qb.select('name'))
+    .$call((qb) => qb.select('name'))
     .execute()
 
   expectType<{ species: 'dog' | 'cat'; name: string }>(r1)
@@ -384,15 +384,15 @@ async function testIf(db: Kysely<Database>) {
   const [r1] = await db
     .selectFrom('pet as p')
     .select('p.species')
-    .if(condition, (qb) => qb.select('name'))
+    .$if(condition, (qb) => qb.select('name'))
     .execute()
 
   expectType<{ species: 'dog' | 'cat'; name?: string }>(r1)
 
   // Conditional returning in delete
   const [r2] = await db
     .deleteFrom('person')
-    .if(condition, (qb) => qb.returning('first_name'))
+    .$if(condition, (qb) => qb.returning('first_name'))
     .execute()
 
   expectType<{ first_name?: string }>(r2)
@@ -401,15 +401,15 @@ async function testIf(db: Kysely<Database>) {
   const [r3] = await db
     .deleteFrom('person')
     .returning('first_name')
-    .if(condition, (qb) => qb.returning('last_name'))
+    .$if(condition, (qb) => qb.returning('last_name'))
     .execute()
 
   expectType<{ first_name: string; last_name?: string | null }>(r3)
 
   // Conditional where in delete
   const [r4] = await db
     .deleteFrom('person')
-    .if(condition, (qb) => qb.where('id', '=', 1))
+    .$if(condition, (qb) => qb.where('id', '=', 1))
     .execute()
 
   expectType<DeleteResult>(r4)
@@ -418,7 +418,7 @@ async function testIf(db: Kysely<Database>) {
   const [r5] = await db
     .deleteFrom('person')
     .returning('first_name')
-    .if(condition, (qb) => qb.where('id', '=', 1))
+    .$if(condition, (qb) => qb.where('id', '=', 1))
     .execute()
 
   expectType<{ first_name: string }>(r5)
@@ -427,7 +427,7 @@ async function testIf(db: Kysely<Database>) {
   const [r6] = await db
     .updateTable('person')
     .set({ last_name: 'Foo' })
-    .if(condition, (qb) => qb.returning('first_name'))
+    .$if(condition, (qb) => qb.returning('first_name'))
     .execute()
 
   expectType<{ first_name?: string }>(r6)
@@ -437,7 +437,7 @@ async function testIf(db: Kysely<Database>) {
     .updateTable('person')
     .set({ last_name: 'Foo' })
     .returning('first_name')
-    .if(condition, (qb) => qb.returning('last_name'))
+    .$if(condition, (qb) => qb.returning('last_name'))
     .execute()
 
   expectType<{ first_name: string; last_name?: string | null }>(r7)
@@ -446,7 +446,7 @@ async function testIf(db: Kysely<Database>) {
   const [r8] = await db
     .updateTable('person')
     .set({ last_name: 'Foo' })
-    .if(condition, (qb) => qb.where('id', '=', 1))
+    .$if(condition, (qb) => qb.where('id', '=', 1))
     .execute()
 
   expectType<UpdateResult>(r8)
@@ -456,7 +456,7 @@ async function testIf(db: Kysely<Database>) {
     .updateTable('person')
     .set({ last_name: 'Foo' })
     .returning('first_name')
-    .if(condition, (qb) => qb.where('id', '=', 1))
+    .$if(condition, (qb) => qb.where('id', '=', 1))
     .execute()
 
   expectType<{ first_name: string }>(r9)
@@ -465,7 +465,7 @@ async function testIf(db: Kysely<Database>) {
   const [r10] = await db
     .insertInto('person')
     .values({ first_name: 'Foo', last_name: 'Bar', gender: 'other', age: 0 })
-    .if(condition, (qb) => qb.returning('first_name'))
+    .$if(condition, (qb) => qb.returning('first_name'))
     .execute()
 
   expectType<{ first_name?: string }>(r10)
@@ -475,7 +475,7 @@ async function testIf(db: Kysely<Database>) {
     .insertInto('person')
     .values({ first_name: 'Foo', last_name: 'Bar', gender: 'other', age: 0 })
     .returning('first_name')
-    .if(condition, (qb) => qb.returning('last_name'))
+    .$if(condition, (qb) => qb.returning('last_name'))
     .execute()
 
   expectType<{ first_name: string; last_name?: string | null }>(r11)
@@ -484,7 +484,7 @@ async function testIf(db: Kysely<Database>) {
   const [r12] = await db
     .insertInto('person')
     .values({ first_name: 'Foo', last_name: 'Bar', gender: 'other', age: 0 })
-    .if(condition, (qb) => qb.ignore())
+    .$if(condition, (qb) => qb.ignore())
     .execute()
 
   expectType<InsertResult>(r12)
@@ -494,7 +494,7 @@ async function testIf(db: Kysely<Database>) {
     .insertInto('person')
     .values({ first_name: 'Foo', last_name: 'Bar', gender: 'other', age: 0 })
     .returning('first_name')
-    .if(condition, (qb) => qb.ignore())
+    .$if(condition, (qb) => qb.ignore())
     .execute()
 
   expectType<{ first_name: string }>(r13)