[DBAL-166] Default MySQL to UTF8/utf8_general_ci. Allow to set defaul…

…t table options from SchemaConfig.
doctrine · Apr 1, 2012 · 107b870 · 107b870
1 parent 1de0f9d
commit 107b870
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 31 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
@@ -410,31 +410,28 @@ protected function _getCreateTableSQL($tableName, array $columns, array $options
         if (!empty($options['temporary'])) {
             $query .= 'TEMPORARY ';
         }
-        $query.= 'TABLE ' . $tableName . ' (' . $queryFields . ')';
+        $query .= 'TABLE ' . $tableName . ' (' . $queryFields . ') ';
-
-        $optionStrings = array();
 
         if (isset($options['comment'])) {
-            $optionStrings['comment'] = 'COMMENT = ' . $options['comment'];
+            $query .= 'COMMENT = ' . $options['comment'] . ' ';
         }
-        if (isset($options['charset'])) {
+
-            $optionStrings['charset'] = 'DEFAULT CHARACTER SET ' . $options['charset'];
+        if ( ! isset($options['charset'])) {
-            if (isset($options['collate'])) {
+            $options['charset'] = 'utf8';
-                $optionStrings['charset'] .= ' COLLATE ' . $options['collate'];
-            }
         }
 
-        // get the type of the table
+        if ( ! isset($options['collate'])) {
-        if (isset($options['engine'])) {
+            $options['collate'] = 'utf8_general_ci';
-            $optionStrings[] = 'ENGINE = ' . $options['engine'];
-        } else {
-            // default to innodb
-            $optionStrings[] = 'ENGINE = InnoDB';
         }
 
-        if ( ! empty($optionStrings)) {
+        $query .= 'DEFAULT CHARACTER SET ' . $options['charset'];
-            $query.= ' '.implode(' ', $optionStrings);
+        $query .= ' COLLATE ' . $options['collate'];
+
+        if ( ! isset($options['engine'])) {
+            $options['engine'] = 'InnoDB';
         }
+        $query .= ' ENGINE = ' . $options['engine'];
+
         $sql[] = $query;
 
         if (isset($options['foreignKeys'])) {

diff --git a/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php b/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
@@ -848,6 +848,11 @@ public function createSchemaConfig()
             $schemaConfig->setName($searchPaths[0]);
         }
 
+        $params = $this->_conn->getParams();
+        if (isset($params['defaultTableOptions'])) {
+            $schemaConfig->setDefaultTableOptions($params['defautTableOptions']);
+        }
+
         return $schemaConfig;
     }
 

diff --git a/lib/Doctrine/DBAL/Schema/Schema.php b/lib/Doctrine/DBAL/Schema/Schema.php
@@ -225,6 +225,11 @@ public function createTable($tableName)
     {
         $table = new Table($tableName);
         $this->_addTable($table);
+
+        foreach ($this->_schemaConfig->getDefaultTableOptions() as $name => $value) {
+            $table->addOption($name, $value);
+        }
+
         return $table;
     }
 

diff --git a/lib/Doctrine/DBAL/Schema/SchemaConfig.php b/lib/Doctrine/DBAL/Schema/SchemaConfig.php
@@ -32,48 +32,53 @@ class SchemaConfig
     /**
      * @var bool
      */
-    protected $_hasExplicitForeignKeyIndexes = false;
+    protected $hasExplicitForeignKeyIndexes = false;
 
     /**
      * @var int
      */
-    protected $_maxIdentifierLength = 63;
+    protected $maxIdentifierLength = 63;
 
     /**
      * @var string
      */
-    protected $_name;
+    protected $name;
+
+    /**
+     * @var array
+     */
+    protected $defaultTableOptions = array();
 
     /**
      * @return bool
      */
     public function hasExplicitForeignKeyIndexes()
     {
-        return $this->_hasExplicitForeignKeyIndexes;
+        return $this->hasExplicitForeignKeyIndexes;
     }
 
     /**
      * @param bool $flag
      */
     public function setExplicitForeignKeyIndexes($flag)
     {
-        $this->_hasExplicitForeignKeyIndexes = (bool)$flag;
+        $this->hasExplicitForeignKeyIndexes = (bool)$flag;
     }
 
     /**
      * @param int $length
      */
     public function setMaxIdentifierLength($length)
     {
-        $this->_maxIdentifierLength = (int)$length;
+        $this->maxIdentifierLength = (int)$length;
     }
 
     /**
      * @return int
      */
     public function getMaxIdentifierLength()
     {
-        return $this->_maxIdentifierLength;
+        return $this->maxIdentifierLength;
     }
 
     /**
@@ -83,7 +88,7 @@ public function getMaxIdentifierLength()
      */
     public function getName()
     {
-        return $this->_name;
+        return $this->name;
     }
 
     /**
@@ -93,6 +98,22 @@ public function getName()
      */
     public function setName($name)
     {
-        $this->_name = $name;
+        $this->name = $name;
+    }
+
+    /**
+     * Get the default options that are passed to Table instances created with
+     * Schema#createTable().
+     *
+     * @return array
+     */
+    public function getDefaultTableOptions()
+    {
+        return $this->defaultTableOptions;
+    }
+
+    public function setDefaultTableOptions(array $defaultTableOptions)
+    {
+        $this->defaultTableOptions = $defaultTableOptions;
     }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Platforms/MySqlPlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/MySqlPlatformTest.php
@@ -22,18 +22,18 @@ public function testGenerateMixedCaseTableCreate()
         $table->addColumn("Bar", "integer");
 
         $sql = $this->_platform->getCreateTableSQL($table);
-        $this->assertEquals('CREATE TABLE Foo (Bar INT NOT NULL) ENGINE = InnoDB', array_shift($sql));
+        $this->assertEquals('CREATE TABLE Foo (Bar INT NOT NULL) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDB', array_shift($sql));
     }
 
     public function getGenerateTableSql()
     {
-        return 'CREATE TABLE test (id INT AUTO_INCREMENT NOT NULL, test VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) ENGINE = InnoDB';
+        return 'CREATE TABLE test (id INT AUTO_INCREMENT NOT NULL, test VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDB';
     }
 
     public function getGenerateTableWithMultiColumnUniqueIndexSql()
     {
         return array(
-            'CREATE TABLE test (foo VARCHAR(255) DEFAULT NULL, bar VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_D87F7E0C8C73652176FF8CAA (foo, bar)) ENGINE = InnoDB'
+            'CREATE TABLE test (foo VARCHAR(255) DEFAULT NULL, bar VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_D87F7E0C8C73652176FF8CAA (foo, bar)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDB'
         );
     }
 
@@ -197,7 +197,7 @@ public function testGetDateTimeTypeDeclarationSql()
 
     public function getCreateTableColumnCommentsSQL()
     {
-        return array("CREATE TABLE test (id INT NOT NULL COMMENT 'This is a comment', PRIMARY KEY(id)) ENGINE = InnoDB");
+        return array("CREATE TABLE test (id INT NOT NULL COMMENT 'This is a comment', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDB");
     }
 
     public function getAlterTableColumnCommentsSQL()
@@ -207,7 +207,7 @@ public function getAlterTableColumnCommentsSQL()
 
     public function getCreateTableColumnTypeCommentsSQL()
     {
-        return array("CREATE TABLE test (id INT NOT NULL, data LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) ENGINE = InnoDB");
+        return array("CREATE TABLE test (id INT NOT NULL, data LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDB");
     }
 
     /**