Changeset 37574

Timestamp:

05/26/2016 04:58:13 AM (9 years ago)

Author:

pento

Message:

Database: Add support for SPATIAL keys to dbDelta().

dbDelta() already supported spatial fields (by virtue of not checking field types), so it's nice to round that out with spatial key support, too.

Fixes #36948.

Location:

trunk

Files:

• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• tests/phpunit/tests/dbdelta.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -2201 +2201 @@
                 case 'unique':
                 case 'key':
+                case 'spatial':
                     $validfield = false;
                     $indices[] = trim(trim($fld), ", \n");
@@ -2301 +2302 @@
                 if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
                     $index_string .= 'FULLTEXT ';
+                }
+                if ( 'SPATIAL' === strtoupper( $index_data['index_type'] ) ) {
+                    $index_string .= 'SPATIAL ';
                 }
                 $index_string .= 'KEY ';

trunk/tests/phpunit/tests/dbdelta.php

@@ -489 +489 @@
         $this->assertEmpty( $updates );
     }
+
+    /**
+     * @ticket 36948
+     */
+    function test_spatial_indices() {
+        global $wpdb;
+
+        if ( version_compare( $wpdb->db_version(), '5.4', '<' ) ) {
+            $this->markTestSkipped( 'Spatial indices require MySQL 5.4 and above.' );
+        }
+
+        $schema =
+            "
+            CREATE TABLE {$wpdb->prefix}spatial_index_test (
+                non_spatial bigint(20) unsigned NOT NULL,
+                spatial_value geometrycollection NOT NULL,
+                KEY non_spatial (non_spatial),
+                SPATIAL KEY spatial_key (spatial_value)
+            ) ENGINE=MyISAM;
+            ";
+
+        $wpdb->query( $schema );
+
+        $updates = dbDelta( $schema, false );
+
+        $this->assertEmpty( $updates );
+
+        $schema =
+            "
+            CREATE TABLE {$wpdb->prefix}spatial_index_test (
+                non_spatial bigint(20) unsigned NOT NULL,
+                spatial_value geometrycollection NOT NULL,
+                spatial_value2 geometrycollection NOT NULL,
+                KEY non_spatial (non_spatial),
+                SPATIAL KEY spatial_key (spatial_value)
+                SPATIAL KEY spatial_key2 (spatial_value2)
+            ) ENGINE=MyISAM;
+            ";
+
+        $updates = dbDelta( $schema, false );
+
+        $this->assertSame( array(
+            "{$wpdb->prefix}spatial_index_test.spatial_value2" => "Added column {$wpdb->prefix}spatial_index_test.spatial_value2",
+            "Added index {$wpdb->prefix}spatial_index_test SPATIAL KEY spatial_key2 (spatial_value2)"
+            ), $updates );
+
+        $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}spatial_index_test" );
+    }
 }