wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added condition to batchInsert against empty arrays

Browse Source
This commit is contained in:
Anton Grebnev
2012-01-19 19:16:31 +04:00
parent 99a528fac3
commit 0140c3f4ad
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
model/MongoDbCommand.php
View File

@ -125,11 +125,14 @@ class InsertMongoCommand extends MongoDbCommand
protected function concreteExecute()
{
$result = null;
if (!$this->multiple) {
$result = $this->collection->insert($this->data, array('safe' => $this->safe));
$this->insertId = $this->data['_id'];
} else {
$result = $this->collection->batchInsert($this->data, array('safe' => $this->safe));
if (count($this->data)) {
$result = $this->collection->batchInsert($this->data, array('safe' => $this->safe));
}
}
return $result;
}

5
tests/model/MongoDbCommandTest.php
View File

@ -151,6 +151,9 @@ class MongoDbCommandTest extends PHPUnit_Framework_TestCase
$this->assertArrayHasKey('n', $cmd->execute());
$cmd->bindParam('data', array());
$cmd->execute();
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::FIND, $this->collection);
$cmd->bindParam('condition', array('name' => 'first object'))->bindParam('fields', array());
$result = $cmd->execute();
@ -161,6 +164,8 @@ class MongoDbCommandTest extends PHPUnit_Framework_TestCase
$cmd->bindParam('condition', array('name' => 'equal object'))->bindParam('fields', array());
$result = $cmd->execute();
$this->assertEquals(2, $result->count());
}
/**

1
tests/model/MongoModelTest.php
View File

@ -126,6 +126,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase
$this->model->batchInsert($data);
$this->assertEquals(1, $this->model->count(array('name' => 'first object')));
$this->assertEquals(2, $this->model->count(array('name' => 'equal object')));
$this->model->batchInsert(array());
}
/**