Fixed ensureIndex so multi key indexes are created in order specified

marcesher · Mar 14, 2014 · e7c7705 · e7c7705
1 parent b8c5af0
commit e7c7705
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/DBCollection.cfc b/core/DBCollection.cfc
@@ -230,7 +230,7 @@
         var additionalOps = [];
 
 		for( var i = 2; i LTE arrayLen(arguments); i++ ){
-			arrayAppend(additionalOps, toMongo(arguments[i]) );
+			arrayAppend(additionalOps, toMongo(arguments[i]) );
 		}
 
 		var output = collection.aggregate( firstOp, additionalOps );
@@ -435,18 +435,18 @@
 	*/
 	public array function ensureIndex(array fields, unique=false, dropDups=false, sparse=false, background=false, name ){
 	 	var pos = 1;
-	 	var doc = {};
+	 	var doc = [];
 	 	var options = {};
 		var indexName = "";
 		var fieldName = "";
 
 	 	for( pos = 1; pos LTE arrayLen(fields); pos++ ){
 			if( isSimpleValue(fields[pos]) ){
 				fieldName = fields[pos];
-				doc[ fieldName ] = 1;
+				arrayappend(doc,{"#fieldName#"=1});
 			} else {
 				fieldName = structKeyList(fields[pos]);
-				doc[ fieldName ] = fields[pos][fieldName];
+				arrayappend(doc,{"#fieldName#"=fields[pos][fieldName]});
 			}
 			indexName = listAppend( indexName, fieldName, "_");
 	 	}
@@ -455,7 +455,7 @@
 	 	else indexName = arguments.name;
 
 		options = { "unique" = unique, "name" = indexName, "dropDups" = dropDups, "sparse" = sparse, "background" = background};
-	 	collection.ensureIndex( toMongo( doc ), toMongo( options ) );
+	 	collection.ensureIndex( mongoUtil.createOrderedDBObject( doc ), toMongo( options ) );
 
 	 	return getIndexes(collectionName, mongoConfig);
 	}