diff --git a/Doctrine/Record.php b/Doctrine/Record.php index 18d223c54..bdf074a62 100644 --- a/Doctrine/Record.php +++ b/Doctrine/Record.php @@ -1,5 +1,5 @@ data[$name] = $value; @@ -312,7 +312,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite case Doctrine_Identifier::NORMAL: $this->id = array(); $name = $this->table->getIdentifier(); - + if(isset($this->data[$name]) && $this->data[$name] !== self::$null) $this->id[$name] = $this->data[$name]; break; @@ -618,19 +618,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite $this->modified[] = $name; } } - /** - * has - * method for checking existence of properties and Doctrine_Record references - * - * @param mixed $name name of the property or reference - * @return boolean - */ - public function has($name) { - if(isset($this->data[$name]) || isset($this->id[$name])) - return true; - return $this->table->hasForeignKey($name); - } /** * set * method for altering properties and Doctrine_Record references @@ -826,6 +814,29 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite public function count() { return count($this->data); } + /** + * alias for count() + */ + public function getColumnCount() { + return $this->count(); + } + /** + * checks if record has data + * @return boolean + */ + public function exists() { + return $this->state !== Doctrine_Record::STATE_TCLEAN; + } + /** + * method for checking existence of properties and Doctrine_Record references + * @param mixed $name name of the property or reference + * @return boolean + */ + public function hasRelation($name) { + if(isset($this->data[$name]) || isset($this->id[$name])) + return true; + return $this->table->hasForeignKey($name); + } /** * getIterator * @return Doctrine_Record_Iterator a Doctrine_Record_Iterator that iterates through the data @@ -1261,7 +1272,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite $a[0] = $this->get($column); $newvalue = call_user_func_array($m, $a); - + $this->data[$column] = $newvalue; } return $this;