dbgate-sqltree 5.0.3 → 5.0.4-alpha.2

package/lib/dumpSqlExpression.js

@@ -30,16 +30,22 @@ function dumpSqlExpression(dmp, expr) {
             dmp.putCollection(',', expr.args, x => dumpSqlExpression(dmp, x));
             dmp.put(')');
             break;
+        case 'methodCall':
+            dumpSqlExpression(dmp, expr.thisObject);
+            dmp.put('.%s(', expr.method);
+            dmp.putCollection(',', expr.args, x => dumpSqlExpression(dmp, x));
+            dmp.put(')');
+            break;
         case 'transform':
             dmp.transform(expr.transform, () => dumpSqlExpression(dmp, expr.expr));
             break;
         case 'rowNumber':
-            dmp.put(" ^row_number() ^over (^order ^by ");
+            dmp.put(' ^row_number() ^over (^order ^by ');
             dmp.putCollection(', ', expr.orderBy, x => {
                 dumpSqlExpression(dmp, x);
                 dmp.put(' %k', x.direction);
             });
-            dmp.put(")");
+            dmp.put(')');
             break;
     }
 }

package/lib/evaluateExpression.js

@@ -13,6 +13,8 @@ function evaluateExpression(expr, values) {
             return expr.sql;
         case 'call':
             return null;
+        case 'methodCall':
+            return null;
         case 'transform':
             return null;
     }

package/lib/types.d.ts

@@ -113,6 +113,12 @@ export interface CallExpression {
     args: Expression[];
     argsPrefix?: string;
 }
+export interface MethodCallExpression {
+    exprType: 'methodCall';
+    method: string;
+    args: Expression[];
+    thisObject: Expression;
+}
 export interface TranformExpression {
     exprType: 'transform';
     expr: Expression;
@@ -122,7 +128,7 @@ export interface RowNumberExpression {
     exprType: 'rowNumber';
     orderBy: OrderByExpression[];
 }
-export declare type Expression = ColumnRefExpression | ValueExpression | PlaceholderExpression | RawExpression | CallExpression | TranformExpression | RowNumberExpression;
+export declare type Expression = ColumnRefExpression | ValueExpression | PlaceholderExpression | RawExpression | CallExpression | MethodCallExpression | TranformExpression | RowNumberExpression;
 export declare type OrderByExpression = Expression & {
     direction: 'ASC' | 'DESC';
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.3",
+  "version": "5.0.4-alpha.2",
   "name": "dbgate-sqltree",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,7 +27,7 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.0.3",
+    "dbgate-types": "^5.0.4-alpha.2",
     "typescript": "^4.4.3"
   },
   "dependencies": {