Support table-qualified column names in --skip-columns and --include-columns (#214)

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Pascal Birchler <pascalb@google.com>

Author: 3 people

features/search-replace.feature

@@ -41,6 +41,17 @@ Feature: Do global search/replace
       | Table    | Column       | Replacements | Type |
       | wp_posts | post_content | 0            | SQL  |
 
+    When I run `wp search-replace foo bar --skip-columns=wp_posts.guid`
+    Then STDOUT should not contain:
+      """
+      guid
+      """
+
+    When I run `wp search-replace foo bar --include-columns=wp_posts.post_content`
+    Then STDOUT should be a table containing rows:
+      | Table    | Column       | Replacements | Type |
+      | wp_posts | post_content | 0            | SQL  |
+
   @require-mysql
   Scenario: Multisite search/replace
     Given a WP multisite install

src/Search_Replace_Command.php

@@ -192,11 +192,13 @@ class Search_Replace_Command extends WP_CLI_Command {
 	 *
 	 * [--skip-columns=<columns>]
 	 * : Do not perform the replacement on specific columns. Use commas to
-	 * specify multiple columns.
+	 * specify multiple columns. Table-qualified column names ("table.column")
+	 * are supported to apply the skip to a specific table only.
 	 *
 	 * [--include-columns=<columns>]
 	 * : Perform the replacement on specific columns. Use commas to
-	 * specify multiple columns.
+	 * specify multiple columns. Table-qualified column names ("table.column")
+	 * are supported to apply the inclusion to a specific table only.
 	 *
 	 * [--precise]
 	 * : Force the use of PHP (instead of SQL) for all columns. By default, the command
@@ -530,11 +532,11 @@ public function __invoke( $args, $assoc_args ) {
 			}
 
 			foreach ( $columns as $col ) {
-				if ( ! empty( $this->include_columns ) && ! in_array( $col, $this->include_columns, true ) ) {
+				if ( ! empty( $this->include_columns ) && ! in_array( $col, $this->include_columns, true ) && ! in_array( $table . '.' . $col, $this->include_columns, true ) ) {
 					continue;
 				}
 
-				if ( in_array( $col, $this->skip_columns, true ) ) {
+				if ( in_array( $col, $this->skip_columns, true ) || in_array( $table . '.' . $col, $this->skip_columns, true ) ) {
 					continue;
 				}
 
@@ -633,7 +635,12 @@ private function php_export_table( $table, $old, $new ) {
 			$row_fields = array();
 			foreach ( $all_columns as $col ) {
 				$value = $row->$col;
-				if ( $value && ! in_array( $col, $primary_keys, true ) && ! in_array( $col, $this->skip_columns, true ) ) {
+				if ( $value
+					&& ! in_array( $col, $primary_keys, true )
+					&& ! in_array( $col, $this->skip_columns, true )
+					&& ! in_array( $table . '.' . $col, $this->skip_columns, true )
+					&& ( empty( $this->include_columns ) || in_array( $col, $this->include_columns, true ) || in_array( $table . '.' . $col, $this->include_columns, true ) )
+				) {
 					$new_value = $replacer->run( $value );
 					if ( $new_value !== $value ) {
 						++$col_counts[ $col ];