Changeset 36552

Timestamp:

02/17/2016 06:54:27 PM (11 years ago)

Author:

ocean90

Message:

Tests: Add Tests_dbDelta::assertTableHasPrimaryKey().

Also fix a typo in the name for the compound key.

Props charlestonsw.
Fixes #34877.

File:

• trunk/tests/phpunit/tests/dbdelta.php (modified) (11 diffs)

trunk/tests/phpunit/tests/dbdelta.php

@@ -34 +34 @@
                                 PRIMARY KEY  (id),
                                 KEY key_1 (column_1),
-                                KEY compoud_key (id,column_1),
+                                KEY compound_key (id,column_1),
                                 FULLTEXT KEY fulltext_key (column_1)
                         ) ENGINE=MyISAM
@@ -106 +106 @@
                                 PRIMARY KEY  (id),
                                 KEY key_1 (column_1),
-                                KEY compoud_key (id,column_1)
+                                KEY compound_key (id,column_1)
                         )
                         "
@@ -129 +129 @@
                                 PRIMARY KEY  (id),
                                 KEY key_1 (column_1),
-                                KEY compoud_key (id,column_1)
+                                KEY compound_key (id,column_1)
                         )
                         "
@@ -158 +158 @@
                                 PRIMARY KEY  (id),
                                 KEY key_1 (column_1),
-                                KEY compoud_key (id,column_1)
+                                KEY compound_key (id,column_1)
                         )
                         "
@@ -172 +172 @@
 
                 $this->assertTableHasColumn( 'column_1', $wpdb->prefix . 'dbdelta_test' );
+                $this->assertTableHasPrimaryKey( 'id' , $wpdb->prefix . 'dbdelta_test' );
         }
 
@@ -190 +191 @@
                                 PRIMARY KEY  (id),
                                 KEY key_1 (column_1),
-                                KEY compoud_key (id,column_1)
+                                KEY compound_key (id,column_1)
                         )
                         "
@@ -216 +217 @@
                                 PRIMARY KEY  (id),
                                 KEY key_1 (column_1),
-                                KEY compoud_key (id,column_1)
+                                KEY compound_key (id,column_1)
                         )
                         "
@@ -266 +267 @@
                                 PRIMARY KEY  (id),
                                 KEY key_1 (column_1),
-                                KEY compoud_key (id,column_1),
+                                KEY compound_key (id,column_1),
                                 FULLTEXT KEY fulltext_key (column_1)
                         )
@@ -287 +288 @@
          */
         protected function assertTableRowHasValue( $column, $value, $table ) {
-
                 global $wpdb;
 
@@ -306 +306 @@
          */
         protected function assertTableHasColumn( $column, $table ) {
-
                 global $wpdb;
 
@@ -312 +311 @@
 
                 $this->assertCount( 1, wp_list_filter( $table_fields, array( 'Field' => $column ) ) );
+        }
+
+        /**
+         * Assert that a table has a primary key.
+         *
+         * Checks for single-column primary keys. May not work for multi-column primary keys.
+         *
+         * @param string $column The column for the primary key.
+         * @param string $table  The database table name.
+         */
+        protected function assertTableHasPrimaryKey( $column , $table ) {
+                global $wpdb;
+
+                $table_indices = $wpdb->get_results( "SHOW INDEX FROM {$table}" );
+
+                $this->assertCount( 1, wp_list_filter( $table_indices, array( 'Key_name' => 'PRIMARY' , 'Column_name' => $column ) , 'AND' ) );
         }