chore: generalize compiling a list

Author: calebdw

src/Grammars/Grammar.php

@@ -7,6 +7,7 @@
 use CalebDW\SqlEntities\Contracts\SqlEntity;
 use CalebDW\SqlEntities\View;
 use Illuminate\Database\Connection;
+use Illuminate\Support\Str;
 use InvalidArgumentException;
 
 abstract class Grammar
@@ -18,24 +19,28 @@ public function __construct(
 
     public function compileCreate(SqlEntity $entity): string
     {
-        return match (true) {
+        $statement = match (true) {
             $entity instanceof View => $this->compileViewCreate($entity),
 
             default => throw new InvalidArgumentException(
                 sprintf('Unsupported entity [%s].', $entity::class),
             ),
         };
+
+        return $this->clean($statement);
     }
 
     public function compileDrop(SqlEntity $entity): string
     {
-        return match (true) {
+        $statement = match (true) {
             $entity instanceof View => $this->compileViewDrop($entity),
 
             default => throw new InvalidArgumentException(
                 sprintf('Unsupported entity [%s].', $entity::class),
             ),
         };
+
+        return $this->clean($statement);
     }
 
     abstract protected function compileViewCreate(View $entity): string;
@@ -47,14 +52,14 @@ protected function compileViewDrop(View $entity): string
             SQL;
     }
 
-    /** @param list<string>|null $columns */
-    protected function compileColumnsList(?array $columns): string
+    /** @param list<string>|null $values */
+    protected function compileList(?array $values): string
     {
-        if ($columns === null) {
+        if ($values === null) {
             return '';
         }
 
-        return ' (' . implode(', ', $columns) . ')';
+        return '(' . implode(', ', $values) . ')';
     }
 
     protected function compileCheckOption(string|true|null $option): string
@@ -71,4 +76,12 @@ protected function compileCheckOption(string|true|null $option): string
 
         return "WITH {$option} CHECK OPTION";
     }
+
+    protected function clean(string $value): string
+    {
+        return Str::of($value)
+            ->replaceMatches('/ +/', ' ')
+            ->trim()
+            ->value();
+    }
 }

src/Grammars/MariaDbGrammar.php

@@ -12,11 +12,11 @@ class MariaDbGrammar extends Grammar
     #[Override]
     protected function compileViewCreate(View $entity): string
     {
-        $columns     = $this->compileColumnsList($entity->columns());
+        $columns     = $this->compileList($entity->columns());
         $checkOption = $this->compileCheckOption($entity->checkOption());
 
         return <<<SQL
-            CREATE OR REPLACE VIEW {$entity->name()}{$columns} AS
+            CREATE OR REPLACE VIEW {$entity->name()} {$columns} AS
             {$entity->toString()}
             {$checkOption}
             SQL;

src/Grammars/MySqlGrammar.php

@@ -12,11 +12,11 @@ class MySqlGrammar extends Grammar
     #[Override]
     protected function compileViewCreate(View $entity): string
     {
-        $columns     = $this->compileColumnsList($entity->columns());
+        $columns     = $this->compileList($entity->columns());
         $checkOption = $this->compileCheckOption($entity->checkOption());
 
         return <<<SQL
-            CREATE OR REPLACE VIEW {$entity->name()}{$columns} AS
+            CREATE OR REPLACE VIEW {$entity->name()} {$columns} AS
             {$entity->toString()}
             {$checkOption}
             SQL;

src/Grammars/PostgresGrammar.php

@@ -13,11 +13,11 @@ class PostgresGrammar extends Grammar
     protected function compileViewCreate(View $entity): string
     {
         $checkOption = $this->compileCheckOption($entity->checkOption());
-        $columns     = $this->compileColumnsList($entity->columns());
+        $columns     = $this->compileList($entity->columns());
         $recursive   = $entity->isRecursive() ? ' RECURSIVE' : '';
 
         return <<<SQL
-            CREATE OR REPLACE{$recursive} VIEW {$entity->name()}{$columns} AS
+            CREATE OR REPLACE {$recursive} VIEW {$entity->name()} {$columns} AS
             {$entity->toString()}
             {$checkOption}
             SQL;

src/Grammars/SQLiteGrammar.php

@@ -12,10 +12,10 @@ class SQLiteGrammar extends Grammar
     #[Override]
     protected function compileViewCreate(View $entity): string
     {
-        $columns = $this->compileColumnsList($entity->columns());
+        $columns = $this->compileList($entity->columns());
 
         return <<<SQL
-            CREATE VIEW IF NOT EXISTS {$entity->name()}{$columns} AS
+            CREATE VIEW IF NOT EXISTS {$entity->name()} {$columns} AS
             {$entity->toString()}
             SQL;
     }

src/Grammars/SqlServerGrammar.php

@@ -13,10 +13,10 @@ class SqlServerGrammar extends Grammar
     protected function compileViewCreate(View $entity): string
     {
         $checkOption = $this->compileCheckOption($entity->checkOption());
-        $columns     = $this->compileColumnsList($entity->columns());
+        $columns     = $this->compileList($entity->columns());
 
         return <<<SQL
-            CREATE OR ALTER VIEW {$entity->name()}{$columns} AS
+            CREATE OR ALTER VIEW {$entity->name()} {$columns} AS
             {$entity->toString()}
             {$checkOption}
             SQL;

tests/Unit/Grammars/MariaDbGrammarTest.php

@@ -20,7 +20,6 @@
         expect($sql)->toBe(<<<'SQL'
             CREATE OR REPLACE VIEW user_view AS
             SELECT id, name FROM users
-
             SQL);
     });
 
@@ -32,7 +31,6 @@
         expect($sql)->toBe(<<<SQL
             CREATE OR REPLACE VIEW user_view{$expected} AS
             SELECT id, name FROM users
-
             SQL);
     })->with([
         'one column'  => [['id'], ' (id)'],

tests/Unit/Grammars/MySqlGrammarTest.php

@@ -20,7 +20,6 @@
         expect($sql)->toBe(<<<'SQL'
             CREATE OR REPLACE VIEW user_view AS
             SELECT id, name FROM users
-
             SQL);
     });
 
@@ -32,7 +31,6 @@
         expect($sql)->toBe(<<<SQL
             CREATE OR REPLACE VIEW user_view{$expected} AS
             SELECT id, name FROM users
-
             SQL);
     })->with([
         'one column'  => [['id'], ' (id)'],

tests/Unit/Grammars/PostgresGrammarTest.php

@@ -20,7 +20,6 @@
         expect($sql)->toBe(<<<'SQL'
             CREATE OR REPLACE VIEW user_view AS
             SELECT id, name FROM users
-
             SQL);
     });
 
@@ -32,7 +31,6 @@
         expect($sql)->toBe(<<<'SQL'
             CREATE OR REPLACE RECURSIVE VIEW user_view AS
             SELECT id, name FROM users
-
             SQL);
     });
 
@@ -44,7 +42,6 @@
         expect($sql)->toBe(<<<SQL
             CREATE OR REPLACE VIEW user_view{$expected} AS
             SELECT id, name FROM users
-
             SQL);
     })->with([
         'one column'  => [['id'], ' (id)'],

tests/Unit/Grammars/SqlServerGrammarTest.php

@@ -20,7 +20,6 @@
         expect($sql)->toBe(<<<'SQL'
             CREATE OR ALTER VIEW user_view AS
             SELECT id, name FROM users
-
             SQL);
     });
 
@@ -32,7 +31,6 @@
         expect($sql)->toBe(<<<SQL
             CREATE OR ALTER VIEW user_view{$expected} AS
             SELECT id, name FROM users
-
             SQL);
     })->with([
         'one column'  => [['id'], ' (id)'],