Merge pull request #541 from jsor/mysql-spatial-index

Allow mysql spatial indexes

lib/Doctrine/DBAL/Platforms/MySqlPlatform.php

@@ -718,6 +718,8 @@ class MySqlPlatform extends AbstractPlatform
             $type .= 'UNIQUE ';
         } elseif ($index->hasFlag('fulltext')) {
             $type .= 'FULLTEXT ';
+        } elseif ($index->hasFlag('spatial')) {
+            $type .= 'SPATIAL ';
         }
 
         return $type;

lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php

@@ -73,6 +73,8 @@ class MySqlSchemaManager extends AbstractSchemaManager
             }
             if (strpos($v['index_type'], 'FULLTEXT') !== false) {
                 $v['flags'] = array('FULLTEXT');
+            } elseif (strpos($v['index_type'], 'SPATIAL') !== false) {
+                $v['flags'] = array('SPATIAL');
             }
             $tableIndexes[$k] = $v;
         }

tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php

@@ -5,11 +5,21 @@ namespace Doctrine\Tests\DBAL\Functional\Schema;
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
 
 require_once __DIR__ . '/../../../TestInit.php';
 
 class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!Type::hasType('point')) {
+            Type::addType('point', 'Doctrine\Tests\Types\MySqlPointType');
+        }
+    }
+
     public function testSwitchPrimaryKeyColumns()
     {
         $tableOld = new Table("switch_primary_key_columns");
@@ -66,6 +76,23 @@ class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
         $this->assertTrue($indexes['f_index']->hasFlag('fulltext'));
     }
 
+    public function testSpatialIndex()
+    {
+        $table = new Table('spatial_index');
+        $table->addColumn('point', 'point');
+        $table->addIndex(array('point'), 's_index');
+        $table->addOption('engine', 'MyISAM');
+
+        $index = $table->getIndex('s_index');
+        $index->addFlag('spatial');
+
+        $this->_sm->dropAndCreateTable($table);
+
+        $indexes = $this->_sm->listTableIndexes('spatial_index');
+        $this->assertArrayHasKey('s_index', $indexes);
+        $this->assertTrue($indexes['s_index']->hasFlag('spatial'));
+    }
+
     /**
      * @group DBAL-400
      */

tests/Doctrine/Tests/DBAL/Platforms/AbstractMySQLPlatformTestCase.php

@@ -268,6 +268,20 @@ abstract class AbstractMySQLPlatformTestCase extends AbstractPlatformTestCase
         $this->assertEquals(array('CREATE TABLE fulltext_table (text LONGTEXT NOT NULL, FULLTEXT INDEX fulltext_text (text)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = MyISAM'), $sql);
     }
 
+    public function testCreateTableWithSpatialIndex()
+    {
+        $table = new Table('spatial_table');
+        $table->addOption('engine', 'MyISAM');
+        $table->addColumn('point', 'text'); // This should be a point type
+        $table->addIndex(array('point'), 'spatial_text');
+
+        $index = $table->getIndex('spatial_text');
+        $index->addFlag('spatial');
+
+        $sql = $this->_platform->getCreateTableSQL($table);
+        $this->assertEquals(array('CREATE TABLE spatial_table (point LONGTEXT NOT NULL, SPATIAL INDEX spatial_text (point)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = MyISAM'), $sql);
+    }
+
     public function testClobTypeDeclarationSQL()
     {
         $this->assertEquals('TINYTEXT', $this->_platform->getClobTypeDeclarationSQL(array('length' => 1)));

tests/Doctrine/Tests/Types/MySqlPointType.php

+<?php
+
+namespace Doctrine\Tests\Types;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+
+class MySqlPointType extends Type
+{
+    public function getName()
+    {
+        return 'point';
+    }
+
+    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
+    {
+        return strtoupper($this->getName());
+    }
+
+    public function getMappedDatabaseTypes(AbstractPlatform $platform)
+    {
+        return array('point');
+    }
+}