column charset

diff --git a/ipf/orm/datadict/mysql.php b/ipf/orm/datadict/mysql.php
index cf5620b8220267fd8de1fdc6ae5b125e88f1cc40..ac55770efa2c3d75314209378a1d8f2da324f38b 100644 (file)
--- a/ipf/orm/datadict/mysql.php
+++ b/ipf/orm/datadict/mysql.php
@@ -345,11 +345,6 @@ class IPF_ORM_DataDict_Mysql extends IPF_ORM_DataDict
         }
     }
 
-    public function getCharsetFieldDeclaration($charset)
-    {
-        return 'CHARACTER SET ' . $charset;
-    }
-
     public function getIntegerDeclaration($name, $field)
     {
         $default = $autoinc = '';

diff --git a/ipf/orm/export.php b/ipf/orm/export.php
index 6cf51a4db30cac17213f916db8af523e32963452..ecca7b5aa0289080f936e38428d3e5e6f5edfe91 100644 (file)
--- a/ipf/orm/export.php
+++ b/ipf/orm/export.php
@@ -224,7 +224,7 @@ class IPF_ORM_Export extends IPF_ORM_Connection_Module
         $default   = $this->getDefaultFieldDeclaration($field);
 
         $charset   = (isset($field['charset']) && $field['charset']) ?
-                    ' ' . $this->getCharsetFieldDeclaration($field['charset']) : '';
+                    ' CHARACTER SET ' . $field['charset'] : '';
 
         $collation = (isset($field['collate']) && $field['collate']) ?
                     ' COLLATE ' . $field['collate'] : '';
@@ -404,11 +404,6 @@ class IPF_ORM_Export extends IPF_ORM_Connection_Module
         return 'UNIQUE';
     }
 
-    public function getCharsetFieldDeclaration($charset)
-    {
-        return '';
-    }
-
     public function exportSortedClassesSql($classes, $groupByConnection = true)
     {
          $connections = array();

diff --git a/ipf/orm/export/mysql.php b/ipf/orm/export/mysql.php
index b2b26055191ded3f14d452fc70b35ffcb6e449a5..ef9c16e992c1802c35e3ca364231a8538da7beb1 100644 (file)
--- a/ipf/orm/export/mysql.php
+++ b/ipf/orm/export/mysql.php
@@ -115,11 +115,10 @@ class IPF_ORM_Export_Mysql extends IPF_ORM_Export
 
     public function getDeclaration($name, array $field)
     {
-
         $default   = $this->getDefaultFieldDeclaration($field);
 
         $charset   = (isset($field['charset']) && $field['charset']) ?
-                    ' ' . $this->getCharsetFieldDeclaration($field['charset']) : '';
+                    ' CHARACTER SET ' . $field['charset'] : '';
 
         $collation = (isset($field['collate']) && $field['collate']) ?
                     ' COLLATE ' . $field['collate'] : '';

diff --git a/ipf/orm/import/schema.php b/ipf/orm/import/schema.php
index 6a6736e770c66c8809a32ec7c132c06be35c6e15..3f7e073f8098ff17715a3a9ef6fb41e07c6d17a5 100644 (file)
--- a/ipf/orm/import/schema.php
+++ b/ipf/orm/import/schema.php
@@ -40,6 +40,7 @@ class IPF_ORM_Import_Schema
             'owner',
             'exclude',
             'collate',
+            'charset',
         ),
         'relation' => array(
             'key',