Merge branch 'defenestrator/master'

Author: michaeldyrynda

src/Connection/PostgresConnection.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Dyrynda\Database\Connection;
+
+use Dyrynda\Database\Schema\Grammars\PostgresGrammar;
+use Illuminate\Database\PostgresConnection as BasePostgresConnection;
+
+class PostgresConnection extends BasePostgresConnection
+{
+    /**
+     * Get the default schema grammar instance.
+     *
+     * @return \Illuminate\Database\Grammar
+     */
+    protected function getDefaultSchemaGrammar()
+    {
+        return $this->withTablePrefix(new PostgresGrammar);
+    }
+}

src/LaravelEfficientUuidServiceProvider.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Dyrynda\Database\Connection\MySqlConnection;
 use Dyrynda\Database\Connection\SQLiteConnection;
+use Dyrynda\Database\Connection\PostgresConnection;
 
 class LaravelEfficientUuidServiceProvider extends ServiceProvider
 {
@@ -31,6 +32,10 @@ public function register()
             return new MySqlConnection($connection, $database, $prefix, $config);
         });
 
+        Connection::resolverFor('postgres', function ($connection, $database, $prefix, $config) {
+            return new PostgresConnection($connection, $database, $prefix, $config);
+        });
+        
         Connection::resolverFor('sqlite', function ($connection, $database, $prefix, $config) {
             return new SQLiteConnection($connection, $database, $prefix, $config);
         });

src/Schema/Grammars/PostgresGrammar.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Dyrynda\Database\Schema\Grammars;
+
+use Illuminate\Database\Schema\Grammars\PostgresGrammar as BasePostgresGrammar;
+
+class PostgresGrammar extends BasePostgresGrammar
+{
+    /**
+     * Create the column definition for a UUID type.
+     *
+     * @return string
+     */
+    protected function typeEfficientUuid()
+    {
+        return 'bytea';
+    }
+}

src/Schema/Grammars/SQLiteGrammar.php

@@ -10,11 +10,9 @@ class SQLiteGrammar extends IlluminateSQLiteGrammar
     /**
      * Create the column definition for a UUID type.
      *
-     * @param  \Illuminate\Support\Fluent  $column
-     *
      * @return string
      */
-    protected function typeEfficientUuid(Fluent $column)
+    protected function typeEfficientUuid()
     {
         return 'blob(256)';
     }

tests/DatabasePostgresSchemaGrammarTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests;
+
+use Mockery as m;
+use Illuminate\Database\Connection;
+use Illuminate\Database\Schema\Blueprint;
+use Dyrynda\Database\Schema\Grammars\PostgresGrammar;
+
+class DatabasePostgresSchemaGrammarTest 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->assertEquals(
+            ['alter table "users" add column "foo" uuid not null, add column "bar" bytea not null'],
+            $blueprint->toSql($connection, new PostgresGrammar)
+        );
+    }
+}