Skip to content

Commit d1fd93b

Browse files
authored
use expression when resolving member (#116)
1 parent d749752 commit d1fd93b

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

odata.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var {SwitchExpression, SelectAnyExpression, OrderByAnyExpression, AnyExpressionF
77
createLogicalExpression, isArithmeticOperator, createArithmeticExpression,
88
isArithmeticExpression, isLogicalExpression, isComparisonOperator,
99
createMemberExpression,
10-
createComparisonExpression, isMethodCallExpression, isMemberExpression} = require('./expressions');
10+
createComparisonExpression, isMethodCallExpression, isMemberExpression, Expression} = require('./expressions');
1111
var {whilst, series} = require('async');
1212
const { MethodCallExpression } = require('./expressions');
1313
/**
@@ -909,7 +909,10 @@ OpenDataParser.prototype.parseMember = function(callback) {
909909
}
910910
//search for multiple nested member expression (e.g. a/b/c)
911911
self.resolveMember(identifier, function(err, member) {
912-
callback.call(self, err, createMemberExpression(member));
912+
if (member instanceof Expression) {
913+
return callback.call(self, err, member);
914+
}
915+
return callback.call(self, err, createMemberExpression(member));
913916
});
914917
}
915918
}

package-lock.json

Lines changed: 6 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@themost/query",
3-
"version": "2.5.30",
3+
"version": "2.6.0",
44
"description": "@themost/query is a query builder for SQL. It includes a wide variety of helper functions for building complex SQL queries under node.js.",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)