diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-29 16:26:45 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-29 16:26:45 -0700 |
commit | f5019ac5aac229b9ac118a905703c675688e4ed0 (patch) | |
tree | a02af7acf3fdbc9f34b661bf0737a16e672c85dc /lib/mysqlschema.php | |
parent | 283d56bed338ca2a6852a1ae50cf8d5ded4c9fef (diff) |
tweaks for the installer whee
Diffstat (limited to 'lib/mysqlschema.php')
-rw-r--r-- | lib/mysqlschema.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php index 153b79ccd..a2581e6d8 100644 --- a/lib/mysqlschema.php +++ b/lib/mysqlschema.php @@ -387,7 +387,14 @@ class MysqlSchema extends Schema $vals = array_map(array($this, 'quote'), $column['enum']); return 'enum(' . implode(',', $vals) . ')'; } else if ($this->_isString($column)) { - return parent::typeAndSize($column) . ' CHARSET utf8'; + $col = parent::typeAndSize($column); + if (!empty($column['charset'])) { + $col .= ' CHARSET ' . $column['charset']; + } + if (!empty($column['collate'])) { + $col .= ' COLLATE ' . $column['collate']; + } + return $col; } else { return parent::typeAndSize($column); } |