refactor: ask query builder to return the profiler action

src/Database/QueryBuilder/Database.ts

@@ -219,4 +219,18 @@ export class DatabaseQueryBuilder extends Chainable implements DatabaseQueryBuil
 
     return this.client!.getReadClient().client
   }
+
+  /**
+   * Returns the profiler action
+   */
+  public getProfilerAction () {
+    if (!this.client.profiler) {
+      return null
+    }
+
+    return this.client.profiler.profile('sql:query', Object.assign(this['toSQL'](), {
+      connection: this.client.connectionName,
+      inTransaction: this.client.isTransaction,
+    }))
+  }
 }

src/Database/QueryBuilder/Insert.ts

@@ -38,6 +38,20 @@ export class InsertQueryBuilder implements InsertQueryBuilderContract {
     return this.client!.getWriteClient().client
   }
 
+  /**
+   * Returns the profiler action
+   */
+  public getProfilerAction () {
+    if (!this.client.profiler) {
+      return null
+    }
+
+    return this.client.profiler.profile('sql:query', Object.assign(this['toSQL'](), {
+      connection: this.client.connectionName,
+      inTransaction: this.client.isTransaction,
+    }))
+  }
+
   /**
    * Define table for performing the insert query
    */

src/Database/QueryBuilder/Raw.ts

@@ -33,6 +33,20 @@ export class RawQueryBuilder implements RawContract {
     return undefined
   }
 
+  /**
+   * Returns the profiler action
+   */
+  public getProfilerAction () {
+    if (!this.client.profiler) {
+      return null
+    }
+
+    return this.client.profiler.profile('sql:query', Object.assign(this['toSQL'](), {
+      connection: this.client.connectionName,
+      inTransaction: this.client.isTransaction,
+    }))
+  }
+
   /**
    * Wrap the query with before/after strings.
    */

src/Orm/QueryBuilder/index.ts

@@ -204,4 +204,19 @@ export class ModelQueryBuilder extends Chainable implements ModelQueryBuilderCon
   public getQueryClient () {
     return this.client!.getReadClient().client
   }
+
+  /**
+   * Returns the profiler action
+   */
+  public getProfilerAction () {
+    if (!this.client.profiler) {
+      return null
+    }
+
+    return this.client.profiler.profile('sql:query', Object.assign(this['toSQL'](), {
+      connection: this.client.connectionName,
+      inTransaction: this.client.isTransaction,
+      model: this.model.name,
+    }))
+  }
 }

src/Traits/Executable.ts

@@ -23,36 +23,25 @@ import {
  * Enforcing constructor on the destination class
  */
 export type ExecutableConstructor<T = {
-  $knexBuilder: knex.Raw | knex.QueryBuilder,
-  getQueryClient: () => undefined | knex,
   client: QueryClientContract,
   beforeExecute?: () => Promise<void>,
+  getQueryClient: () => undefined | knex,
+  $knexBuilder: knex.Raw | knex.QueryBuilder,
   afterExecute?: (results: any[]) => Promise<any[]>,
+  getProfilerAction (): ProfilerActionContract | null,
 }> = { new (...args: any[]): T }
 
 /**
  * To be used as a trait for executing a query that has a public
  * `$knexBuilder`
  */
 export class Executable implements ExcutableQueryBuilderContract<any> {
-  protected $knexBuilder: knex.QueryBuilder | knex.Raw
   protected client: QueryClientContract
-  protected getQueryClient: () => undefined | knex
   protected beforeExecute?: () => Promise<void>
+  protected getQueryClient: () => undefined | knex
+  protected $knexBuilder: knex.QueryBuilder | knex.Raw
   protected afterExecute?: (results: any[]) => Promise<any[]>
-
-  /**
-   * Returns the profiler action
-   */
-  private _getProfilerAction () {
-    if (!this.client.profiler) {
-      return null
-    }
-
-    return this.client.profiler.profile('sql:query', Object.assign(this.toSQL(), {
-      connection: this.client.connectionName,
-    }))
-  }
+  protected getProfilerAction: () => ProfilerActionContract | null
 
   /**
    * Ends the profile action
@@ -69,7 +58,8 @@ export class Executable implements ExcutableQueryBuilderContract<any> {
    * Executes the knex query builder
    */
   private async _executeQuery () {
-    const action = this._getProfilerAction()
+    const action = this.getProfilerAction()
+
     try {
       const result = await this.$knexBuilder
       this._endProfilerAction(action)
@@ -85,7 +75,7 @@ export class Executable implements ExcutableQueryBuilderContract<any> {
    * knex client
    */
   private async _executeQueryWithCustomConnection (knexClient: knex) {
-    const action = this._getProfilerAction()
+    const action = this.getProfilerAction()
 
     /**
      * Acquire connection from the client and set it as the