From 1994bfe9a9136f4aaa017b9f286e388c495b4531 Mon Sep 17 00:00:00 2001
From: Chris Bandy <chris.bandy@kohanaphp.com>
Date: Wed, 17 Feb 2010 23:06:20 +0800
Subject: [PATCH] Return list of allowed values for ENUM and SET. Fixes #2452

---
 classes/kohana/database/mysql.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/classes/kohana/database/mysql.php b/classes/kohana/database/mysql.php
index 2b24679..640e014 100644
--- 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;
 			}