Fixed #680: Missing quotation of ENUM DEFAULT Statement

9de41c83 · Mosh · f3e9fe66 · 9de41c83
Commit 9de41c83 authored Dec 18, 2007 by Mosh
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

Mysql.php lib/Doctrine/Export/Mysql.php +9 -1

No files found.
--- a/lib/Doctrine/Export/Mysql.php
+++ b/lib/Doctrine/Export/Mysql.php
@@ -518,7 +518,15 @@ class Doctrine_Export_Mysql extends Doctrine_Export
                }
            }
    
-            $default = ' DEFAULT ' . $this->conn->quote($field['default'], $field['type']);
+            // Proposed patch:
+            if ($field['type'] == 'enum' && $this->conn->getAttribute(Doctrine::ATTR_USE_NATIVE_ENUM)) {
+                $fieldType = 'varchar';
+            } else {
+                $fieldType = $field['type'];
+            }
+            
+            $default = ' DEFAULT ' . $this->conn->quote($field['default'], $fieldType);
+            //$default = ' DEFAULT ' . $this->conn->quote($field['default'], $field['type']);
        }
        return $default;
    }