- Adding Laravel 9 support

src/SchemaServiceProvider.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\Builder;
 use Illuminate\Support\ServiceProvider;
+use InvalidArgumentException;
 
 class SchemaServiceProvider extends ServiceProvider
 {
@@ -19,12 +20,36 @@ protected function registerBuilderMacros()
 
         Builder::macro('getColumnComment', function (string $table, string $column, bool $fail_on_missing = false) {
             /** @var $this Builder */
-            return BuilderMacros::getColumnComment($this, $table, $column, $fail_on_missing);
+            $column_info = $this->getColumns($table);
+
+            foreach ($column_info as $col) {
+                if ($col['name'] == $column) {
+                    return $col['comment'];
+                }
+            }
+
+            if ($fail_on_missing) {
+                throw new InvalidArgumentException(sprintf("No such column [%s] in the table [%s].", $column, $table));
+            }
+
+            return null;
         });
 
         Builder::macro('getTableComment', function (string $table, bool $fail_on_missing = false) {
             /** @var $this Builder */
-            return BuilderMacros::getTableComment($this, $table, $fail_on_missing);
+            $table_info = $this->getTables();
+
+            foreach ($table_info as $info) {
+                if ($info['name'] == $table) {
+                    return $info['comment'];
+                }
+            }
+
+            if ($fail_on_missing) {
+                throw new InvalidArgumentException(sprintf("No such table [%s] in the database [%s].", $table, $builder->getConnection()->getDatabaseName()));
+            }
+
+            return null;
 
         });
     }

tests/Feature/BlueprintTest.php

@@ -3,6 +3,7 @@
 namespace Javaabu\Schema\Tests\Feature;
 
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Schema;
 use Javaabu\Schema\Tests\TestCase;
 use Javaabu\Schema\Tests\TestSupport\Enums\CityStatus;
 
@@ -13,6 +14,11 @@ class BlueprintTest extends TestCase
     /** @test */
     public function it_can_create_an_enum_column(): void
     {
-        $this->assertDatabaseColumnHasComment('cities', 'status', 'enum:' . CityStatus::class);
+        $this->assertTrue(Schema::hasColumn('cities', 'status'));
+        $this->assertEquals('varchar', Schema::getColumnType('cities', 'status'));
+
+        if (! static::isLaravel9()) {
+            $this->assertDatabaseColumnHasComment('cities', 'status', 'enum:' . CityStatus::class);
+        }
     }
 }