Introduce wp profile queries command

README.md

@@ -181,6 +181,91 @@ will need to execute during the course of the request.
 
 
 
+### wp profile queries
+
+Profile database queries and their execution time.
+
+~~~
+wp profile queries [--url=<url>] [--hook=<hook>] [--callback=<callback>] [--fields=<fields>] [--format=<format>] [--order=<order>] [--orderby=<fields>]
+~~~
+
+Displays all database queries executed during a WordPress request,
+along with their execution time and caller information. You can filter
+queries to only show those executed during a specific hook or by a
+specific callback.
+
+**OPTIONS**
+
+	[--url=<url>]
+		Execute a request against a specified URL. Defaults to the home URL.
+
+	[--hook=<hook>]
+		Filter queries to only show those executed during a specific hook.
+
+	[--callback=<callback>]
+		Filter queries to only show those executed by a specific callback.
+
+	[--fields=<fields>]
+		Limit the output to specific fields.
+
+	[--format=<format>]
+		Render output in a particular format.
+		---
+		default: table
+		options:
+		  - table
+		  - json
+		  - yaml
+		  - csv
+		---
+
+	[--order=<order>]
+		Ascending or Descending order.
+		---
+		default: ASC
+		options:
+		  - ASC
+		  - DESC
+		---
+
+	[--orderby=<fields>]
+		Set orderby which field.
+
+**EXAMPLES**
+
+    # Show all queries with their execution time
+    $ wp profile queries --fields=query,time
+    +--------------------------------------+---------+
+    | query                                | time    |
+    +--------------------------------------+---------+
+    | SELECT option_value FROM wp_options  | 0.0001s |
+    | SELECT * FROM wp_posts WHERE ID = 1  | 0.0003s |
+    +--------------------------------------+---------+
+    | total (2)                            | 0.0004s |
+    +--------------------------------------+---------+
+
+    # Show queries executed during the 'init' hook
+    $ wp profile queries --hook=init --fields=query,time,callback
+    +--------------------------------------+---------+------------------+
+    | query                                | time    | callback         |
+    +--------------------------------------+---------+------------------+
+    | SELECT * FROM wp_users               | 0.0002s | my_init_func()   |
+    +--------------------------------------+---------+------------------+
+    | total (1)                            | 0.0002s |                  |
+    +--------------------------------------+---------+------------------+
+
+    # Show queries executed by a specific callback
+    $ wp profile queries --callback='WP_Query->get_posts()' --fields=query,time
+    +--------------------------------------+---------+
+    | query                                | time    |
+    +--------------------------------------+---------+
+    | SELECT * FROM wp_posts               | 0.0004s |
+    +--------------------------------------+---------+
+    | total (1)                            | 0.0004s |
+    +--------------------------------------+---------+
+
+
+
 ### wp profile eval
 
 Profile arbitrary code execution.

composer.json

@@ -29,7 +29,8 @@
       "profile stage",
       "profile hook",
       "profile eval",
