fix: wrap queries with aggregates inside model instances

BREAKING CHANGE: Earlier the result of query with any aggregate was an
object. Now it is an instance of a model

adonis-typings/model.ts

@@ -367,8 +367,8 @@ declare module '@ioc:Adonis/Lucid/Model' {
     /**
      * Perform delete operation
      */
-    del(): ModelQueryBuilderContract<Model, number>
-    delete(): ModelQueryBuilderContract<Model, number>
+    del(): ModelQueryBuilderContract<Model, any>
+    delete(): ModelQueryBuilderContract<Model, any>
 
     /**
      * Execute query with pagination
@@ -378,9 +378,9 @@ declare module '@ioc:Adonis/Lucid/Model' {
     /**
      * Mutations (update and increment can be one query aswell)
      */
-    update: Update<ModelQueryBuilderContract<Model, number>>
-    increment: Counter<ModelQueryBuilderContract<Model, number>>
-    decrement: Counter<ModelQueryBuilderContract<Model, number>>
+    update: Update<ModelQueryBuilderContract<Model, any>>
+    increment: Counter<ModelQueryBuilderContract<Model, any>>
+    decrement: Counter<ModelQueryBuilderContract<Model, any>>
 
     /**
      * Fetch relationship count
@@ -415,13 +415,13 @@ declare module '@ioc:Adonis/Lucid/Model' {
     /**
      * Aggregates
      */
-    count: Aggregate<ModelQueryBuilderContract<Model, any>>
-    countDistinct: Aggregate<ModelQueryBuilderContract<Model, any>>
-    min: Aggregate<ModelQueryBuilderContract<Model, any>>
-    max: Aggregate<ModelQueryBuilderContract<Model, any>>
-    sum: Aggregate<ModelQueryBuilderContract<Model, any>>
-    avg: Aggregate<ModelQueryBuilderContract<Model, any>>
-    avgDistinct: Aggregate<ModelQueryBuilderContract<Model, any>>
+    count: Aggregate<this>
+    countDistinct: Aggregate<this>
+    min: Aggregate<this>
+    max: Aggregate<this>
+    sum: Aggregate<this>
+    avg: Aggregate<this>
+    avgDistinct: Aggregate<this>
 
     /**
      * Executes the callback when dialect matches one of the mentioned

src/Orm/QueryBuilder/index.ts

@@ -159,7 +159,7 @@ export class ModelQueryBuilder extends Chainable implements ModelQueryBuilderCon
     /**
      * Return the rows as it is when query is a write query
      */
-    if (isWriteQuery || this.hasAggregates || !this.wrapResultsToModelInstances) {
+    if (isWriteQuery || !this.wrapResultsToModelInstances) {
       return Array.isArray(rows) ? rows : [rows]
     }
 

test/orm/base-model.spec.ts

@@ -4373,8 +4373,9 @@ test.group('Base Model | aggregates', (group) => {
     const usersCount = await User.query().count('* as total')
     assert.deepEqual(
       usersCount.map((row) => {
-        row.total = Number(row.total)
-        return row
+        return {
+          total: Number(row.$extras.total),
+        }
       }),
       [{ total: 2 }]
     )
@@ -4399,8 +4400,9 @@ test.group('Base Model | aggregates', (group) => {
     const usersCount = await User.query().countDistinct('username as total')
     assert.deepEqual(
       usersCount.map((row) => {
-        row.total = Number(row.total)
-        return row
+        return {
+          total: Number(row.$extras.total),
+        }
       }),
       [{ total: 2 }]
     )

test/orm/model-has-many-through.spec.ts

@@ -954,7 +954,7 @@ test.group('Model | Has Many Through | aggregates', (group) => {
 
     const country = await Country.find(1)
     const total = await country!.related('posts').query().count('* as total')
-    assert.deepEqual(Number(total[0].total), 2)
+    assert.deepEqual(Number(total[0].$extras.total), 2)
   })
 
   test('select extra columns with count', async (assert) => {
@@ -1012,10 +1012,10 @@ test.group('Model | Has Many Through | aggregates', (group) => {
       .count('* as total')
 
     assert.lengthOf(total, 2)
-    assert.deepEqual(Number(total[0].total), 1)
-    assert.equal(total[0].title, 'Adonis 101')
-    assert.deepEqual(Number(total[0].total), 1)
-    assert.equal(total[1].title, 'Lucid 101')
+    assert.deepEqual(Number(total[0].$extras.total), 1)
+    assert.equal(total[0].$extras.title, 'Adonis 101')
+    assert.deepEqual(Number(total[0].$extras.total), 1)
+    assert.equal(total[1].$extras.title, 'Lucid 101')
   })
 })
 

test/orm/model-has-many.spec.ts

@@ -727,7 +727,7 @@ test.group('Model | HasMany | aggregates', (group) => {
 
     const user = await User.find(1)
     const total = await user!.related('posts').query().count('* as total')
-    assert.equal(Number(total[0].total), 2)
+    assert.equal(Number(total[0].$extras.total), 2)
   })
 })
 

test/orm/model-many-to-many.spec.ts

@@ -904,7 +904,7 @@ test.group('Model | Many To Many | aggregates', (group) => {
     const user = await User.find(1)
     const total = await user!.related('skills').query().count('* as total')
 
-    assert.deepEqual(Number(total[0].total), 2)
+    assert.deepEqual(Number(total[0].$extras.total), 2)
   })
 
   test('select extra columns with count', async (assert) => {
@@ -941,11 +941,11 @@ test.group('Model | Many To Many | aggregates', (group) => {
       .orderBy('skills.id', 'desc')
 
     assert.lengthOf(total, 2)
-    assert.equal(total[0].name, 'Cooking')
-    assert.equal(Number(total[0].total), 1)
+    assert.equal(total[0].$extras.name, 'Cooking')
+    assert.equal(Number(total[0].$extras.total), 1)
 
-    assert.equal(total[1].name, 'Programming')
-    assert.equal(Number(total[1].total), 1)
+    assert.equal(total[1].$extras.name, 'Programming')
+    assert.equal(Number(total[1].$extras.total), 1)
   })
 
   test('select extra pivot columns with count', async (assert) => {
@@ -983,11 +983,11 @@ test.group('Model | Many To Many | aggregates', (group) => {
       .orderBy('skills.id', 'desc')
 
     assert.lengthOf(total, 2)
-    assert.equal(total[0].pivot_proficiency, 'Advanced')
-    assert.equal(Number(total[0].total), 1)
+    assert.equal(total[0].$extras.pivot_proficiency, 'Advanced')
+    assert.equal(Number(total[0].$extras.total), 1)
 
-    assert.equal(total[1].pivot_proficiency, 'Beginner')
-    assert.equal(Number(total[1].total), 1)
+    assert.equal(total[1].$extras.pivot_proficiency, 'Beginner')
+    assert.equal(Number(total[1].$extras.total), 1)
   })
 })
 

test/orm/model-query-builder.spec.ts

@@ -386,6 +386,6 @@ test.group('Model query builder', (group) => {
       .insert([{ username: 'virk' }, { username: 'nikk' }])
 
     const users = await User.query().count('* as total')
-    assert.equal(Number(users[0].total), 2)
+    assert.equal(Number(users[0].$extras.total), 2)
   })
 })