More test fixes

Author: swissspidy

features/db-export.feature

@@ -23,24 +23,10 @@ Feature: Export a WordPress database
   Scenario: Exclude tables when exporting the database
     Given a WP install
 
-    When I run `wp db export wp_cli_test.sql --exclude_tables=wp_users --porcelain`
+    When I try `wp db export wp_cli_test.sql --exclude_tables=wp_users --porcelain`
     Then the wp_cli_test.sql file should exist
-    And the wp_cli_test.sql file should not contain:
-      """
-      CREATE TABLE wp_users
-      """
-    And the wp_cli_test.sql file should contain:
-      """
-      CREATE TABLE wp_options
-      """
-    And the wp_cli_test.sql file should not contain:
-      """
-      CREATE TABLE "wp_users"
-      """
-    And the wp_cli_test.sql file should contain:
-      """
-      CREATE TABLE "wp_options"
-      """
+    And the contents of the wp_cli_test.sql file should not match /CREATE TABLE "?wp_users"?/
+    And the contents of the wp_cli_test.sql file should match /CREATE TABLE "?wp_options"?/
 
   Scenario: Export database to STDOUT
     Given a WP install
@@ -86,6 +72,7 @@ Feature: Export a WordPress database
       """
     And STDOUT should be empty
 
+  @require-mysql-or-mariadb
   Scenario: MySQL defaults are available as appropriate with --defaults flag
     Given a WP install
 

features/db-import.feature

@@ -127,6 +127,8 @@ Feature: Import a WordPress database
       """
       wp db import
       """
+
+  @require-mysql-or-mariadb
   Scenario: MySQL defaults are available as appropriate with --defaults flag
     Given a WP install
 

features/db-query.feature

@@ -72,6 +72,7 @@ Feature: Query the database with WordPress' MySQL config
       """
     And STDOUT should be empty
 
+  @require-mysql-or-mariadb
   Scenario: MySQL defaults are available as appropriate with --defaults flag
     Given a WP install
 

src/DB_Command_SQLite.php

@@ -1,5 +1,7 @@
 <?php
 
+use WP_CLI\Utils;
+
 /**
  * SQLite-specific database operations for DB_Command.
  *
@@ -320,6 +322,10 @@ protected function sqlite_export( $file, $assoc_args ) {
 			WP_CLI::error( "Could not open file for writing: {$file}" );
 		}
 
+		$exclude_tables = Utils\get_flag_value( $assoc_args, 'exclude_tables', '' );
+		$exclude_tables = explode( ',', trim( $assoc_args['exclude_tables'], ',' ) );
+		$exclude_tables = array_map( 'strtolower', $exclude_tables );
+
 		try {
 			// Export schema and data as SQL.
 			fwrite( $output, "-- SQLite database dump\n" );
@@ -335,6 +341,10 @@ protected function sqlite_export( $file, $assoc_args ) {
 			$tables = $stmt->fetchAll( PDO::FETCH_COLUMN );
 
 			foreach ( $tables as $table ) {
+				if ( in_array( $table, $exclude_tables, true ) ) {
+					continue;
+				}
+
 				// Escape table name for identifiers.
 				$escaped_table = '"' . str_replace( '"', '""', $table ) . '"';