RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-20 15:03:53 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-03-02 20:47:17 +00:00
parent fecce947ed
commit 1da5baee10
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine.php
View File

@ -150,11 +150,11 @@ final class Doctrine
const ATTR_FIELD_CASE = 102; const ATTR_FIELD_CASE = 102;
const ATTR_IDXNAME_FORMAT = 103; const ATTR_IDXNAME_FORMAT = 103;
const ATTR_SEQNAME_FORMAT = 104; const ATTR_SEQNAME_FORMAT = 104;
const ATTR_SEQCOL_NAME = 105;
const ATTR_CMPNAME_FORMAT = 118; const ATTR_CMPNAME_FORMAT = 118;
const ATTR_DBNAME_FORMAT = 117; const ATTR_DBNAME_FORMAT = 117;
const ATTR_TBLCLASS_FORMAT = 119; const ATTR_TBLCLASS_FORMAT = 119;
const ATTR_EXPORT = 140; const ATTR_EXPORT = 140;
const ATTR_SEQCOL_NAME = 105;
@ -169,7 +169,7 @@ final class Doctrine
const ATTR_DEF_VARCHAR_LENGTH = 114; const ATTR_DEF_VARCHAR_LENGTH = 114;
const ATTR_DEF_TABLESPACE = 115; const ATTR_DEF_TABLESPACE = 115;
const ATTR_EMULATE_DATABASE = 116; const ATTR_EMULATE_DATABASE = 116;
const ATTR_DEFAULT_SEQUENCE = 133;
/** TODO: REMOVE THE FOLLOWING CONSTANTS AND UPDATE THE DOCS ! */ /** TODO: REMOVE THE FOLLOWING CONSTANTS AND UPDATE THE DOCS ! */

1
lib/Doctrine/Configurable.php
View File

@ -127,6 +127,7 @@ abstract class Doctrine_Configurable
case Doctrine::ATTR_ACCESSOR_PREFIX_GET: case Doctrine::ATTR_ACCESSOR_PREFIX_GET:
case Doctrine::ATTR_ACCESSOR_PREFIX_SET: case Doctrine::ATTR_ACCESSOR_PREFIX_SET:
case Doctrine::ATTR_EMULATE_DATABASE: case Doctrine::ATTR_EMULATE_DATABASE:
case Doctrine::ATTR_DEFAULT_SEQUENCE:
break; break;
case Doctrine::ATTR_SEQCOL_NAME: case Doctrine::ATTR_SEQCOL_NAME:

7
lib/Doctrine/Hook/Parser.php
View File

@ -39,7 +39,12 @@ abstract class Doctrine_Hook_Parser
{ {
return $this->condition; return $this->condition;
} }
/**
* getParams
* returns the parameters associated with this parser
*
* @return array
*/
public function getParams() public function getParams()
{ {
return $this->params; return $this->params;

6
lib/Doctrine/Table.php
View File

@ -266,11 +266,15 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$this->identifierType = Doctrine_Identifier::SEQUENCE; $this->identifierType = Doctrine_Identifier::SEQUENCE;
$found = true; $found = true;
if($value) { if ($value) {
$this->options['sequenceName'] = $value; $this->options['sequenceName'] = $value;
} else {
if (($sequence = $this->getAttribute(Doctrine::ATTR_DEFAULT_SEQUENCE)) !== null) {
$this->options['sequenceName'] = $sequence;
} else { } else {
$this->options['sequenceName'] = $this->conn->getSequenceName($this->options['tableName']); $this->options['sequenceName'] = $this->conn->getSequenceName($this->options['tableName']);
} }
}
break; break;
} }
} }