fix(SoftDeletes): fix where clause of query as undefined

lookinlab · May 28, 2022 · 3f87784 · 3f87784
1 parent 46e791c
commit 3f87784
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/SoftDeletes/index.ts b/src/SoftDeletes/index.ts
@@ -29,7 +29,7 @@ export function SoftDeletes<T extends NormalizeConstructor<LucidModel>> (supercl
       if (query['ignoreDeleted'] === false) {
         return
       }
-      const isGroupLimitQuery = query.toQuery().includes('adonis_group_limit_counter')
+      const isGroupLimitQuery = query.clone().toQuery().includes('adonis_group_limit_counter')
       const deletedAtColumn = query.model.$getColumn('deletedAt')?.columnName
 
       const queryIgnoreDeleted = isGroupLimitQuery ? query.knexQuery['_single'].table : query

diff --git a/test/relations.spec.ts b/test/relations.spec.ts
@@ -108,8 +108,6 @@ test.group('Relations', (group) => {
     }
 
     class Book extends MyBaseModel {
-      public static table = 'books'
-
       @column()
       public name: string
 
@@ -118,8 +116,6 @@ test.group('Relations', (group) => {
     }
 
     class Author extends MyBaseModel {
-      public static table = 'authors'
-
       @column()
       public name: string
 
@@ -161,6 +157,7 @@ test.group('Relations', (group) => {
     assert.lengthOf(books, 1)
     assert.lengthOf(books[0].authors, 1)
 
+    await book1.related('authors').detach()
     await Promise.all([Book.truncate(), Author.truncate()])
   })
 
@@ -230,6 +227,13 @@ test.group('Relations', (group) => {
     assert.lengthOf(authorsLimit2[0].authors, 2)
     assert.lengthOf(authorsLimit2[1].authors, 2)
 
+    const authorsJohns = await Book.query()
+      .preload('authors', (authors) => authors.where('name', 'Mary'))
+      .paginate(1, 10)
+
+    assert.lengthOf(authorsJohns, 2)
+    assert.lengthOf(authorsJohns[0].authors, 1)
+
     await Promise.all([Book.truncate(), Author.truncate()])
   })
 })