[Bridge] [Doctrine] made session table columns configurable through constructor method.

Hugo Hamon · Hugo Hamon · commit 21a94cbf39de · 2015-05-20T22:06:08.000-05:00
diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -40,28 +40,34 @@ class DbalSessionHandler implements \SessionHandlerInterface
     /**
      * @var string Column for session id
      */
-    private $idCol = 'sess_id';
+    private $idCol;
 
     /**
      * @var string Column for session data
      */
-    private $dataCol = 'sess_data';
+    private $dataCol;
 
     /**
      * @var string Column for timestamp
      */
-    private $timeCol = 'sess_time';
+    private $timeCol;
 
     /**
      * Constructor.
      *
-     * @param Connection $con       A connection
-     * @param string     $tableName Table name
+     * @param Connection $con        A database connection handler
+     * @param string     $tableName  The session table name
+     * @param string     $idColumn   The session id table column
+     * @param string     $dataColumn The session data table column
+     * @param string     $timeColumn The session time table column
      */
-    public function __construct(Connection $con, $tableName = 'sessions')
+    public function __construct(Connection $con, $tableName = 'sessions', $idColumn = 'sess_id', $dataColumn = 'sess_data', $timeColumn = 'sess_time')
     {
         $this->con = $con;
         $this->table = $tableName;
+        $this->idCol = $idColumn;
+        $this->dataCol = $dataColumn;
+        $this->timeCol = $timeColumn;
     }
 
     /**
diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerSchema.php
@@ -17,14 +17,15 @@
  * DBAL Session Storage Schema.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ * @author Hugo Hamon <hugohamon@neuf.fr>
  */
 final class DbalSessionHandlerSchema extends Schema
 {
-    public function __construct($tableName = 'sessions')
+    public function __construct($tableName = 'sessions', $idColumn = 'sess_id', $dataColumn = 'sess_data', $timeColumn = 'sess_time')
     {
         parent::__construct();
 
-        $this->addSessionTable($tableName);
+        $this->addSessionTable($tableName, $idColumn, $dataColumn, $timeColumn);
     }
 
     public function addToSchema(Schema $schema)
@@ -34,12 +35,12 @@ public function addToSchema(Schema $schema)
         }
     }
 
-    private function addSessionTable($tableName)
+    private function addSessionTable($tableName, $idColumn, $dataColumn, $timeColumn)
     {
         $table = $this->createTable($tableName);
-        $table->addColumn('sess_id', 'string');
-        $table->addColumn('sess_data', 'text')->setNotNull(true);
-        $table->addColumn('sess_time', 'integer')->setNotNull(true)->setUnsigned(true);
-        $table->setPrimaryKey(array('sess_id'));
+        $table->addColumn($idColumn, 'string');
+        $table->addColumn($dataColumn, 'text')->setNotNull(true);
+        $table->addColumn($timeColumn, 'integer')->setNotNull(true)->setUnsigned(true);
+        $table->setPrimaryKey(array($idColumn));
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerSchemaTest.php b/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerSchemaTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Symfony\Bridge\Doctrine\Tests\HttpFoundation;
+
+use Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandlerSchema;
+
+class DbalSessionHandlerSchemaTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreateDefaultDbalSessionHandlerSchema()
+    {
+        $schema = new DbalSessionHandlerSchema();
+
+        $this->assertTrue($schema->hasTable('sessions'));
+        $this->assertTrue($schema->getTable('sessions')->hasColumn('sess_id'));
+        $this->assertTrue($schema->getTable('sessions')->hasColumn('sess_data'));
+        $this->assertTrue($schema->getTable('sessions')->hasColumn('sess_time'));
+    }
+
+    public function testCreateCustomDbalSessionHandlerSchema()
+    {
+        $schema = new DbalSessionHandlerSchema('sf_sessions', 'id', 'data', 'time');
+
+        $this->assertTrue($schema->hasTable('sf_sessions'));
+        $this->assertTrue($schema->getTable('sf_sessions')->hasColumn('id'));
+        $this->assertTrue($schema->getTable('sf_sessions')->hasColumn('data'));
+        $this->assertTrue($schema->getTable('sf_sessions')->hasColumn('time'));
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php b/src/Symfony/Bridge/Doctrine/Tests/HttpFoundation/DbalSessionHandlerTest.php

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,15 @@`
`17`	`17`	`* DBAL Session Storage Schema.`
`18`	`18`	`*`
`19`	`19`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
	`20`	`+ * @author Hugo Hamon <hugohamon@neuf.fr>`
`20`	`21`	`*/`
`21`	`22`	`final class DbalSessionHandlerSchema extends Schema`
`22`	`23`	`{`
`23`		`- public function __construct($tableName = 'sessions')`
	`24`	`+ public function __construct($tableName = 'sessions', $idColumn = 'sess_id', $dataColumn = 'sess_data', $timeColumn = 'sess_time')`
`24`	`25`	`{`
`25`	`26`	`parent::__construct();`
`26`	`27`
`27`		`- $this->addSessionTable($tableName);`
	`28`	`+ $this->addSessionTable($tableName, $idColumn, $dataColumn, $timeColumn);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public function addToSchema(Schema $schema)`
`@@ -34,12 +35,12 @@ public function addToSchema(Schema $schema)`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`
`37`		`- private function addSessionTable($tableName)`
	`38`	`+ private function addSessionTable($tableName, $idColumn, $dataColumn, $timeColumn)`
`38`	`39`	`{`
`39`	`40`	`$table = $this->createTable($tableName);`
`40`		`- $table->addColumn('sess_id', 'string');`
`41`		`- $table->addColumn('sess_data', 'text')->setNotNull(true);`
`42`		`- $table->addColumn('sess_time', 'integer')->setNotNull(true)->setUnsigned(true);`
`43`		`- $table->setPrimaryKey(array('sess_id'));`
	`41`	`+ $table->addColumn($idColumn, 'string');`
	`42`	`+ $table->addColumn($dataColumn, 'text')->setNotNull(true);`
	`43`	`+ $table->addColumn($timeColumn, 'integer')->setNotNull(true)->setUnsigned(true);`
	`44`	`+ $table->setPrimaryKey(array($idColumn));`
`44`	`45`	`}`
`45`	`46`	`}`