Ticket #34877: 34877_patch_assert_primary_key.diff

dbdelta.php

@@ -169 +169 @@
                 );
 
                 $this->assertTableHasColumn( 'column_1', $wpdb->prefix . 'dbdelta_test' );
+                $this->assertTableHasPrimaryKey( 'id' , $wpdb->prefix . 'dbdelta_test' );
         }
 
         /**
@@ -289 +290 @@
         }
 
         /**
+         * 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;
+                $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
+                $this->assertCount( 1, wp_list_filter( $tableindices, array( 'Key_name' => 'PRIMARY' , 'Column_name' => $column ) , 'AND' ) );
+        }
+
+        /**
          * Assert that a table doesn't have a column.
          *
          * @param string $column The field name.