Return list of allowed values for ENUM and SET. Fixes #2452

crowdfavorite · Feb 20, 2010 · 1994bfe · 1994bfe
1 parent 752f2ac
commit 1994bfe
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/classes/kohana/database/mysql.php b/classes/kohana/database/mysql.php
@@ -316,17 +316,22 @@ public function list_columns($table, $like = NULL)
 						case 'varbinary':
 							$column['character_maximum_length'] = $length;
 						break;
+
 						case 'char':
 						case 'varchar':
 							$column['character_maximum_length'] = $length;
-						case 'enum':
-						case 'set':
 						case 'text':
 						case 'tinytext':
 						case 'mediumtext':
 						case 'longtext':
 							$column['collation_name'] = $row['Collation'];
 						break;
+
+						case 'enum':
+						case 'set':
+							$column['collation_name'] = $row['Collation'];
+							$column['options'] = explode('\',\'', substr($length, 1, -1));
+						break;
 					}
 				break;
 			}