refactor: TableDefinition

Author: EJ-OB

src/TableDefinition.php

@@ -28,22 +28,7 @@ public function __toString(): string
             $sql .= "WHEN {$this->when}".PHP_EOL;
         }
 
-        if ($this->csv) {
-            $sql .= 'FIELDS CSV '.($this->withEmbedded ? 'WITH' : 'WITHOUT').' EMBEDDED';
-        }
-
-        if ($this->terminatedBy) {
-            $sql .= ! str_contains($sql, 'FIELDS') ? 'FIELDS ' : ' ';
-            $sql .= "TERMINATED BY '{$this->terminatedBy}' ";
-        }
-
-        if ($this->enclosedBy) {
-            $sql .= "OPTIONALLY ENCLOSED BY '{$this->enclosedBy}'";
-        }
-
-        if ($this->csv || $this->terminatedBy || $this->enclosedBy) {
-            $sql .= PHP_EOL;
-        }
+        $sql .= $this->delimiterSpecification();
 
         if ($this->formatOptions) {
             $sql .= implode(PHP_EOL, $this->formatOptions).PHP_EOL;
@@ -64,4 +49,28 @@ public function __toString(): string
 
         return $sql;
     }
+
+    private function delimiterSpecification(): string
+    {
+        $specs = ['FIELDS'];
+
+        if ($this->csv) {
+            $specs[] = 'CSV';
+            $specs[] = $this->withEmbedded ? 'WITH EMBEDDED' : 'WITHOUT EMBEDDED';
+        }
+
+        if ($this->terminatedBy) {
+            $specs[] = "TERMINATED BY '{$this->terminatedBy}'";
+        }
+
+        if ($this->enclosedBy) {
+            $specs[] = "OPTIONALLY ENCLOSED BY '{$this->enclosedBy}'";
+        }
+
+        if (count($specs) > 1) {
+            return implode(' ', $specs).PHP_EOL;
+        }
+
+        return '';
+    }
 }

tests/Unit/TableDefinitionTest.php

@@ -59,8 +59,8 @@
     );
 
     assertEquals(
-        "INTO TABLE users\nFIELDS TERMINATED BY ',' \n(\n  id,\n  name,\n  email\n)\n",
-        $table,
+        "INTO TABLE users\nFIELDS TERMINATED BY ','\n(\n  id,\n  name,\n  email\n)\n",
+        $table
     );
 });