|
@@ -76,7 +76,7 @@ proto.matches = function matches(doc, details) {
|
|
|
var ss = "error on invocation of $where funciton:\n" + this._scope.getError();
|
|
var ss = "error on invocation of $where funciton:\n" + this._scope.getError();
|
|
|
throw new Error(ss);
|
|
throw new Error(ss);
|
|
|
} else if ( err !== 0 ) {
|
|
} else if ( err !== 0 ) {
|
|
|
- throw new Error("unknown error in invocation of $where function")
|
|
|
|
|
|
|
+ throw new Error("unknown error in invocation of $where function");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return this._scope.__returnValue !== 0;
|
|
return this._scope.__returnValue !== 0;
|
|
@@ -90,10 +90,10 @@ proto.matches = function matches(doc, details) {
|
|
|
*
|
|
*
|
|
|
*/
|
|
*/
|
|
|
proto.debugString = function debugString(level){
|
|
proto.debugString = function debugString(level){
|
|
|
- return this._debugAddSpace( level ) + "$where\n"
|
|
|
|
|
- + this._debugAddSpace( level + 1 ) + "dbName: " + this._dbName + "\n"
|
|
|
|
|
- + this._debugAddSpace( level + 1 ) + "code: " + this._code + "\n"
|
|
|
|
|
- + this._debugAddSpace( level + 1 ) + "scope: " + this._userScope + "\n";
|
|
|
|
|
|
|
+ return this._debugAddSpace( level ) + "$where\n" +
|
|
|
|
|
+ this._debugAddSpace( level + 1 ) + "dbName: " + this._dbName + "\n" +
|
|
|
|
|
+ this._debugAddSpace( level + 1 ) + "code: " + this._code + "\n" +
|
|
|
|
|
+ this._debugAddSpace( level + 1 ) + "scope: " + this._userScope + "\n";
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -129,8 +129,8 @@ proto.expressionParserWhereCallbackReal = function expressionParserWhereCallback
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var exp = new WhereMatchExpression();
|
|
var exp = new WhereMatchExpression();
|
|
|
- if ( typeof where === 'string' || typeof where === 'code' ){
|
|
|
|
|
- var s = this.exp.init( ns, where, {} );
|
|
|
|
|
|
|
+ if ( typeof where === 'string' ){
|
|
|
|
|
+ var s = this.exp.init( this._ns, where, {} );
|
|
|
if ( !s.isOK() ) {
|
|
if ( !s.isOK() ) {
|
|
|
return this.StatusWithMatchExpression( s );
|
|
return this.StatusWithMatchExpression( s );
|
|
|
}
|
|
}
|