Refactor case switch and add missing types.

cakephp · May 7, 2013 · 5bfa029 · 5bfa029
1 parent acbb923
commit 5bfa029
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 25 deletions.
diff --git a/lib/Cake/Database/Schema/MysqlSchema.php b/lib/Cake/Database/Schema/MysqlSchema.php
@@ -182,31 +182,34 @@ public function createTableSql($table, $lines) {
 	public function columnSql(Table $table, $name) {
 		$data = $table->column($name);
 		$out = $this->_driver->quoteIdentifier($name);
-		switch ($data['type']) {
-			case 'string':
-				$out .= !empty($data['fixed']) ? ' CHAR' : ' VARCHAR';
-				if (!isset($data['length'])) {
-					$data['length'] = 255;
-				}
-			break;
-			case 'integer':
-				$out .= ' INTEGER';
-			break;
-			case 'biginteger':
-				$out .= ' BIGINT';
-			break;
-			case 'boolean':
-				$out .= ' BOOLEAN';
-			break;
-			case 'text':
-				$out .= ' TEXT';
-			break;
-			case 'datetime':
-				$out .= ' DATETIME';
-			break;
-			case 'timestamp':
-				$out .= ' TIMESTAMP';
-			break;
+		$typeMap = [
+			'integer' => ' INTEGER',
+			'biginteger' => ' BIGINT',
+			'boolean' => ' BOOLEAN',
+			'binary' => ' BLOB',
+			'float' => ' FLOAT',
+			'decimal' => ' DECIMAL',
+			'text' => ' TEXT',
+			'date' => ' DATE',
+			'time' => ' TIME',
+			'datetime' => ' DATETIME',
+			'timestamp' => ' TIMESTAMP',
+		];
+		$specialMap = [
+			'string' => true,
+		];
+		if (isset($typeMap[$data['type']])) {
+			$out .= $typeMap[$data['type']];
+		}
+		if (isset($specialMap[$data['type']])) {
+			switch ($data['type']) {
+				case 'string':
+					$out .= !empty($data['fixed']) ? ' CHAR' : ' VARCHAR';
+					if (!isset($data['length'])) {
+						$data['length'] = 255;
+					}
+				break;
+			}
 		}
 		$hasLength = [
 			'integer', 'string', 'float'

diff --git a/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php b/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -313,6 +313,12 @@ public static function columnSqlProvider() {
 				['type' => 'biginteger', 'length' => 20],
 				'`post_id` BIGINT'
 			],
+			// Float
+			[
+				'value',
+				['type' => 'float'],
+				'`value` FLOAT'
+			],
 			// Boolean
 			[
 				'checked',
@@ -330,6 +336,17 @@ public static function columnSqlProvider() {
 				['type' => 'datetime', 'comment' => 'Created timestamp'],
 				'`created` DATETIME COMMENT "Created timestamp"'
 			],
+			// Date & Time
+			[
+				'start_date',
+				['type' => 'date'],
+				'`start_date` DATE'
+			],
+			[
+				'start_time',
+				['type' => 'time'],
+				'`start_time` TIME'
+			],
 			// timestamps
 			[
 				'created',