@abaplint/transpiler 2.13.27 → 2.13.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -21,7 +21,7 @@ class SQLCondTranspiler {
|
|
|
21
21
|
if (c.findDirectExpression(abaplint.Expressions.Dynamic)) {
|
|
22
22
|
const chain = c.findDirectExpression(abaplint.Expressions.Dynamic)?.findFirstExpression(abaplint.Expressions.FieldChain);
|
|
23
23
|
if (chain) {
|
|
24
|
-
const code = new field_chain_1.FieldChainTranspiler(
|
|
24
|
+
const code = new field_chain_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
|
|
25
25
|
ret += `" + abap.expandDynamic(${code}, (name) => {try { return eval(name);} catch {}}) + "`;
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
@@ -6,5 +6,6 @@ export declare class SelectTranspiler implements IStatementTranspiler {
|
|
|
6
6
|
transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal, targetOverride?: string): Chunk;
|
|
7
7
|
private findTable;
|
|
8
8
|
private dynamicSelectList;
|
|
9
|
+
private dynamicSQLClause;
|
|
9
10
|
private isWhereExpression;
|
|
10
11
|
}
|
|
@@ -76,6 +76,8 @@ class SelectTranspiler {
|
|
|
76
76
|
select += new expressions_1.SQLOrderByTranspiler().transpile(orderBy, traversal).getCode();
|
|
77
77
|
}
|
|
78
78
|
const fieldListDynamics = new Set(fieldList.findAllExpressionsRecursive(abaplint.Expressions.Dynamic));
|
|
79
|
+
const groupByDynamics = new Set(groupBy?.findAllExpressionsRecursive(abaplint.Expressions.Dynamic) || []);
|
|
80
|
+
const orderByDynamics = new Set(orderBy?.findAllExpressionsRecursive(abaplint.Expressions.Dynamic) || []);
|
|
79
81
|
for (const d of node.findAllExpressionsRecursive(abaplint.Expressions.Dynamic)) {
|
|
80
82
|
const chain = d.findFirstExpression(abaplint.Expressions.FieldChain);
|
|
81
83
|
if (chain) {
|
|
@@ -84,6 +86,14 @@ class SelectTranspiler {
|
|
|
84
86
|
const code = new expressions_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
|
|
85
87
|
select = select.replace(search, `" + ${this.dynamicSelectList(code)} + "`);
|
|
86
88
|
}
|
|
89
|
+
else if (groupByDynamics.has(d)) {
|
|
90
|
+
const code = new expressions_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
|
|
91
|
+
select = select.replace("GROUP BY " + search, `" + ${this.dynamicSQLClause("GROUP BY", code)} + "`);
|
|
92
|
+
}
|
|
93
|
+
else if (orderByDynamics.has(d)) {
|
|
94
|
+
const code = new expressions_1.FieldChainTranspiler(false).transpile(chain, traversal).getCode();
|
|
95
|
+
select = select.replace("ORDER BY " + search, `" + ${this.dynamicSQLClause("ORDER BY", code)} + "`);
|
|
96
|
+
}
|
|
87
97
|
else {
|
|
88
98
|
const code = new expressions_1.FieldChainTranspiler(true).transpile(chain, traversal).getCode();
|
|
89
99
|
select = select.replace(search, `" + ${code} + "`);
|
|
@@ -154,6 +164,11 @@ class SelectTranspiler {
|
|
|
154
164
|
+ ` ? (${code}.array().length === 0 ? "*" : ${code}.array().map(row => row.get()).join(", "))`
|
|
155
165
|
+ ` : ${code}.get())`;
|
|
156
166
|
}
|
|
167
|
+
dynamicSQLClause(keyword, code) {
|
|
168
|
+
return `(${code} instanceof abap.types.Table || ${code} instanceof abap.types.HashedTable`
|
|
169
|
+
+ ` ? (${code}.array().length === 0 ? "" : "${keyword} " + ${code}.array().map(row => row.get()).join(" "))`
|
|
170
|
+
+ ` : "${keyword} " + ${code}.get())`;
|
|
171
|
+
}
|
|
157
172
|
isWhereExpression(node, expression) {
|
|
158
173
|
// check if previous token before sqlCond is "WHERE". It could also be "ON" in case of join condition
|
|
159
174
|
let prevToken;
|