Fix method signatures of database drivers.

They were incompatible with Datasource. Add tests for MySQL and SQLite as their implementation changed a bit. Update docs for Postgres. Fixes #2100
cakephp · Oct 15, 2011 · 6d9b709 · 6d9b709
1 parent 6bf6d79
commit 6d9b709
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 13 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -292,19 +292,21 @@ public function getCharsetName($name) {
 /**
  * Returns an array of the fields in given table name.
  *
- * @param Model $model Name of database table to inspect or model instance
+ * @param Model|string $model Name of database table to inspect or model instance
  * @return array Fields in table. Keys are name and type
  * @throws CakeException
  */
-	public function describe(Model $model) {
+	public function describe($model) {
 		$cache = parent::describe($model);
 		if ($cache != null) {
 			return $cache;
 		}
+		$table = $this->fullTableName($model);
+
 		$fields = false;
-		$cols = $this->_execute('SHOW FULL COLUMNS FROM ' . $this->fullTableName($model));
+		$cols = $this->_execute('SHOW FULL COLUMNS FROM ' . $table);
 		if (!$cols) {
-			throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $model->name));
+			throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table));
 		}
 
 		foreach ($cols as $column) {

diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php
@@ -184,7 +184,7 @@ public function listSources($data = null) {
 /**
  * Returns an array of the fields in given table name.
  *
- * @param Model $model Name of database table to inspect
+ * @param Model|string $model Name of database table to inspect
  * @return array Fields in table. Keys are name and type
  */
 	public function describe($model) {

diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -156,16 +156,17 @@ public function listSources($data = null) {
 /**
  * Returns an array of the fields in given table name.
  *
- * @param Model $model
+ * @param Model|string $model Either the model or table name you want described.
  * @return array Fields in table. Keys are name and type
  */
-	public function describe(Model $model) {
+	public function describe($model) {
 		$cache = parent::describe($model);
 		if ($cache != null) {
 			return $cache;
 		}
+		$table = $this->fullTableName($model);
 		$fields = array();
-		$result = $this->_execute('PRAGMA table_info(' . $model->tablePrefix . $model->table . ')');
+		$result = $this->_execute('PRAGMA table_info(' . $table . ')');
 
 		foreach ($result as $column) {
 			$column = (array) $column;
@@ -187,7 +188,7 @@ public function describe(Model $model) {
 		}
 
 		$result->closeCursor();
-		$this->_cacheDescription($model->tablePrefix . $model->table, $fields);
+		$this->_cacheDescription($table, $fields);
 		return $fields;
 	}
 

diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -195,11 +195,11 @@ public function listSources($data = null) {
 /**
  * Returns an array of the fields in given table name.
  *
- * @param Model $model Model object to describe
+ * @param Model|string $model Model object to describe, or a string table name.
  * @return array Fields in table. Keys are name and type
  * @throws CakeException
  */
-	public function describe(Model $model) {
+	public function describe($model) {
 		$cache = parent::describe($model);
 		if ($cache != null) {
 			return $cache;
@@ -219,7 +219,7 @@ public function describe(Model $model) {
 			WHERE TABLE_NAME = '" . $table . "'"
 		);
 		if (!$cols) {
-			throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $model->name));
+			throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table));
 		}
 
 		foreach ($cols as $column) {

diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -761,6 +761,26 @@ public function testVirtualFieldSeparators() {
 		$this->assertEqual($expected, $result);
 	}
 
+/**
+ * Test describe() on a fixture.
+ *
+ * @return void
+ */
+	public function testDescribe() {
+		$this->loadFixtures('Apple');
+
+		$model = new Apple();
+		$result = $this->Dbo->describe($model);
+
+		$this->assertTrue(isset($result['id']));
+		$this->assertTrue(isset($result['color']));
+
+		$result = $this->Dbo->describe($model->useTable);
+
+		$this->assertTrue(isset($result['id']));
+		$this->assertTrue(isset($result['color']));
+	}
+
 /**
  * test that a describe() gets additional fieldParameters
  *

diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
@@ -292,7 +292,10 @@ public function testDescribe() {
 				'length' => null,
 			)
 		);
-		$this->assertEqual($expected, $result);
+		$this->assertEquals($expected, $result);
+
+		$result = $this->Dbo->describe($Model->useTable);
+		$this->assertEquals($expected, $result);
 	}
 
 /**