use expression when resolving member (#116)

themost-framework · Dec 17, 2024 · d1fd93b · d1fd93b
1 parent d749752
commit d1fd93b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/odata.js b/odata.js
@@ -7,7 +7,7 @@ var {SwitchExpression, SelectAnyExpression, OrderByAnyExpression, AnyExpressionF
     createLogicalExpression, isArithmeticOperator, createArithmeticExpression,
     isArithmeticExpression, isLogicalExpression, isComparisonOperator,
     createMemberExpression,
-    createComparisonExpression, isMethodCallExpression, isMemberExpression} = require('./expressions');
+    createComparisonExpression, isMethodCallExpression, isMemberExpression, Expression} = require('./expressions');
 var {whilst, series} = require('async');
 const { MethodCallExpression } = require('./expressions');
 /**
@@ -909,7 +909,10 @@ OpenDataParser.prototype.parseMember = function(callback) {
             }
             //search for multiple nested member expression (e.g. a/b/c)
             self.resolveMember(identifier, function(err, member) {
-                callback.call(self, err, createMemberExpression(member));
+                if (member instanceof Expression) {
+                    return callback.call(self, err, member);
+                }
+                return callback.call(self, err, createMemberExpression(member));
             });
         }
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@themost/query",
-  "version": "2.5.30",
+  "version": "2.6.0",
   "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.",
   "main": "index.js",
   "scripts": {