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

fixed sequence handling

Browse Source
This commit is contained in:
zYne 2007-06-17 17:49:13 +00:00
parent 642d44d3d9
commit b8353881b7
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Doctrine/Sequence/Mssql.php
View File

@ -40,13 +40,13 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
* *
* @return integer next id in the given sequence * @return integer next id in the given sequence
*/ */
public function nextId($seqName, $ondemand = true) public function nextId($seqName, $onDemand = true)
{ {
$sequenceName = $this->conn->quoteIdentifier($this->formatter->getSequenceName($seqName), true); $sequenceName = $this->conn->quoteIdentifier($this->conn->formatter->getSequenceName($seqName), true);
$seqcolName = $this->conn->quoteIdentifier($this->getAttribute(Doctrine::ATTR_SEQCOL_NAME), true); $seqcolName = $this->conn->quoteIdentifier($this->conn->getAttribute(Doctrine::ATTR_SEQCOL_NAME), true);
if ($this->_checkSequence($sequenceName)) { if ($this->checkSequence($sequenceName)) {
$query = 'SET IDENTITY_INSERT ' . $sequenceName . ' ON ' $query = 'SET IDENTITY_INSERT ' . $sequenceName . ' ON '
. 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (0)'; . 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (0)';
} else { } else {
@ -57,7 +57,7 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
$this->conn->exec($query); $this->conn->exec($query);
} catch(Doctrine_Connection_Exception $e) { } catch(Doctrine_Connection_Exception $e) {
if ($ondemand && !$this->_checkSequence($sequenceName)) { if ($onDemand && $e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) {
// Since we are creating the sequence on demand // Since we are creating the sequence on demand
// we know the first id = 1 so initialize the // we know the first id = 1 so initialize the
// sequence at 2 // sequence at 2
@ -69,6 +69,7 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
// First ID of a newly created sequence is 1 // First ID of a newly created sequence is 1
return 1; return 1;
} }
throw $e;
} }
$value = $this->lastInsertId($sequenceName); $value = $this->lastInsertId($sequenceName);
@ -85,6 +86,26 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
} }
return $value; return $value;
} }
/**
* Checks if there's a sequence that exists.
*
* @param string $seqName The sequence name to verify.
* @return bool $tableExists The value if the table exists or not
* @access private
*/
public function checkSequence($seqName)
{
$query = 'SELECT COUNT(1) FROM ' . $seqName;
try {
$this->conn->execute($query);
} catch (Doctrine_Connection_Exception $e) {
if ($e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) {
return false;
}
}
return true;
}
/** /**
* Returns the autoincrement ID if supported or $id or fetches the current * Returns the autoincrement ID if supported or $id or fetches the current
* ID in a sequence called: $table.(empty($field) ? '' : '_'.$field) * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)

4
lib/Doctrine/Sequence/Mysql.php
View File

@ -40,7 +40,7 @@ class Doctrine_Sequence_Mysql extends Doctrine_Sequence
* *
* @return integer next id in the given sequence * @return integer next id in the given sequence
*/ */
public function nextId($seqName, $ondemand = true) public function nextId($seqName, $onDemand = true)
{ {
$sequenceName = $this->conn->quoteIdentifier($this->conn->formatter->getSequenceName($seqName), true); $sequenceName = $this->conn->quoteIdentifier($this->conn->formatter->getSequenceName($seqName), true);
$seqcolName = $this->conn->quoteIdentifier($this->conn->getAttribute(Doctrine::ATTR_SEQCOL_NAME), true); $seqcolName = $this->conn->quoteIdentifier($this->conn->getAttribute(Doctrine::ATTR_SEQCOL_NAME), true);
@ -51,7 +51,7 @@ class Doctrine_Sequence_Mysql extends Doctrine_Sequence
$this->conn->exec($query); $this->conn->exec($query);
} catch(Doctrine_Connection_Exception $e) { } catch(Doctrine_Connection_Exception $e) {
if ($ondemand && $e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) { if ($onDemand && $e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) {
// Since we are creating the sequence on demand // Since we are creating the sequence on demand
// we know the first id = 1 so initialize the // we know the first id = 1 so initialize the
// sequence at 2 // sequence at 2