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

two TODO closed for exceptions

Browse Source
This commit is contained in:
Anton Grebnev
2011-12-06 14:16:13 +04:00
parent 71cc211c4f
commit a942745039
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
model/MongoModel.php
View File

@ -33,17 +33,11 @@ abstract class MongoModel extends Model
return $this->db->delete($this->table(), array('_id' => $id)); return $this->db->delete($this->table(), array('_id' => $id));
} }
/**
* @TODO: test method
*/
public function deleteAll($query = array()) public function deleteAll($query = array())
{ {
$this->db->delete($this->table(), $query); $this->db->delete($this->table(), $query);
} }
/**
* @TODO: check for limits (if just one record needed)
*/
protected function fetchField($data, $params = array(), $field, $cache_key = null) protected function fetchField($data, $params = array(), $field, $cache_key = null)
{ {
if (!$cache_key || !$result = $cache_key->get()) { if (!$cache_key || !$result = $cache_key->get()) {
@ -55,9 +49,6 @@ abstract class MongoModel extends Model
return $result; return $result;
} }
/**
* @TODO: check for limits (if just one record needed)
*/
protected function fetch($data, $params = array(), $cache_key = null) protected function fetch($data, $params = array(), $cache_key = null)
{ {
if (!$cache_key || !$result = $cache_key->get()) { if (!$cache_key || !$result = $cache_key->get()) {

2
model/MySQLiStatement.php
View File

@ -25,7 +25,7 @@ class MySQLiStatement extends DbStatement
} }
if (count($this->map) > 0) { if (count($this->map) > 0) {
if (!is_string($param) && !is_int($param)) { if (!is_string($param) && !is_int($param)) {
throw new GeneralException('Placeholder must be an array or string'); throw new GeneralException('Placeholder must be an integer or string');
} }
if (is_object($value) && ! ($value instanceof DbExpr)) { if (is_object($value) && ! ($value instanceof DbExpr)) {
throw new GeneralException('Objects excepts DbExpr not allowed.'); throw new GeneralException('Objects excepts DbExpr not allowed.');

3
tests/model/MySQLiStatementTest.php
View File

@ -64,8 +64,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase
/** /**
* @expectedException GeneralException * @expectedException GeneralException
* @expectedExceptionMessage Placeholder must be an array or string * @expectedExceptionMessage Placeholder must be an integer or string
* @TODO: change Exception Message 'Placeholder must be an array or string' - no arrays available
*/ */
public function testBindParamExceptionParam() public function testBindParamExceptionParam()
{ {

3
tests/model/SqlModelTest.php
View File

@ -92,9 +92,6 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
$this->assertSame(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name'), array('id', 'name'))); $this->assertSame(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name'), array('id', 'name')));
$this->assertEmpty($method->invoke($this->model, array())); $this->assertEmpty($method->invoke($this->model, array()));
/**
* @TODO: Model::order - check DESC condition - make case insensitive
*/
$this->assertSame(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name', 'order' => 'DESC'), array('id', 'name'))); $this->assertSame(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name', 'order' => 'DESC'), array('id', 'name')));
} }