Merge pull request #158 from kitloong/feature/laravel10

Fix error

Author: kitloong

src/Migration/Blueprint/Support/Stringable.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use KitLoong\MigrationsGenerator\Migration\Enum\Space;
 
 trait Stringable
@@ -60,7 +61,7 @@ public function convertFromAnyTypeToString($value): string
             default:
                 // Wrap with DB::raw();
                 if ($value instanceof Expression) {
-                    return 'DB::raw("' . $this->escapeDoubleQuote($value) . '")';
+                    return 'DB::raw("' . $this->escapeDoubleQuote(DB::getSchemaGrammar()->getValue($value)) . '")';
                 }
 
                 return (string) $value;

src/Migration/Generator/IndexGenerator.php

@@ -3,7 +3,6 @@
 namespace KitLoong\MigrationsGenerator\Migration\Generator;
 
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 use KitLoong\MigrationsGenerator\Enum\Migrations\Method\IndexType;
 use KitLoong\MigrationsGenerator\Migration\Blueprint\Method;
 use KitLoong\MigrationsGenerator\Schema\Models\Index;
@@ -54,9 +53,10 @@ public function getChainableIndexes(string $name, Collection $indexes): Collecti
                 return $carry;
             }
 
-            if ($index->getLengths()[0] !== null) {
-                return $carry;
-            }
+            // TODO Laravel 10 does not support `$table->index(DB::raw("with_length(16)"))`
+//            if ($index->getLengths()[0] !== null) {
+//                return $carry;
+//            }
 
             $columnName = $index->getColumns()[0];
 
@@ -120,12 +120,12 @@ private function getColumns(Index $index): array
     {
         $cols = [];
 
-        foreach ($index->getColumns() as $i => $column) {
-            if ($index->getLengths()[$i] !== null) {
-                $cols[] = DB::raw($column . '(' . $index->getLengths()[$i] . ')');
-                continue;
-            }
-
+        foreach ($index->getColumns() as $column) {
+            // TODO Laravel 10 does not support `$table->index(DB::raw("with_length(16)"))`
+//            if ($index->getLengths()[$i] !== null) {
+//                $cols[] = DB::raw($column . '(' . $index->getLengths()[$i] . ')');
+//                continue;
+//            }
             $cols[] = $column;
         }
 

tests/Feature/FeatureTestCase.php

@@ -109,7 +109,7 @@ protected function migrateFromTemplate(string $connection, string $templatePath)
             File::put($this->getStorageFromPath($file->getBasename()), $content);
             File::move(
                 $this->getStorageFromPath($file->getBasename()),
-                $this->getStorageFromPath(str_replace('_db_', "_${connection}_", $file->getBasename()))
+                $this->getStorageFromPath(str_replace('_db_', "_{$connection}_", $file->getBasename()))
             );
         }
 

tests/Feature/MySQL57/CommandTest.php

@@ -185,7 +185,7 @@ public function testDefaultIndexNames()
             'test_index_mysql57_chain_index',
             'test_index_mysql57_chain_unique',
             'test_index_mysql57_col_multi1_col_multi2_index',
-            'test_index_mysql57_col_multi1_col_multi2(16)_index',
+//            'test_index_mysql57_col_multi1_col_multi2(16)_index',
             'test_index_mysql57_col_multi1_col_multi2_unique',
             'test_index_mysql57_col_multi_custom1_col_multi_custom2_index',
             'test_index_mysql57_col_multi_custom1_col_multi_custom2_unique',
@@ -196,8 +196,8 @@ public function testDefaultIndexNames()
             'test_index_mysql57_spatial_index_spatialindex',
             'test_index_mysql57_unique_custom_unique',
             'test_index_mysql57_unique_unique',
-            'test_index_mysql57_with_length(16)_index',
-            'test_index_mysql57_with_length_custom(16)_index',
+//            'test_index_mysql57_with_length(16)_index',
+//            'test_index_mysql57_with_length_custom(16)_index',
         ];
 
         if ($this->hasFullText()) {

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

@@ -58,13 +58,14 @@ public function up()
                 $table->fullText('chain');
             }
 
-            if (DB::getDriverName() === Driver::MYSQL()->getValue()) {
-                $table->index(['col_multi1', DB::raw('col_multi2(16)')], 'with_length_multi_custom');
-                $table->string('with_length');
-                $table->string('with_length_custom');
-                $table->index([DB::raw('with_length(16)')]);
-                $table->index([DB::raw('with_length_custom(16)')], 'with_length_custom');
-            }
+            // TODO Laravel 10 does not support `$table->index(DB::raw("with_length(16)"))`
+//            if (DB::getDriverName() === Driver::MYSQL()->getValue()) {
+//                $table->index(['col_multi1', DB::raw('col_multi2(16)')], 'with_length_multi_custom');
+//                $table->string('with_length');
+//                $table->string('with_length_custom');
+//                $table->index([DB::raw('with_length(16)')]);
+//                $table->index([DB::raw('with_length_custom(16)')], 'with_length_custom');
+//            }
         });
     }