Fixed unique key constraints with multiple columns

doctrine · Nov 17, 2010 · 91e15b7 · 91e15b7
1 parent 76e148a
commit 91e15b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php
@@ -263,7 +263,7 @@ private function _appendUniqueConstraintDefinition($sql, Index $index)
 			$fields[] = $field . ' IS NOT NULL';
         }
 
-		return $sql . ' WHERE ' . implode(' OR ', $fields);
+		return $sql . ' WHERE ' . implode(' AND ', $fields);
 	}
 
     /**

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/MsSqlPlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/MsSqlPlatformTest.php
@@ -24,7 +24,7 @@ public function getGenerateTableWithMultiColumnUniqueIndexSql()
     {
         return array(
             '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 @@ public function getGenerateIndexSql()
 
     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()