Fixed variable name typos
This commit is contained in:
parent
3328d09048
commit
511a961d53
@ -443,7 +443,7 @@ class Doctrine_EventListener_Chain extends Doctrine_Access implements Doctrine_E
|
||||
public function onCollectionDelete(Doctrine_Collection $collection)
|
||||
{
|
||||
foreach ($this->listeners as $listener) {
|
||||
$listener->onCollectionDelete($record);
|
||||
$listener->onCollectionDelete($collection);
|
||||
}
|
||||
}
|
||||
/**
|
||||
|
@ -322,7 +322,7 @@ class Doctrine_Export_Mysql extends Doctrine_Export
|
||||
*/
|
||||
public function createSequence($sequenceName, $start = 1)
|
||||
{
|
||||
$sequenceName = $this->conn->quoteIdentifier($this->conn->getSequenceName($seqName), true);
|
||||
$sequenceName = $this->conn->quoteIdentifier($this->conn->getSequenceName($sequenceName), true);
|
||||
$seqcolName = $this->conn->quoteIdentifier($this->conn->getAttribute(Doctrine::ATTR_SEQCOL_NAME), true);
|
||||
|
||||
$query = 'CREATE TABLE ' . $sequenceName
|
||||
|
@ -185,7 +185,7 @@ class Doctrine_Export_Sqlite extends Doctrine_Export
|
||||
*/
|
||||
public function dropSequence($seq_name)
|
||||
{
|
||||
$sequenceName = $this->conn->quoteIdentifier($this->conn->getSequenceName($seqName), true);
|
||||
$sequenceName = $this->conn->quoteIdentifier($this->conn->getSequenceName($seq_name), true);
|
||||
return $this->conn->exec('DROP TABLE ' . $sequenceName);
|
||||
}
|
||||
}
|
||||
|
@ -138,7 +138,7 @@ class Doctrine_Import_Mysql extends Doctrine_Import
|
||||
$keyName = strtolower($keyName);
|
||||
$nonUnique = strtolower($nonUnique);
|
||||
} else {
|
||||
$keyName = strtoupper($key_name);
|
||||
$keyName = strtoupper($keyName);
|
||||
$nonUnique = strtoupper($nonUnique);
|
||||
}
|
||||
}
|
||||
|
@ -754,7 +754,6 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
|
||||
} else {
|
||||
return $value;
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
if (isset($this->_id[$lower])) {
|
||||
|
@ -91,7 +91,7 @@ class Doctrine_Sequence_Firebird extends Doctrine_Sequence
|
||||
$sequenceName = $this->conn->quoteIdentifier($this->getSequenceName($seqName), true);
|
||||
|
||||
|
||||
$query = 'SELECT GEN_ID(' . $sequence_name . ', 0) as the_value FROM RDB$DATABASE';
|
||||
$query = 'SELECT GEN_ID(' . $sequenceName . ', 0) as the_value FROM RDB$DATABASE';
|
||||
try {
|
||||
$value = $this->queryOne($query);
|
||||
} catch(Doctrine_Connection_Exception $e) {
|
||||
|
@ -46,7 +46,7 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
|
||||
$seqcolName = $this->conn->quoteIdentifier($this->getAttribute(Doctrine::ATTR_SEQCOL_NAME), true);
|
||||
|
||||
|
||||
if ($this->_checkSequence($sequence_name)) {
|
||||
if ($this->_checkSequence($sequenceName)) {
|
||||
$query = 'SET IDENTITY_INSERT ' . $sequenceName . ' ON '
|
||||
. 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (0)';
|
||||
} else {
|
||||
@ -57,7 +57,7 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
|
||||
$this->conn->exec($query);
|
||||
|
||||
} catch(Doctrine_Connection_Exception $e) {
|
||||
if ($onDemand && !$this->_checkSequence($sequenceName)) {
|
||||
if ($ondemand && !$this->_checkSequence($sequenceName)) {
|
||||
// Since we are creating the sequence on demand
|
||||
// we know the first id = 1 so initialize the
|
||||
// sequence at 2
|
||||
|
@ -51,7 +51,7 @@ class Doctrine_Sequence_Mysql extends Doctrine_Sequence
|
||||
$this->conn->exec($query);
|
||||
|
||||
} 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
|
||||
// we know the first id = 1 so initialize the
|
||||
// sequence at 2
|
||||
|
Loading…
x
Reference in New Issue
Block a user