Skip to content
Permalink
Browse files

Making tests pass in SQLServer, now for real this time :P

  • Loading branch information...
lorenzo committed Feb 23, 2016
1 parent 1cca232 commit c2f26b02d29ff1f930a4de2e395075aa48a77234
Showing with 2 additions and 6 deletions.
  1. +0 −4 src/Database/SqlserverCompiler.php
  2. +2 −2 tests/TestCase/Database/QueryTest.php
@@ -69,10 +69,6 @@ protected function _buildInsertPart($parts, $query, $generator)
$columns = $this->_stringifyExpressions($parts[1], $generator);
$modifiers = $this->_buildModifierPart($query->clause('modifier'), $query, $generator);
if ($modifiers !== null) {
$modifiers .= ' ';
}
return sprintf('INSERT%s INTO %s (%s) OUTPUT INSERTED.*',
$modifiers,
$table,
@@ -3651,7 +3651,7 @@ public function testInsertModifiers()
->values(['title' => 'foo'])
->modifier('IGNORE');
$this->assertQuotedQuery(
'INSERT IGNORE INTO <articles> \(<title>\) VALUES \(:c0\)( OUTPUT INSERTED\.\*)?',
'INSERT IGNORE INTO <articles> \(<title>\) (OUTPUT INSERTED\.\* )?',
$result->sql(),
!$this->autoQuote
);
@@ -3663,7 +3663,7 @@ public function testInsertModifiers()
->values(['title' => 'foo'])
->modifier(['IGNORE', 'LOW_PRIORITY']);
$this->assertQuotedQuery(
'INSERT IGNORE LOW_PRIORITY INTO <articles> \(<title>\) VALUES \(:c0\)( OUTPUT INSERTED\.\*)?',
'INSERT IGNORE LOW_PRIORITY INTO <articles> \(<title>\) (OUTPUT INSERTED\.\* )?',
$result->sql(),
!$this->autoQuote
);

0 comments on commit c2f26b0

Please sign in to comment.
You can’t perform that action at this time.