Commit 91e15b7e authored by Juozas Kaziukenas's avatar Juozas Kaziukenas

Fixed unique key constraints with multiple columns

parent 76e148a2
...@@ -263,7 +263,7 @@ class MsSqlPlatform extends AbstractPlatform ...@@ -263,7 +263,7 @@ class MsSqlPlatform extends AbstractPlatform
$fields[] = $field . ' IS NOT NULL'; $fields[] = $field . ' IS NOT NULL';
} }
return $sql . ' WHERE ' . implode(' OR ', $fields); return $sql . ' WHERE ' . implode(' AND ', $fields);
} }
/** /**
......
...@@ -24,7 +24,7 @@ class MsSqlPlatformTest extends AbstractPlatformTestCase ...@@ -24,7 +24,7 @@ class MsSqlPlatformTest extends AbstractPlatformTestCase
{ {
return array( return array(
'CREATE TABLE test (foo NVARCHAR(255) DEFAULT NULL, bar NVARCHAR(255) DEFAULT NULL)', 'CREATE TABLE test (foo NVARCHAR(255) DEFAULT NULL, bar NVARCHAR(255) DEFAULT NULL)',
'CREATE UNIQUE INDEX test_foo_bar_uniq ON test (foo, bar)' 'CREATE UNIQUE INDEX test_foo_bar_uniq ON test (foo, bar) WHERE foo IS NOT NULL AND bar IS NOT NULL'
); );
} }
...@@ -133,7 +133,7 @@ class MsSqlPlatformTest extends AbstractPlatformTestCase ...@@ -133,7 +133,7 @@ class MsSqlPlatformTest extends AbstractPlatformTestCase
public function getGenerateUniqueIndexSql() public function getGenerateUniqueIndexSql()
{ {
return 'CREATE UNIQUE INDEX index_name ON test (test, test2)'; return 'CREATE UNIQUE INDEX index_name ON test (test, test2) WHERE test IS NOT NULL AND test2 IS NOT NULL';
} }
public function getGenerateForeignKeySql() public function getGenerateForeignKeySql()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment