RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-09-20 20:48:53 +00:00
parent bea3d56374
commit 2169cbe95e
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Doctrine/Table.php
View File

@ -44,12 +44,12 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
/** /**
* @var mixed $identifier * @var mixed $identifier
*/ */
private $identifier; private $_identifier;
/** /**
* @see Doctrine_Identifier constants * @see Doctrine_Identifier constants
* @var integer $identifierType the type of identifier this table uses * @var integer $identifierType the type of identifier this table uses
*/ */
private $identifierType; private $_identifierType;
/** /**
* @var Doctrine_Connection $conn Doctrine_Connection object that created this table * @var Doctrine_Connection $conn Doctrine_Connection object that created this table
*/ */
@ -57,11 +57,11 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
/** /**
* @var array $identityMap first level cache * @var array $identityMap first level cache
*/ */
private $identityMap = array(); private $_identityMap = array();
/** /**
* @var Doctrine_Table_Repository $repository record repository * @var Doctrine_Table_Repository $repository record repository
*/ */
private $repository; private $_repository;
/** /**
* @var array $columns an array of column definitions, * @var array $columns an array of column definitions,
* keys as column names and values as column definitions * keys as column names and values as column definitions
@ -233,14 +233,14 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
'primary' => true)), $this->columns); 'primary' => true)), $this->columns);
$this->primaryKeys[] = 'id'; $this->primaryKeys[] = 'id';
$this->identifier = 'id'; $this->_identifier = 'id';
$this->identifierType = Doctrine::IDENTIFIER_AUTOINC; $this->_identifierType = Doctrine::IDENTIFIER_AUTOINC;
$this->columnCount++; $this->columnCount++;
break; break;
default: default:
if (count($this->primaryKeys) > 1) { if (count($this->primaryKeys) > 1) {
$this->identifier = $this->primaryKeys; $this->_identifier = $this->primaryKeys;
$this->identifierType = Doctrine::IDENTIFIER_COMPOSITE; $this->_identifierType = Doctrine::IDENTIFIER_COMPOSITE;
} else { } else {
foreach ($this->primaryKeys as $pk) { foreach ($this->primaryKeys as $pk) {
@ -257,12 +257,12 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
switch (strtolower($e2[0])) { switch (strtolower($e2[0])) {
case 'autoincrement': case 'autoincrement':
case 'autoinc': case 'autoinc':
$this->identifierType = Doctrine::IDENTIFIER_AUTOINC; $this->_identifierType = Doctrine::IDENTIFIER_AUTOINC;
$found = true; $found = true;
break; break;
case 'seq': case 'seq':
case 'sequence': case 'sequence':
$this->identifierType = Doctrine::IDENTIFIER_SEQUENCE; $this->_identifierType = Doctrine::IDENTIFIER_SEQUENCE;
$found = true; $found = true;
if ($value) { if ($value) {
@ -277,10 +277,10 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
break; break;
} }
} }
if ( ! isset($this->identifierType)) { if ( ! isset($this->_identifierType)) {
$this->identifierType = Doctrine::IDENTIFIER_NATURAL; $this->_identifierType = Doctrine::IDENTIFIER_NATURAL;
} }
$this->identifier = $pk; $this->_identifier = $pk;
} }
} }
} }
@ -292,7 +292,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
if ($this->isTree()) { if ($this->isTree()) {
$this->getTree()->setUp(); $this->getTree()->setUp();
} }
$this->repository = new Doctrine_Table_Repository($this); $this->_repository = new Doctrine_Table_Repository($this);
} }
/** /**
* getTemplates * getTemplates
@ -612,7 +612,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
*/ */
public function getRepository() public function getRepository()
{ {
return $this->repository; return $this->_repository;
} }
/** /**
* setOption * setOption
@ -782,14 +782,14 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
*/ */
public function getIdentifier() public function getIdentifier()
{ {
return $this->identifier; return $this->_identifier;
} }
/** /**
* @return integer * @return integer
*/ */
public function getIdentifierType() public function getIdentifierType()
{ {
return $this->identifierType; return $this->_identifierType;
} }
/** /**
* hasColumn * hasColumn
@ -895,7 +895,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
*/ */
public function clear() public function clear()
{ {
$this->identityMap = array(); $this->_identityMap = array();
} }
/** /**
* addRecord * addRecord
@ -908,11 +908,11 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
{ {
$id = implode(' ', $record->identifier()); $id = implode(' ', $record->identifier());
if (isset($this->identityMap[$id])) { if (isset($this->_identityMap[$id])) {
return false; return false;
} }
$this->identityMap[$id] = $record; $this->_identityMap[$id] = $record;
return true; return true;
} }
@ -955,13 +955,13 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$id = implode(' ', $id); $id = implode(' ', $id);
if (isset($this->identityMap[$id])) { if (isset($this->_identityMap[$id])) {
$record = $this->identityMap[$id]; $record = $this->_identityMap[$id];
$record->hydrate($this->data); $record->hydrate($this->data);
} else { } else {
$recordName = $this->getClassnameToReturn(); $recordName = $this->getClassnameToReturn();
$record = new $recordName($this); $record = new $recordName($this);
$this->identityMap[$id] = $record; $this->_identityMap[$id] = $record;
} }
$this->data = array(); $this->data = array();
} else { } else {