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

added butchInsert to mongo model

Browse Source
This commit is contained in:
Anton Grebnev
2012-01-18 23:30:34 +04:00
parent d1723cb87b
commit 99a528fac3
6 changed files with 118 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
model/MongoDbCommand.php
View File

@ -121,10 +121,16 @@ class InsertMongoCommand extends MongoDbCommand
protected $insertId = false;
protected $multiple = false;
protected function concreteExecute()
{
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));
}
return $result;
}
@ -150,6 +156,8 @@ class InsertMongoCommand extends MongoDbCommand
var_dump($this->data);
$data = ob_get_clean();
$result .= 'Data: ' . $data . PHP_EOL;
$mult = $this->multiple ? 'TRUE' : 'FALSE';
$result .= 'Bulk insert: ' . $mult . PHP_EOL;
$safe = $this->safe ? 'TRUE' : 'FALSE';
$result .= 'Safe operation: ' . $safe . PHP_EOL;
return $result;

5
model/MongoDriver.php
View File

@ -77,12 +77,13 @@ class MongoDriver extends NoSqlDbDriver
return $this->query($command, $params);
}
public function insert($collection, $data, $safe = true)
public function insert($collection, $data, $multiple = false, $safe = true)
{
$command = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->getCollection($collection));
$params = array(
'data' => $data,
'safe' => $safe
'safe' => $safe,
'multiple' => $multiple
);
$result = $this->query($command, $params);
$this->last_insert_id = $result->getInsertId();

13
model/MongoModel.php
View File

@ -32,18 +32,23 @@ abstract class MongoModel extends Model
public function get($id)
{
if($this->useMongoId) {
if(! $id instanceof MongoId) {
if ($this->useMongoId) {
if (!$id instanceof MongoId) {
$id = new MongoId($id);
}
}
return $this->db->get($this->table(), array('_id' => $id))->fetch();
}
public function batchInsert($data)
{
return $this->db->insert($this->table(), $data, true);
}
public function delete($id)
{
if($this->useMongoId) {
if(! $id instanceof MongoId) {
if ($this->useMongoId) {
if (!$id instanceof MongoId) {
$id = new MongoId($id);
}
}

43
tests/model/MongoDbCommandTest.php
View File

@ -132,6 +132,40 @@ class MongoDbCommandTest extends PHPUnit_Framework_TestCase
/**
* @group Mongo
*/
public function testInsertCommandMultipleObjects()
{
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->collection);
$data = array(
array('name' => 'first object'),
array('name' => 'second object'),
array('name' => 'equal object'),
array('name' => 'equal object')
);
$cmd
->bindParam('data', $data)
->bindParam('multiple', true)
->bindParam('safe', true);
$this->assertFalse($cmd->getInsertId());
$this->assertArrayHasKey('n', $cmd->execute());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::FIND, $this->collection);
$cmd->bindParam('condition', array('name' => 'first object'))->bindParam('fields', array());
$result = $cmd->execute();
$this->assertEquals(1, $result->count());
$cmd->bindParam('condition', array('name' => 'second object'))->bindParam('fields', array());
$result = $cmd->execute();
$this->assertEquals(1, $result->count());
$cmd->bindParam('condition', array('name' => 'equal object'))->bindParam('fields', array());
$result = $cmd->execute();
$this->assertEquals(2, $result->count());
}
/**
* @group Mongo
*/
public function testInsertCommandNotAllParamsBinded()
{
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->collection);
@ -277,6 +311,15 @@ class MongoDbCommandTest extends PHPUnit_Framework_TestCase
->bindParam('data', array('name' => 'insert'))
->bindParam('safe', true);
$this->assertStringStartsWith('Collection: ', $cmd->__toString());
$this->assertContains('Bulk insert: FALSE', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->collection);
$this->assertSame('Command properties not set', $cmd->__toString());
$cmd
->bindParam('data', array('name' => 'insert'))
->bindParam('multiple', true)
->bindParam('safe', true);
$this->assertContains('Bulk insert: TRUE', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::FIND, $this->collection);
$this->assertSame('Command properties not set', $cmd->__toString());

31
tests/model/MongoDriverTest.php
View File

@ -67,7 +67,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase
$collection = 'items';
$db->dropCollection($collection);
$collection = $db->selectCollection($collection);
foreach($data as $document) {
foreach ($data as $document) {
$collection->insert($document);
}
}
@ -131,7 +131,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase
$this->assertEquals(3, $mongo->find('items', array('price' => array('$lt' => 3.5)))->numRows());
$data = $mongo->find('items', array('price' => array('$lt' => 3.5)));
$count = 0;
while($row = $data->fetch(Db::FETCH_ASSOC)) {
while ($row = $data->fetch(Db::FETCH_ASSOC)) {
$count++;
$this->assertLessThan(3.5, $row['price']);
}
@ -173,7 +173,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase
$data->order(array('name' => -1));
$data->skip(3);
$data->limit(1);
while($row = $data->fetch()) {
while ($row = $data->fetch()) {
$this->assertEquals('fdsbssc', $row->name);
}
}
@ -252,6 +252,29 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase
* @runInSeparateProcess
* @group Mongo
*/
public function testBatchInsert()
{
if (!defined('DEBUG')) {
define('DEBUG', false);
}
$data = array(
array('name' => 'first object'),
array('name' => 'second object'),
array('name' => 'equal object'),
array('name' => 'equal object')
);
$mongo = new MongoDriver($this->conf);
$mongo->insert('items', $data, true);
$this->assertEquals(1, $mongo->find('items', array('name' => 'first object'))->numRows());
$this->assertEquals(1, $mongo->find('items', array('name' => 'second object'))->numRows());
$this->assertEquals(2, $mongo->find('items', array('name' => 'equal object'))->numRows());
}
/**
* @runInSeparateProcess
* @group Mongo
*/
public function testGetInsertId()
{
if (!defined('DEBUG')) {
@ -337,7 +360,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase
define('DEBUG', false);
}
$mongo = new MongoDriver($this->conf);
$result = $mongo->command('items', array('distinct' =>'items', 'key' => 'name'));
$result = $mongo->command('items', array('distinct' => 'items', 'key' => 'name'));
$this->assertEquals(4, count($result->fetch(DB::FETCH_ASSOC)));
}
}

20
tests/model/MongoModelTest.php
View File

@ -112,6 +112,26 @@ class MongoModelTest extends PHPUnit_Framework_TestCase
* @runInSeparateProcess
* @group Mongo
*/
public function testBatchInsert()
{
if (!defined('DEBUG')) {
define('DEBUG', false);
}
$data = array(
array('name' => 'first object'),
array('name' => 'second object'),
array('name' => 'equal object'),
array('name' => 'equal object')
);
$this->model->batchInsert($data);
$this->assertEquals(1, $this->model->count(array('name' => 'first object')));
$this->assertEquals(2, $this->model->count(array('name' => 'equal object')));
}
/**
* @runInSeparateProcess
* @group Mongo
*/
public function testDeleteAll()
{
if (!defined('DEBUG')) {