Improve some tests

Author: swissspidy

features/db-check.feature

@@ -145,8 +145,8 @@ Feature: Check the database
   Scenario: SQLite commands that show warnings
     Given a WP install
 
-    When I run `wp db check`
-    Then STDOUT should contain:
+    When I try `wp db check`
+    Then STDERR should contain:
       """
       Warning: Database check is not supported for SQLite databases
       """

features/db-cli.feature

@@ -4,8 +4,8 @@ Feature: Open a MySQL console
   Scenario: SQLite commands that show warnings for cli
     Given a WP install
 
-    When I run `wp db cli`
-    Then STDOUT should contain:
+    When I try `wp db cli`
+    Then STDERR should contain:
       """
       Warning: Interactive console (cli) is not supported for SQLite databases
       """

features/db-export.feature

@@ -27,11 +27,19 @@ Feature: Export a WordPress database
     Then the wp_cli_test.sql file should exist
     And the wp_cli_test.sql file should not contain:
       """
-      wp_users
+      CREATE TABLE wp_users
       """
     And the wp_cli_test.sql file should contain:
       """
-      wp_options
+      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"
       """
 
   Scenario: Export database to STDOUT

features/db-optimize.feature

@@ -14,8 +14,8 @@ Feature: Optimize the database
   Scenario: SQLite commands that show warnings for optimize
     Given a WP install
 
-    When I run `wp db optimize`
-    Then STDOUT should contain:
+    When I try `wp db optimize`
+    Then STDERR should contain:
       """
       Warning: Database optimization is not supported for SQLite databases
       """

features/db-repair.feature

@@ -14,8 +14,8 @@ Feature: Repair the database
   Scenario: SQLite commands that show warnings for repair
     Given a WP install
 
-    When I run `wp db repair`
-    Then STDOUT should contain:
+    When I try `wp db repair`
+    Then STDERR should contain:
       """
       Warning: Database repair is not supported for SQLite databases
       """

features/db-size.feature

@@ -2,6 +2,7 @@
 
 Feature: Display database size
 
+  @require-mysql-or-mariadb
   Scenario: Display only database size for a WordPress install
     Given a WP install
 
@@ -16,6 +17,21 @@ Feature: Display database size
       B
       """
 
+  @require-sqlite
+  Scenario: Display only database size for a WordPress install
+    Given a WP install
+
+    When I run `wp db size`
+    Then STDOUT should contain:
+      """
+      .ht.sqlite
+      """
+
+    And STDOUT should contain:
+      """
+      B
+      """
+
   Scenario: Display only table sizes for a WordPress install
     Given a WP install
 
@@ -27,6 +43,7 @@ Feature: Display database size
       wp_cli_test
       """
 
+  @require-mysql-or-mariadb
   Scenario: Display only database size in a human readable format for a WordPress install
     Given a WP install
 
@@ -49,6 +66,21 @@ Feature: Display database size
       """
     And STDOUT should be empty
 
+  @require-sqlite
+  Scenario: Display only database size in a human readable format for a WordPress install
+    Given a WP install
+
+    When I run `wp db size --human-readable`
+    Then STDOUT should contain:
+      """
+      .ht.sqlite
+      """
+
+    And STDOUT should contain:
+      """
+      KB
+      """
+
   Scenario: Display only table sizes in a human readable format for a WordPress install
     Given a WP install
 

src/DB_Command.php

@@ -708,8 +708,7 @@ public function export( $args, $assoc_args ) {
 		} else {
 			// phpcs:ignore WordPress.WP.AlternativeFunctions.rand_mt_rand -- WordPress is not loaded.
 			$hash        = substr( md5( (string) mt_rand() ), 0, 7 );
-			$db_name     = $this->is_sqlite() ? 'sqlite-db' : DB_NAME;
-			$result_file = sprintf( '%s-%s-%s.sql', $db_name, date( 'Y-m-d' ), $hash ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
+			$result_file = sprintf( '%s-%s-%s.sql', DB_NAME, date( 'Y-m-d' ), $hash ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
 
 		}
 
@@ -884,7 +883,7 @@ public function import( $args, $assoc_args ) {
 		if ( ! empty( $args[0] ) ) {
 			$result_file = $args[0];
 		} else {
-			$result_file = $this->is_sqlite() ? 'sqlite-db.sql' : sprintf( '%s.sql', DB_NAME );
+			$result_file = sprintf( '%s.sql', DB_NAME );
 		}
 
 		if ( $this->is_sqlite() ) {
@@ -1614,8 +1613,8 @@ public function search( $args, $assoc_args ) {
 			if ( ! $text_columns ) {
 				if ( $stats ) {
 					$skipped[] = $table;
-					// Don't bother warning for term relationships (which is just 3 int columns).
-				} elseif ( ! preg_match( '/_term_relationships$/', $table ) ) {
+					// Don't bother warning for term relationships (which is just 3 int columns) or SQLite.
+				} elseif ( ! preg_match( '/_term_relationships$/', $table ) && ! $this->is_sqlite() ) {
 					WP_CLI::warning( $primary_keys ? "No text columns for table '$table' - skipped." : "No primary key or text columns for table '$table' - skipped." );
 				}
 				continue;

src/DB_Command_SQLite.php

@@ -371,6 +371,8 @@ protected function sqlite_export( $file, $assoc_args ) {
 
 				fwrite( $output, "\n" );
 			}
+
+			fwrite( $output, '-- Dump completed on ' . date( 'Y-m-d H:i:s' ) . "\n\n" );
 		} catch ( PDOException $e ) {
 			fclose( $output );
 			WP_CLI::error( 'Export failed: ' . $e->getMessage() );