Commit 38a3e162 authored by Bong Cosca's avatar Bong Cosca
Browse files

Add support for $ttl argument in count() (Issue #393)

parent 3d268a09

db/jig/mapper.php

+3 −2
Original line number Diff line number Diff line
@@ -265,10 +265,11 @@ class Mapper extends \DB\Cursor { 
	*	Count records that match criteria

	*	@return int

	*	@param $filter array

	*	@param $ttl int

	**/

	function count($filter=NULL) {

	function count($filter=NULL,$ttl=0) {

		$now=microtime(TRUE);

		$out=count($this->find($filter,NULL,FALSE));

		$out=count($this->find($filter,NULL,$ttl,FALSE));

		$this->db->jot('('.sprintf('%.1f',1e3*(microtime(TRUE)-$now)).'ms) '.

			$this->file.' [count] '.($filter?json_encode($filter):''));

		return $out;

db/sql/mapper.php

+3 −2
Original line number Diff line number Diff line
@@ -244,8 +244,9 @@ class Mapper extends \DB\Cursor { 
	*	Count records that match criteria

	*	@return int

	*	@param $filter string|array

	*	@param $ttl int

	**/

	function count($filter=NULL) {

	function count($filter=NULL,$ttl=0) {

		$sql='SELECT COUNT(*) AS rows FROM '.$this->table;

		$args=array();

		if ($filter) {
@@ -258,7 +259,7 @@ class Mapper extends \DB\Cursor { 
			}

			$sql.=' WHERE '.$filter;

		}

		$result=$this->db->exec($sql.';',$args);

		$result=$this->db->exec($sql.';',$args,$ttl);

		return $result[0]['rows'];

	}