Merge pull request #124 from ajoah/skip-tables-wildcard

Adds wildcards support to `--skip-tables` parameter
wp-cli · Jul 24, 2019 · 2872f04 · 2872f04
2 parents 7d02c54 + c270da0
commit 2872f04
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ change primary key values.
 
 	[--skip-tables=<tables>]
 		Do not perform the replacement on specific tables. Use commas to
-		specify multiple tables.
+		specify multiple tables. Wildcards are supported, e.g. `'wp_*options'` or `'wp_post*'`.
 
 	[--skip-columns=<columns>]
 		Do not perform the replacement on specific columns. Use commas to

diff --git a/features/search-replace-export.feature b/features/search-replace-export.feature
@@ -26,6 +26,24 @@ Feature: Search / replace with file export
       INSERT INTO `wp_options`
       """
 
+    When I run `wp search-replace example.com example.net --skip-tables=wp_opt\?ons,wp_post\* --export`
+    Then STDOUT should not contain:
+      """
+      wp_posts
+      """
+    And STDOUT should not contain:
+      """
+      wp_postmeta
+      """
+    And STDOUT should not contain:
+      """
+      wp_options
+      """
+    And STDOUT should contain:
+      """
+      wp_users
+      """
+
     When I run `wp search-replace example.com example.net --skip-columns=option_value --export`
     Then STDOUT should contain:
       """

diff --git a/features/search-replace.feature b/features/search-replace.feature
@@ -15,6 +15,20 @@ Feature: Do global search/replace
       wp_posts
       """
 
+    When I run `wp search-replace foo bar --skip-tables=wp_post\*`
+    Then STDOUT should not contain:
+      """
+      wp_posts
+      """
+    And STDOUT should not contain:
+      """
+      wp_postmeta
+      """
+    And STDOUT should contain:
+      """
+      wp_users
+      """
+
     When I run `wp search-replace foo bar --skip-columns=guid`
     Then STDOUT should not contain:
       """

diff --git a/src/Search_Replace_Command.php b/src/Search_Replace_Command.php
@@ -77,7 +77,7 @@ class Search_Replace_Command extends WP_CLI_Command {
 	 *
 	 * [--skip-tables=<tables>]
 	 * : Do not perform the replacement on specific tables. Use commas to
-	 * specify multiple tables.
+	 * specify multiple tables. Wildcards are supported, e.g. `'wp_*options'` or `'wp_post*'`.
 	 *
 	 * [--skip-columns=<columns>]
 	 * : Do not perform the replacement on specific columns. Use commas to
@@ -316,8 +316,10 @@ public function __invoke( $args, $assoc_args ) {
 
 		foreach ( $tables as $table ) {
 
-			if ( in_array( $table, $this->skip_tables, true ) ) {
-				continue;
+			foreach ( $this->skip_tables as $skip_table ) {
+				if ( fnmatch( $skip_table, $table ) ) {
+					continue 2;
+				}
 			}
 
 			$table_sql = self::esc_sql_ident( $table );