Merge pull request #4489 from busgurlu/patch-1

to correctly return SET() type
cakephp · Oct 30, 2014 · a8c5b70 · a8c5b70
2 parents 1e8f12f + 996ad04
commit a8c5b70
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -784,6 +784,9 @@ public function column($real) {
 		if (strpos($col, 'enum') !== false) {
 			return "enum($vals)";
 		}
+		if (strpos($col, 'set') !== false) {
+			return "set($vals)";
+		}
 		return 'text';
 	}