Merge pull request #5 from moufmouf/expose_dbal_types

Exposing DBAL objects for fine-grained control

Author: moufmouf

composer.json

@@ -31,7 +31,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3.x-dev"
+            "dev-master": "1.4.x-dev"
         }
     }
 }

src/FluidColumn.php

@@ -244,4 +244,13 @@ private function getOptions(): FluidColumnOptions
     {
         return new FluidColumnOptions($this->fluidTable, $this->column, $this->namingStrategy);
     }
+
+    /**
+     * Returns the underlying DBAL column.
+     * @return Column
+     */
+    public function getDbalColumn(): Column
+    {
+        return $this->column;
+    }
 }

src/FluidTable.php

@@ -130,4 +130,13 @@ public function extends(string $tableName): FluidTable
         $this->column($pk->getName())->references($tableName)->primaryKey();
         return $this;
     }
+
+    /**
+     * Returns the underlying DBAL table.
+     * @return Table
+     */
+    public function getDbalTable(): Table
+    {
+        return $this->table;
+    }
 }

tests/FluidColumnTest.php

@@ -97,6 +97,9 @@ public function testTypes()
             $column->datetimeTzImmutable();
             $this->assertSame(Type::getType(Type::DATETIMETZ_IMMUTABLE), $dbalColumn->getType());
 
+            $column->time();
+            $this->assertSame(Type::getType(Type::TIME), $dbalColumn->getType());
+
             $column->timeImmutable();
             $this->assertSame(Type::getType(Type::TIME_IMMUTABLE), $dbalColumn->getType());
 
@@ -106,6 +109,8 @@ public function testTypes()
             $column->json();
             $this->assertSame(Type::getType(Type::JSON), $dbalColumn->getType());
         }
+
+        $this->assertSame('foo', $column->getDbalColumn()->getName());
     }
 
     public function testReference()

tests/FluidSchemaTest.php

@@ -44,4 +44,12 @@ public function testJunctionTable()
         $this->assertNotNull($schema->getTable('users_roles')->getColumn('user_id'));
         $this->assertNotNull($schema->getTable('users_roles')->getColumn('role_id'));
     }
+
+    public function testGetDbalSchema()
+    {
+        $schema = new Schema();
+        $fluid = new FluidSchema($schema);
+
+        $this->assertSame($schema, $fluid->getDbalSchema());
+    }
 }

tests/FluidTableTest.php

@@ -137,11 +137,12 @@ public function testInherits()
         $this->assertSame(['id'], $fk->getLocalColumns());
     }
 
-    public function testGetDbalSchema()
+    public function testGetDbalTable()
     {
         $schema = new Schema();
         $fluid = new FluidSchema($schema);
 
-        $this->assertSame($schema, $fluid->getDbalSchema());
+        $contacts = $fluid->table('contacts');
+        $this->assertSame('contacts', $contacts->getDbalTable()->getName());
     }
 }