Add key to reflected schema.

cakephp · Mar 25, 2013 · 1dc32f2 · 1dc32f2
1 parent b7f1848
commit 1dc32f2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Connection.php b/lib/Cake/Model/Datasource/Database/Connection.php
@@ -462,6 +462,9 @@ public function describe($table) {
 				'default' => $row['Default'],
 				'length' => $length,
 			];
+			if (!empty($row['Key'])) {
+				$schema[$row['Field']]['key'] = $this->_driver->keyType($row['Key']);
+			}
 		}
 		return $schema;
 	}

diff --git a/lib/Cake/Model/Datasource/Database/Dialect/MysqlDialectTrait.php b/lib/Cake/Model/Datasource/Database/Dialect/MysqlDialectTrait.php
@@ -63,9 +63,29 @@ public function describeTableSql($table) {
 		return ["SHOW FULL COLUMNS FROM " . $this->quoteIdentifier($table), []];
 	}
 
+/**
+ * Convert a platform specific index type to the abstract type
+ *
+ * @param string $key The key type to convert.
+ * @return string The abstract key type (primary, unique, index)
+ */
+	public function keyType($key) {
+		if ($key === 'PRI') {
+			return 'primary';
+		}
+		if ($key === 'MUL') {
+			return 'index';
+		}
+		if ($key === 'uni') {
+			return 'unique';
+		}
+	}
+
 /**
  * Convert a MySQL column type into an abstract type.
  *
+ * The returnned type will be a type that Cake\Model\Datasource\Database\Type can handle.
+ *
  * @param string $column The column type + length
  * @return array List of (type, length)
  */
@@ -110,4 +130,5 @@ public function columnType($column) {
 		}
 		return 'text';
 	}
+
 }
diff --git a/lib/Cake/Test/TestCase/Model/Datasource/Database/Driver/MysqlTest.php b/lib/Cake/Test/TestCase/Model/Datasource/Database/Driver/MysqlTest.php
@@ -243,6 +243,7 @@ public function testDescribeTable() {
 				'null' => false,
 				'default' => null,
 				'length' => 20,
+				'key' => 'primary',
 			],
 			'title' => [
 				'type' => 'string',