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

Make fixture import from table aware of records found

Browse source
This commit is contained in:
Marc Würth 2015-07-23 18:03:42 +02:00
parent 6c53f8bf93
commit b412b405f9
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Cake/Console/Command/Task/FixtureTask.php
View file

@ -414,19 +414,26 @@ class FixtureTask extends BakeTask {
* @return array Array of records. * @return array Array of records.
*/ */
protected function _getRecordsFromTable($modelName, $useTable = null) { protected function _getRecordsFromTable($modelName, $useTable = null) {
$modelObject = new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection));
if ($this->interactive) { if ($this->interactive) {
$condition = null; $condition = null;
$prompt = __d('cake_console', "Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1"); $prompt = __d('cake_console', "Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1");
while (!$condition) { while (!$condition) {
$condition = $this->in($prompt, null, 'WHERE 1=1'); $condition = $this->in($prompt, null, 'WHERE 1=1');
} }
$recordsFound = $modelObject->find('count', array(
'conditions' => $condition,
'recursive' => -1,
));
$prompt = __d('cake_console', "How many records do you want to import?"); $prompt = __d('cake_console', "How many records do you want to import?");
$recordCount = $this->in($prompt, null, 10); $recordCount = $this->in($prompt, null, ($recordsFound < 10 ) ? $recordsFound : 10);
} else { } else {
$condition = 'WHERE 1=1'; $condition = 'WHERE 1=1';
$recordCount = (isset($this->params['count']) ? $this->params['count'] : 10); $recordCount = (isset($this->params['count']) ? $this->params['count'] : 10);
} }
$modelObject = new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection));
$records = $modelObject->find('all', array( $records = $modelObject->find('all', array(
'conditions' => $condition, 'conditions' => $condition,
'recursive' => -1, 'recursive' => -1,

8
lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
View file

@ -186,6 +186,9 @@ class FixtureTaskTest extends CakeTestCase {
$this->Task->interactive = true; $this->Task->interactive = true;
$this->Task->expects($this->at(0))->method('in') $this->Task->expects($this->at(0))->method('in')
->will($this->returnValue('WHERE 1=1')); ->will($this->returnValue('WHERE 1=1'));
$this->Task->expects($this->at(1))->method('in')
->with($this->anything(), $this->anything(), '3')
->will($this->returnValue('2'));
$this->Task->connection = 'test'; $this->Task->connection = 'test';
$this->Task->path = '/my/path/'; $this->Task->path = '/my/path/';
@ -197,9 +200,8 @@ class FixtureTaskTest extends CakeTestCase {
$this->assertContains('class ArticleFixture extends CakeTestFixture', $result); $this->assertContains('class ArticleFixture extends CakeTestFixture', $result);
$this->assertContains('public $records', $result); $this->assertContains('public $records', $result);
$this->assertContains('public $import', $result); $this->assertContains('public $import', $result);
$this->assertContains("'title' => 'First Article'", $result, 'Missing import data %s'); $this->assertContains("'title' => 'First Article'", $result, 'Missing import data');
$this->assertContains('Second Article', $result, 'Missing import data %s'); $this->assertContains('Second Article', $result, 'Missing import data');
$this->assertContains('Third Article', $result, 'Missing import data %s');
} }
/** /**