Merge pull request doctrine#513 from zimride/master

jmikola · jmikola · commit 2e45d398fa68 · 2013-02-26T14:19:21.000-08:00
Missing check of dropDups flag causes unique index drop/regeneration
diff --git a/lib/Doctrine/ODM/MongoDB/SchemaManager.php b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
@@ -409,7 +409,7 @@ public function isMongoIndexEquivalentToDocumentIndex($mongoIndex, $documentInde
         }
 
         if (!empty($mongoIndex['unique']) && empty($mongoIndex['dropDups']) &&
-            !empty($documentIndexOptions['unique']) && !empty($documentIndexOptions)) {
+            !empty($documentIndexOptions['unique']) && !empty($documentIndexOptions['dropDups'])) {
 
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ public function isMongoIndexEquivalentToDocumentIndex($mongoIndex, $documentInde`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`if (!empty($mongoIndex['unique']) && empty($mongoIndex['dropDups']) &&`
`412`		`- !empty($documentIndexOptions['unique']) && !empty($documentIndexOptions)) {`
	`412`	`+ !empty($documentIndexOptions['unique']) && !empty($documentIndexOptions['dropDups'])) {`
`413`	`413`
`414`	`414`	`return false;`
`415`	`415`	`}`