RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

fixed Record::hasRelation() to call Table::hasRelation() instead of old Table::hasForeignkey()

Browse Source
This commit is contained in:
amadeus 2006-09-05 22:09:07 +00:00
parent 946e3f1c5d
commit e21562b057
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Doctrine/Record.php
View File

@ -470,7 +470,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
if( ! $this->data) if( ! $this->data)
throw new Doctrine_Record_Exception('Failed to refresh. Record does not exist anymore'); throw new Doctrine_Record_Exception('Failed to refresh. Record does not exist anymore');
$this->data = array_change_key_case($this->data, CASE_LOWER); $this->data = array_change_key_case($this->data, CASE_LOWER);
$this->modified = array(); $this->modified = array();
@ -600,7 +600,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
* rawSet * rawSet
* doctrine uses this function internally, not recommended for developers * doctrine uses this function internally, not recommended for developers
* *
* rawSet() works in very same same way as set() with an exception that * rawSet() works in very same same way as set() with an exception that
* 1. it cannot be used for setting references * 1. it cannot be used for setting references
* 2. it cannot load uninitialized fields * 2. it cannot load uninitialized fields
* *
@ -812,7 +812,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
if($this->data[$v] instanceof Doctrine_Record) if($this->data[$v] instanceof Doctrine_Record)
$this->data[$v] = $this->data[$v]->getIncremented(); $this->data[$v] = $this->data[$v]->getIncremented();
if($this->data[$v] === self::$null) if($this->data[$v] === self::$null)
$a[$v] = null; $a[$v] = null;
else else
@ -849,7 +849,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
* @return boolean * @return boolean
*/ */
public function exists() { public function exists() {
return ($this->state !== Doctrine_Record::STATE_TCLEAN && return ($this->state !== Doctrine_Record::STATE_TCLEAN &&
$this->state !== Doctrine_Record::STATE_TDIRTY); $this->state !== Doctrine_Record::STATE_TDIRTY);
} }
/** /**
@ -860,7 +860,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
public function hasRelation($name) { public function hasRelation($name) {
if(isset($this->data[$name]) || isset($this->id[$name])) if(isset($this->data[$name]) || isset($this->id[$name]))
return true; return true;
return $this->table->hasForeignKey($name); return $this->table->hasRelation($name);
} }
/** /**
* getIterator * getIterator