queries with one result are no longer wrapped in an array.

danschultz · Mar 20, 2011 · be1fbc0 · be1fbc0
1 parent 4d51a98
commit be1fbc0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/mesh/Entity.as b/src/mesh/Entity.as
@@ -101,7 +101,7 @@ package mesh
 			var operation:Operation = Query.entity(this).find([id]);
 			operation.addEventListener(ResultOperationEvent.RESULT, function(event:ResultOperationEvent):void
 			{
-				translateFrom(event.data[0].translateTo());
+				translateFrom(event.data.translateTo());
 			});
 			return operation;
 		}

diff --git a/src/mesh/Query.as b/src/mesh/Query.as
@@ -63,6 +63,10 @@ package mesh
 				entity.callback("afterFind");
 				event.data[i] = entity;
 			}
+
+			if (event.data.length == 1) {
+				event.data = event.data[0];
+			}
 		}
 	}
 }
diff --git a/tests/mesh/QueryTests.as b/tests/mesh/QueryTests.as
@@ -51,7 +51,7 @@ package mesh
 			var operation:Operation = Query.entity(Airport).find(_reidHillview.id);
 			operation.addEventListener(ResultOperationEvent.RESULT, function(event:ResultOperationEvent):void
 			{
-				result = event.data[0];
+				result = event.data;
 			});
 			operation.addEventListener(FinishedOperationEvent.FINISHED, Async.asyncHandler(this, function(event:FinishedOperationEvent, data:Object = null):void
 			{
@@ -67,7 +67,7 @@ package mesh
 			var operation:Operation = Query.entity(Airport).where({id:_sanJose.id});
 			operation.addEventListener(ResultOperationEvent.RESULT, function(event:ResultOperationEvent):void
 			{
-				result = event.data[0];
+				result = event.data;
 			});
 			operation.addEventListener(FinishedOperationEvent.FINISHED, Async.asyncHandler(this, function(event:FinishedOperationEvent, data:Object = null):void
 			{
@@ -83,7 +83,7 @@ package mesh
 			var operation:Operation = Query.entity(FlightPlan).where({id:_flightPlan.id});
 			operation.addEventListener(ResultOperationEvent.RESULT, function(event:ResultOperationEvent):void
 			{
-				result = event.data[0];
+				result = event.data;
 			});
 			operation.addEventListener(FinishedOperationEvent.FINISHED, Async.asyncHandler(this, function(event:FinishedOperationEvent, data:Object = null):void
 			{