BUGFIX Ensure that enum values with a single quote are escaped correc…

…tly for PHP coming out of MySQL ('' to \'), otherwise dev/build shows these as changed all the time.
silverstripe · Jun 5, 2012 · 13be7cb · 13be7cb
1 parent b4fb174
commit 13be7cb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/model/MySQLDatabase.php b/model/MySQLDatabase.php
@@ -367,7 +367,9 @@ public function renameField($tableName, $oldName, $newName) {
 	public function fieldList($table) {
 		$fields = DB::query("SHOW FULL FIELDS IN \"$table\"");
 		foreach($fields as $field) {
-			$fieldSpec = $field['Type'];
+
+			// ensure that '' is converted to \' in field specification (mostly for the benefit of ENUM values)
+			$fieldSpec = str_replace('\'\'', '\\\'', $field['Type']);
 			if(!$field['Null'] || $field['Null'] == 'NO') {
 				$fieldSpec .= ' not null';
 			}