Merge branch 'RichardStyles/main' into main

Author: michaeldyrynda

src/Connection/MySqlConnection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Dyrynda\Database\Exceptions;
+
+class UnknownGrammarClass extends \Exception
+{
+    /** @var string */
+    protected $message = 'Unknown grammar class, unable to define database type.';
+}

src/Connection/PostgresConnection.php

@@ -2,47 +2,35 @@
 
 namespace Dyrynda\Database;
 
-use Illuminate\Database\Connection;
-use Illuminate\Database\Schema\ColumnDefinition;
+use Illuminate\Support\Fluent;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Database\Schema\Blueprint;
-use Dyrynda\Database\Connection\MySqlConnection;
-use Dyrynda\Database\Connection\SQLiteConnection;
-use Dyrynda\Database\Connection\PostgresConnection;
+use Illuminate\Database\Schema\ColumnDefinition;
+use Illuminate\Database\Schema\Grammars\Grammar;
+use Dyrynda\Database\Exceptions\UnknownGrammarClass;
 
 class LaravelEfficientUuidServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap any application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
-    }
-
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
     public function register()
     {
-        Connection::resolverFor('mysql', function ($connection, $database, $prefix, $config): MySqlConnection {
-            return new MySqlConnection($connection, $database, $prefix, $config);
-        });
+        Grammar::macro('typeEfficientUuid', function (Fluent $column) {
+            switch (class_basename(static::class)) {
+                case 'MySqlGrammar':
+                    return sprintf('binary(%d)', $column->length ?? 16);
 
-        Connection::resolverFor('pgsql', function ($connection, $database, $prefix, $config): PostgresConnection {
-            return new PostgresConnection($connection, $database, $prefix, $config);
-        });
-        
-        Connection::resolverFor('sqlite', function ($connection, $database, $prefix, $config): SQLiteConnection {
-            return new SQLiteConnection($connection, $database, $prefix, $config);
+                case 'PostgresGrammar':
+                    return 'bytea';
+
+                case 'SQLiteGrammar':
+                    return 'blob(256)';
+
+                default:
+                    throw new UnknownGrammarClass;
+            }
         });
 
         Blueprint::macro('efficientUuid', function ($column): ColumnDefinition {
-            /** @var Blueprint $this */
+            /* @var Blueprint $this */
             return $this->addColumn('efficientUuid', $column);
         });
     }

src/Connection/SQLiteConnection.php

@@ -0,0 +1,32 @@
+<?php
+
+
+namespace Tests;
+
+use Mockery as m;
+use Dyrynda\Database\Exceptions\UnknownGrammarClass;
+use Illuminate\Database\Connection;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Grammars\SqlServerGrammar;
+
+class DatabaseInvalidSchemaGrammarTest extends TestCase
+{
+    public function tearDown(): void
+    {
+        m::close();
+    }
+
+    public function testAddingUuid()
+    {
+        $blueprint = new Blueprint('users', function ($table) {
+            $table->uuid('foo');
+            $table->efficientUuid('bar');
+        });
+
+        $connection = m::mock(Connection::class);
+
+        $this->expectExceptionObject(new UnknownGrammarClass());
+
+        $blueprint->toSql($connection, new SqlServerGrammar);
+    }
+}

src/Exceptions/UnknownGrammarClass.php

@@ -5,7 +5,7 @@
 use Mockery as m;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Blueprint;
-use Dyrynda\Database\Schema\Grammars\MySqlGrammar;
+use Illuminate\Database\Schema\Grammars\MySqlGrammar;
 
 class DatabaseMySqlSchemaGrammarTest extends TestCase
 {

src/LaravelEfficientUuidServiceProvider.php

@@ -5,7 +5,7 @@
 use Mockery as m;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Blueprint;
-use Dyrynda\Database\Schema\Grammars\PostgresGrammar;
+use Illuminate\Database\Schema\Grammars\PostgresGrammar;
 
 class DatabasePostgresSchemaGrammarTest extends TestCase
 {

src/Schema/Grammars/MySqlGrammar.php

@@ -5,7 +5,7 @@
 use Mockery as m;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Blueprint;
-use Dyrynda\Database\Schema\Grammars\SQLiteGrammar;
+use Illuminate\Database\Schema\Grammars\SQLiteGrammar;
 
 class DatabaseSQLiteSchemaGrammarTest extends TestCase
 {