Merge pull request #20 from dsavina/feature/optional-index-name

Add optional argument $indexName to index creation
thecodingmachine · Jan 6, 2021 · 64d63f6 · 64d63f6
2 parents 3a4e7e5 + a5e2a26
commit 64d63f6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "thecodingmachine/dbal-fluid-schema-builder": "^1.4",
+        "thecodingmachine/dbal-fluid-schema-builder": "^1.6",
         "doctrine/dbal": "^2.5"
     },
     "require-dev": {

diff --git a/src/TdbmFluidColumnOptions.php b/src/TdbmFluidColumnOptions.php
@@ -51,9 +51,9 @@ public function null(): self
      *
      * @return self
      */
-    public function unique(): self
+    public function unique(?string $indexName = null): self
     {
-        $this->fluidColumnOptions->unique();
+        $this->fluidColumnOptions->unique($indexName);
         return $this;
     }
 
@@ -62,9 +62,9 @@ public function unique(): self
      *
      * @return self
      */
-    public function index(): self
+    public function index(?string $indexName = null): self
     {
-        $this->fluidColumnOptions->index();
+        $this->fluidColumnOptions->index($indexName);
         return $this;
     }
     public function comment(string $comment): self

diff --git a/src/TdbmFluidTable.php b/src/TdbmFluidTable.php
@@ -42,15 +42,15 @@ public function column(string $name): TdbmFluidColumn
         return $this->tdbmFluidColumns[$name];
     }
 
-    public function index(array $columnNames): TdbmFluidTable
+    public function index(array $columnNames, ?string $indexName = null): TdbmFluidTable
     {
-        $this->fluidTable->index($columnNames);
+        $this->fluidTable->index($columnNames, $indexName);
         return $this;
     }
 
-    public function unique(array $columnNames): TdbmFluidTable
+    public function unique(array $columnNames, ?string $indexName = null): TdbmFluidTable
     {
-        $this->fluidTable->unique($columnNames);
+        $this->fluidTable->unique($columnNames, $indexName);
         return $this;
     }
 

diff --git a/tests/TdbmFluidColumnOptionsTest.php b/tests/TdbmFluidColumnOptionsTest.php
@@ -26,8 +26,8 @@ public function testOptions()
         $columnOptions->notNull();
         $this->assertSame(true, $dbalColumn->getNotnull());
 
-        $columnOptions->unique();
-        $this->assertSame(true, $dbalColumn->getCustomSchemaOption('unique'));
+        $columnOptions->unique('unique_foo');
+        $this->assertSame(true, $posts->getDbalTable()->getIndex('unique_foo')->isUnique());
 
         $columnOptions->comment('foo');
         $this->assertSame('foo', $dbalColumn->getComment());