Skip to content

Add Affected Rows Count for queries that can modify data in wp db query #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrsdizzie merged 16 commits into from
Mar 10, 2025
+39 −1
Merged

Add Affected Rows Count for queries that can modify data in wp db query #277

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
99d44cb
Update WPCLI update/delete query for affected rows
karthick-murugan Feb 25, 2025
857c616
Phpcs Updates
karthick-murugan Feb 26, 2025
3426913
Testing issues fix
karthick-murugan Feb 27, 2025
02c6910
Testing issues fix
karthick-murugan Feb 27, 2025
8f5b76b
Feedback changes
karthick-murugan Feb 28, 2025
0e84308
Remove errant whitespace
swissspidy Mar 6, 2025
7d3ddb8
DRY: Extract condition
swissspidy Mar 6, 2025
c643653
Add an `else` block
swissspidy Mar 6, 2025
65de001
Don't print if stdout is empty
swissspidy Mar 6, 2025
2b80cd7
use `elseif`
swissspidy Mar 6, 2025
0624509
Adding new tests
karthick-murugan Mar 7, 2025
3c89895
updating new tests
karthick-murugan Mar 7, 2025
cab475e
Updating Test Scenarios
karthick-murugan Mar 7, 2025
e372bed
Feedback updates
karthick-murugan Mar 10, 2025
d14aa83
Phpcs Updates
karthick-murugan Mar 10, 2025
7ecb070
Phpcs Updates
karthick-murugan Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update WPCLI update/delete query for affected rows
  • Loading branch information
@karthick-murugan
karthick-murugan committed Feb 25, 2025
commit 99d44cb88010c5e823d6e18c3624e64d8b6c3330
34 changes: 24 additions & 10 deletions src/DB_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,24 +495,38 @@ public function cli( $_, $assoc_args ) {
* +---------+-----------------------+
*/
public function query( $args, $assoc_args ) {

Comment thread
mrsdizzie marked this conversation as resolved.
$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
WP_CLI::debug( "Running shell command: {$command}", 'db' );
Comment thread
swissspidy marked this conversation as resolved.

Comment thread
mrsdizzie marked this conversation as resolved.
$assoc_args['database'] = DB_NAME;

// The query might come from STDIN.
Comment thread
mrsdizzie marked this conversation as resolved.

if ( ! empty( $args ) ) {
$assoc_args['execute'] = $args[0];
}

if ( isset( $assoc_args['execute'] ) ) {
// Ensure that the SQL mode is compatible with WPDB.
Comment thread
mrsdizzie marked this conversation as resolved.
$assoc_args['execute'] = $this->get_sql_mode_query( $assoc_args ) . $assoc_args['execute'];
}

WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
Comment thread
swissspidy marked this conversation as resolved.
self::run( $command, $assoc_args );

// Check if the query is an UPDATE or DELETE.
if ( isset( $assoc_args['execute'] ) && preg_match( '/\b(UPDATE|DELETE)\b/i', $assoc_args['execute'] ) ) {
// Append `SELECT ROW_COUNT()` to the query.
Comment thread
mrsdizzie marked this conversation as resolved.
Outdated
$assoc_args['execute'] .= '; SELECT ROW_COUNT();';
}

list( $stdout, $stderr, $exit_code ) = self::run( $command, $assoc_args, false );

if ( $exit_code ) {
WP_CLI::error( "Query failed: {$stderr}" );
}

// For UPDATE/DELETE queries, parse the output to get the number of rows affected.
Comment thread
mrsdizzie marked this conversation as resolved.
Outdated
if ( isset( $assoc_args['execute'] ) && preg_match( '/\b(UPDATE|DELETE)\b/i', $assoc_args['execute'] ) ) {
$output_lines = explode( "\n", trim( $stdout ) );
$affected_rows = (int) trim( end( $output_lines ) );
WP_CLI::success( "Query succeeded. Rows affected: {$affected_rows}" );
} else {
WP_CLI::log( $stdout );
WP_CLI::success( 'Query executed successfully.' );
}
}

/**
Expand Down