Merge pull request kohana#83 from neo22s/patch-2

Update ORM.php refs #4652
tmihalik · May 31, 2013 · e7de33d · e7de33d
2 parents 9273028 + f53ee39
commit e7de33d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/classes/Kohana/ORM.php b/classes/Kohana/ORM.php
@@ -1644,7 +1644,7 @@ public function count_all()
 		$this->_build(Database::SELECT);
 
 		$records = $this->_db_builder->from(array($this->_table_name, $this->_object_name))
-			->select(array(DB::expr('COUNT(*)'), 'records_found'))
+			->select(array(DB::expr('COUNT('.$this->_db->quote_column($this->_primary_key).')'), 'records_found'))
 			->execute($this->_db)
 			->get('records_found');