This commit is contained in:
parent
378ed91ab6
commit
ec39adcd73
2 changed files with 4 additions and 4 deletions
|
@ -48,7 +48,7 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
|
||||||
|
|
||||||
if ($this->checkSequence($sequenceName)) {
|
if ($this->checkSequence($sequenceName)) {
|
||||||
$query = 'SET IDENTITY_INSERT ' . $sequenceName . ' OFF '
|
$query = 'SET IDENTITY_INSERT ' . $sequenceName . ' OFF '
|
||||||
. 'INSERT INTO ' . $sequenceName . 'DEFAULT VALUES';
|
. 'INSERT INTO ' . $sequenceName . ' DEFAULT VALUES';
|
||||||
} else {
|
} else {
|
||||||
$query = 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (0)';
|
$query = 'INSERT INTO ' . $sequenceName . ' (' . $seqcolName . ') VALUES (0)';
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ class Doctrine_Sequence_Mssql_TestCase extends Doctrine_UnitTestCase
|
||||||
|
|
||||||
$this->assertEqual($this->adapter->pop(), 'SELECT @@IDENTITY');
|
$this->assertEqual($this->adapter->pop(), 'SELECT @@IDENTITY');
|
||||||
$this->assertEqual($this->adapter->pop(), 'SELECT @@VERSION');
|
$this->assertEqual($this->adapter->pop(), 'SELECT @@VERSION');
|
||||||
$this->assertEqual($this->adapter->pop(), 'SET IDENTITY_INSERT user_seq ON INSERT INTO user_seq (id) VALUES (0)');
|
$this->assertEqual($this->adapter->pop(), 'SET IDENTITY_INSERT user_seq ON INSERT INTO user_seq (id) DEFAULT VALUES');
|
||||||
$this->assertEqual($this->adapter->pop(), 'SELECT COUNT(1) FROM user_seq');
|
$this->assertEqual($this->adapter->pop(), 'SELECT COUNT(1) FROM user_seq');
|
||||||
}
|
}
|
||||||
public function testNextIdExecutesSql()
|
public function testNextIdExecutesSql()
|
||||||
|
@ -50,8 +50,8 @@ class Doctrine_Sequence_Mssql_TestCase extends Doctrine_UnitTestCase
|
||||||
$this->assertEqual($this->adapter->pop(), 'DELETE FROM user_seq WHERE id < 0');
|
$this->assertEqual($this->adapter->pop(), 'DELETE FROM user_seq WHERE id < 0');
|
||||||
|
|
||||||
$this->assertEqual($this->adapter->pop(), 'SELECT @@IDENTITY');
|
$this->assertEqual($this->adapter->pop(), 'SELECT @@IDENTITY');
|
||||||
$this->assertEqual($this->adapter->pop(), 'SELECT @@VERSION');
|
$this->assertEqual($this->adapter->pop(), 'SELECT @@VERSION');
|
||||||
$this->assertEqual($this->adapter->pop(), 'SET IDENTITY_INSERT user_seq ON INSERT INTO user_seq (id) VALUES (0)');
|
$this->assertEqual($this->adapter->pop(), 'SET IDENTITY_INSERT user_seq ON INSERT INTO user_seq (id) DEFAULT VALUES');
|
||||||
$this->assertEqual($this->adapter->pop(), 'SELECT COUNT(1) FROM user_seq');
|
$this->assertEqual($this->adapter->pop(), 'SELECT COUNT(1) FROM user_seq');
|
||||||
}
|
}
|
||||||
public function testLastInsertIdCallsPdoLevelEquivalent()
|
public function testLastInsertIdCallsPdoLevelEquivalent()
|
||||||
|
|
Loading…
Add table
Reference in a new issue