Merge pull request #64 from kitloong/feature/fix

Bug fix

Author: kitloong

src/MigrationsGenerator/DBAL/Schema.php

@@ -100,6 +100,9 @@ public function initialize(): void
                 $this->registerDoctrineTypeMapping('cidr', DBALTypes::STRING);
                 $this->registerDoctrineTypeMapping('oid', DBALTypes::STRING);
                 break;
+            case Platform::SQLSERVER:
+                $this->registerDoctrineTypeMapping('xml', DBALTypes::TEXT);
+                break;
             default:
         }
     }

src/MigrationsGenerator/Generators/Modifier/IndexModifier.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Collection;
 use MigrationsGenerator\Generators\Blueprint\Method;
 use MigrationsGenerator\Generators\IndexGenerator;
+use MigrationsGenerator\Generators\MigrationConstants\Method\IndexType;
 
 class IndexModifier
 {
@@ -29,22 +30,34 @@ public function __construct(IndexGenerator $indexGenerator)
      */
     public function chainIndex(Table $table, Method $method, Collection $singleColumnIndexes, Column $column): Method
     {
-        if ($singleColumnIndexes->has($column->getName())) {
-            /** @var Index $index */
-            $index = $singleColumnIndexes->get($column->getName());
+        if (!$singleColumnIndexes->has($column->getName())) {
+            return $method;
+        }
 
-            // autoIncrement is handled in IntegerColumn
-            if ($index->isPrimary() && $column->getAutoincrement()) {
-                return $method;
-            }
+        /** @var Index $index */
+        $index = $singleColumnIndexes->get($column->getName());
+
+        // autoIncrement is handled in \MigrationsGenerator\Generators\Columns\IntegerColumn
+        if ($index->isPrimary() && $column->getAutoincrement()) {
+            return $method;
+        }
 
-            $indexType = $this->indexGenerator->getIndexType($index);
+        $indexType = $this->indexGenerator->getIndexType($index);
+        if ($indexType === IndexType::SPATIAL_INDEX) {
             if ($this->indexGenerator->shouldSkipName($table->getName(), $index, $indexType)) {
                 $method->chain($indexType);
-            } else {
-                $method->chain($indexType, $index->getName());
+                return $method;
             }
+
+            return $method;
         }
+
+        if ($this->indexGenerator->shouldSkipName($table->getName(), $index, $indexType)) {
+            $method->chain($indexType);
+            return $method;
+        }
+
+        $method->chain($indexType, $index->getName());
         return $method;
     }
 }

src/MigrationsGenerator/Generators/TableMigration.php

@@ -7,6 +7,7 @@
 use MigrationsGenerator\DBAL\Platform;
 use MigrationsGenerator\Generators\Blueprint\SchemaBlueprint;
 use MigrationsGenerator\Generators\Blueprint\TableBlueprint;
+use MigrationsGenerator\Generators\MigrationConstants\Method\IndexType;
 use MigrationsGenerator\Generators\MigrationConstants\Method\SchemaBuilder;
 use MigrationsGenerator\Generators\MigrationConstants\Property\TableProperty;
 use MigrationsGenerator\MigrationsGeneratorSetting;
@@ -70,6 +71,19 @@ public function up(Table $table, array $columns, array $indexes): SchemaBlueprin
             }
         }
 
+        // Generate single column spatial index with custom name.
+        if ($singleColumnIndexes->isNotEmpty()) {
+            foreach ($singleColumnIndexes as $index) {
+                /** @var \Doctrine\DBAL\Schema\Index $index */
+                $indexType = $this->indexGenerator->getIndexType($index);
+                if ($indexType === IndexType::SPATIAL_INDEX &&
+                    !$this->indexGenerator->shouldSkipName($table->getName(), $index, $indexType)) {
+                    $method = $this->indexGenerator->generate($table, $index);
+                    $blueprint->setMethod($method);
+                }
+            }
+        }
+
         $up->setBlueprint($blueprint);
 
         return $up;

tests/Feature/MySQL57/CommandTest.php

@@ -194,6 +194,7 @@ public function testDefaultIndexNames()
                 'test_index_mysql57_code_index',
                 'test_index_mysql57_column_hyphen_index',
                 'test_index_mysql57_custom_name_index',
+                'test_index_mysql57_custom_spatial_index_spatialindex',
                 'test_index_mysql57_email_unique',
                 'test_index_mysql57_enum_code_unique',
                 'test_index_mysql57_line_string_spatialindex',
@@ -221,7 +222,10 @@ public function testDefaultFKNames()
         $foreignKeys     = new Collection($foreignKeyArray);
         $foreignKeyNames = $foreignKeys->map(function (ForeignKeyConstraint $foreignKey) {
             return $foreignKey->getName();
-        })->sort()->toArray();
+        })
+            ->sort()
+            ->values()
+            ->toArray();
 
         $this->assertSame(
             [

tests/Feature/SQLSrv/CommandTest.php

@@ -63,6 +63,20 @@ public function testCollation()
         $this->verify($migrateTemplates, $generateMigrations);
     }
 
+    public function testGenerateXml()
+    {
+        $this->migrateGeneral('sqlsrv');
+
+        // Test xml column
+        DB::statement("alter table all_columns_sqlsrv add xml xml");
+
+        $this->truncateMigration();
+
+        $this->generateMigrations();
+
+        $this->assertTrue(true);
+    }
+
     /**
      * @param  callable  $migrateTemplates
      * @param  callable  $generateMigrations

tests/resources/database/migrations/general/2020_03_21_000000_expected_create_test_index_db_table.php

@@ -17,19 +17,20 @@ class ExpectedCreateTestIndex_DB_Table extends Migration
     public function up()
     {
         Schema::create('test_index_[db]', function (Blueprint $table) {
-            $table->integer('id');
+            $table->increments('id');
             $table->string('code', 50)->index();
             $table->string('custom_name', 50)->index('custom_index');
             $table->string('email')->unique();
             $table->string('column-hyphen')->index();
             $table->enum('enum', ['PROGRESS', 'DONE']);
             $table->lineString('line_string')->spatialIndex();
+            $table->lineString('custom_spatial_index');
             $table->timestamp('created_at')->nullable();
 
-            $table->primary('id');
             $table->index(['code', 'enum']);
-            $table->index(['code', 'email'], 'custom_multi_key_index');
+            $table->index(['code', 'email'], 'custom_multi_key_index_name');
             $table->unique(['enum', 'code']);
+            $table->spatialIndex('custom_spatial_index', 'custom_spatial_index_name');
         });
     }