-      "profile eval-file"
+      "profile eval-file",
+      "profile queries"
     ],
     "readme": {
       "sections": [

features/profile-queries.feature

@@ -0,0 +1,100 @@
+Feature: Profile database queries
+
+  @require-wp-4.0
+  Scenario: Show all database queries
+    Given a WP install
+
+    When I run `wp profile queries --fields=time`
+    Then STDOUT should contain:
+      """
+      time
+      """
+    And STDOUT should contain:
+      """
+      total
+      """
+    And STDERR should be empty
+
+  @require-wp-4.0
+  Scenario: Show queries with specific fields
+    Given a WP install
+
+    When I run `wp profile queries --fields=query,time`
+    Then STDOUT should contain:
+      """
+      query
+      """
+    And STDOUT should contain:
+      """
+      time
+      """
+    And STDOUT should contain:
+      """
+      SELECT
+      """
+    And STDERR should be empty
+
+  @require-wp-4.0
+  Scenario: Order queries by execution time
+    Given a WP install
+
+    When I run `wp profile queries --fields=time --orderby=time --order=DESC`
+    Then STDOUT should contain:
+      """
+      time
+      """
+    And STDERR should be empty
+
+  @require-wp-4.0
+  Scenario: Display queries in JSON format
+    Given a WP install
+
+    When I run `wp profile queries --format=json --fields=query,time`
+    Then STDOUT should contain:
+      """
+      "query"
+      """
+    And STDOUT should contain:
+      """
+      "time"
+      """
+    And STDERR should be empty
+
+  @require-wp-4.0
+  Scenario: Filter queries by hook
+    Given a WP install
+    And a wp-content/mu-plugins/query-test.php file:
+      """
+      <?php
+      add_action( 'init', function() {
+        global $wpdb;
+        $wpdb->query( "SELECT 1 as test_query" );
+      });
+      """
+
+    When I run `wp profile queries --hook=init --fields=query,callback`
+    Then STDOUT should contain:
+      """
+      SELECT 1 as test_query
+      """
+    And STDERR should be empty
+
+  @require-wp-4.0
+  Scenario: Filter queries by callback
+    Given a WP install
+    And a wp-content/mu-plugins/callback-test.php file:
+      """
+      <?php
+      function my_test_callback() {
+        global $wpdb;
+        $wpdb->query( "SELECT 2 as callback_test" );
+      }
+      add_action( 'init', 'my_test_callback' );
+      """
+
+    When I run `wp profile queries --callback=my_test_callback --fields=query,hook`
+    Then STDOUT should contain:
+      """
+      SELECT 2 as callback_test
+      """
+    And STDERR should be empty

features/profile.feature

@@ -9,6 +9,7 @@ Feature: Basic profile usage
       usage: wp profile eval <php-code> [--hook[=<hook>]] [--fields=<fields>] [--format=<format>] [--order=<order>] [--orderby=<fields>]
          or: wp profile eval-file <file> [--hook[=<hook>]] [--fields=<fields>] [--format=<format>] [--order=<order>] [--orderby=<fields>]
          or: wp profile hook [<hook>] [--all] [--spotlight] [--url=<url>] [--fields=<fields>] [--format=<format>] [--order=<order>] [--orderby=<fields>]
+         or: wp profile queries [--url=<url>] [--hook=<hook>] [--callback=<callback>] [--fields=<fields>] [--format=<format>] [--order=<order>] [--orderby=<fields>]
          or: wp profile stage [<stage>] [--all] [--spotlight] [--url=<url>] [--fields=<fields>] [--format=<format>] [--order=<order>] [--orderby=<fields>]
 
       See 'wp help profile <command>' for more information on a specific command.

src/Command.php

@@ -493,6 +493,157 @@ private static function include_file( $file ) {
 		include $file;
 	}
 
+	/**
+	 * Profile database queries and their execution time.
+	 *
+	 * Displays all database queries executed during a WordPress request,
+	 * along with their execution time and caller information. You can filter
+	 * queries to only show those executed during a specific hook or by a
+	 * specific callback.
+	 *
+	 * ## OPTIONS
+	 *
+	 * [--url=<url>]
+	 * : Execute a request against a specified URL. Defaults to the home URL.
+	 *
+	 * [--hook=<hook>]
+	 * : Filter queries to only show those executed during a specific hook.
+	 *
+	 * [--callback=<callback>]
+	 * : Filter queries to only show those executed by a specific callback.
+	 *
+	 * [--fields=<fields>]
+	 * : Limit the output to specific fields.
+	 *
+	 * [--format=<format>]
+	 * : Render output in a particular format.
+	 * ---
+	 * default: table
+	 * options:
+	 *   - table
+	 *   - json
+	 *   - yaml
+	 *   - csv
+	 * ---
+	 *
+	 * [--order=<order>]
+	 * : Ascending or Descending order.
+	 * ---
+	 * default: ASC
+	 * options:
+	 *   - ASC
+	 *   - DESC
+	 * ---
+	 *
+	 * [--orderby=<fields>]
+	 * : Set orderby which field.
+	 *
+	 * ## EXAMPLES
+	 *
+	 *     # Show all queries with their execution time
+	 *     $ wp profile queries --fields=query,time
+	 *
+	 *     # Show queries executed during the 'init' hook
+	 *     $ wp profile queries --hook=init --fields=query,time,caller
+	 *
+	 *     # Show queries executed by a specific callback
+	 *     $ wp profile queries --callback='WP_Query->get_posts()' --fields=query,time
+	 *
+	 *     # Show queries ordered by execution time
+	 *     $ wp profile queries --fields=query,time --orderby=time --order=DESC
+	 *
+	 * @when before_wp_load
+	 */
+	public function queries( $args, $assoc_args ) {
+		global $wpdb;
+
+		$hook     = Utils\get_flag_value( $assoc_args, 'hook' );
+		$callback = Utils\get_flag_value( $assoc_args, 'callback' );
+		$order    = Utils\get_flag_value( $assoc_args, 'order', 'ASC' );
+		$orderby  = Utils\get_flag_value( $assoc_args, 'orderby', null );
+
+		// Set up profiler to track hooks and callbacks
+		$type  = null;
+		$focus = null;
+		if ( $hook ) {
+			$type  = 'hook';
+			$focus = $hook;
+		} elseif ( $callback ) {
+			$type  = 'hook';
+			$focus = true; // Profile all hooks to find the specific callback
+		}
+
+		$profiler = new Profiler( $type, $focus );
+		$profiler->run();
+
+		// Build a map of query indices to hooks/callbacks
+		$query_map = array();
+		if ( $hook || $callback ) {
+			$loggers = $profiler->get_loggers();
+			foreach ( $loggers as $logger ) {
+				// Skip if filtering by callback and this isn't the right one
+				if ( $callback && isset( $logger->callback ) ) {
+					// Normalize callback for comparison
+					$normalized_callback = str_replace( array( '->', '::' ), '', (string) $logger->callback );
+					$normalized_filter   = str_replace( array( '->', '::' ), '', $callback );
+					if ( false === stripos( $normalized_callback, $normalized_filter ) ) {
+						continue;
+					}
+				}
+
+				// Skip if filtering by hook and this isn't the right one
+				if ( $hook && isset( $logger->hook ) && $logger->hook !== $hook ) {
+					continue;
+				}
+
+				// Get the query indices for this logger
+				if ( isset( $logger->query_indices ) && ! empty( $logger->query_indices ) ) {
+					foreach ( $logger->query_indices as $query_index ) {
+						if ( ! isset( $query_map[ $query_index ] ) ) {
+							$query_map[ $query_index ] = array(
+								'hook'     => isset( $logger->hook ) ? $logger->hook : null,
+								'callback' => isset( $logger->callback ) ? $logger->callback : null,
+							);
+						}
+					}
+				}
+			}
+		}
+
+		// Get all queries
+		$queries = array();
+		if ( ! empty( $wpdb->queries ) ) {
+			foreach ( $wpdb->queries as $index => $query_data ) {
+				// If filtering by hook/callback, only include queries in the map
+				if ( ( $hook || $callback ) && ! isset( $query_map[ $index ] ) ) {
+					continue;
+				}
+
+				$query_obj = new QueryLogger(
+					$query_data[0], // SQL query
+					$query_data[1], // Time
+					isset( $query_data[2] ) ? $query_data[2] : '', // Caller
+					isset( $query_map[ $index ]['hook'] ) ? $query_map[ $index ]['hook'] : null,
+					isset( $query_map[ $index ]['callback'] ) ? $query_map[ $index ]['callback'] : null
+				);
+				$queries[] = $query_obj;
+			}
+		}
+
+		// Set up fields for output
+		$fields = array( 'query', 'time', 'caller' );
+		if ( $hook && ! $callback ) {
+			$fields = array( 'query', 'time', 'callback', 'caller' );
+		} elseif ( $callback && ! $hook ) {
+			$fields = array( 'query', 'time', 'hook', 'caller' );
+		} elseif ( $hook && $callback ) {
+			$fields = array( 'query', 'time', 'hook', 'callback', 'caller' );
+		}
+
+		$formatter = new Formatter( $assoc_args, $fields );
+		$formatter->display_items( $queries, true, $order, $orderby );
+	}
+
 	/**
 	 * Filter loggers with zero-ish values.
 	 *

src/Logger.php

@@ -4,9 +4,13 @@
 
 class Logger {
 
 	public $time                = 0;
 	public $query_count         = 0;
 	public $query_time          = 0;
+	/**
+	 * @var array Array of query indices tracked during this logger's execution.
+	 */
+	public $query_indices       = array();
 	public $cache_hits          = 0;
 	public $cache_misses        = 0;
 	public $cache_ratio         = null;
@@ -87,6 +91,7 @@
 			for ( $i = $this->query_offset; $i < $query_total_count; $i++ ) {
 				$this->query_time += $wpdb->queries[ $i ][1];
 				++$this->query_count;
+				$this->query_indices[] = $i;
 			}
 		}