fixed bug with WOQL.opt()

Author: kevinchekovfeeney

lib/woql.js

@@ -286,7 +286,7 @@ WOQLQuery.prototype.prettyPrint = function(indent, show_context, q, embed){
 				str += "(\n" + this.nspaces(indent) + "WOQL." + clauses.join(",\n"+ this.nspaces(indent) + "WOQL.") + "\n" + this.nspaces(indent - this.indent) + ")";
 
 			}
-			else if(typeof val[val.length-1] == "object" ){
+			else if(typeof val[val.length-1] == "object" && typeof val[val.length-1]['@value'] == "undefined"){
 				var nvals = []
 				for(var i = 0; i<val.length-1; i++){
 					if(key == "limit" || key == "start"){
@@ -483,8 +483,8 @@ WOQLQuery.prototype.when = function(Query, Update){
 
 WOQLQuery.prototype.opt = function(query){
 	if(query){
-		q = (query.json ? query.json() : q); 
-		this.cursor["opt"] = [query];
+		q = (query.json ? query.json() : query);
+		this.cursor["opt"] = [q];
 	}
 	else {
 		this.cursor['opt'] = [{}];