adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No need to get the datasource if column is defined in schema. Fixes #5712

Browse source
This commit is contained in:
Ceeram 2015-01-21 23:04:29 +01:00
parent c5c9c3ac42
commit 9ce75e6fd6
3 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Model/Model.php
View file

@ -1428,8 +1428,12 @@ class Model extends Object implements CakeEventListener {
* @return string Column type
*/
public function getColumnType($column) {
$db = $this->getDataSource();
$cols = $this->schema();
if (isset($cols[$column]) && isset($cols[$column]['type'])) {
return $cols[$column]['type'];
}
$db = $this->getDataSource();
$model = null;
$startQuote = isset($db->startQuote) ? $db->startQuote : null;

13
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
View file

@ -2497,4 +2497,17 @@ class ModelIntegrationTest extends BaseModelTest {
$model->expects($this->never())->method('getDataSource');
$this->assertEmpty($model->schema());
}
/**
* Tests that calling getColumnType() on a model that is not supposed to use a table
* does not trigger any calls on any datasource
*
* @return void
*/
public function testGetColumnTypeNoDB() {
$model = $this->getMock('Example', array('getDataSource'));
$model->expects($this->never())->method('getDataSource');
$result = $model->getColumnType('filefield');
$this->assertEquals('string', $result);
}
}

31
lib/Cake/Test/Case/Model/models.php
View file

@ -5048,3 +5048,34 @@ class CustomArticle extends AppModel {
}
}
/**
* Example class
*
* @package Cake.Test.Case.Model
*/
class Example extends AppModel {
/**
* useTable property
*
* @var string
*/
public $useTable = false;
/**
* schema property
*
* @var array
*/
protected $_schema = array(
'filefield' => array(
'type' => 'string',
'length' => 254,
'default' => null,
'null' => true,
'comment' => null
),
);
}