@abaplint/core 2.119.36 → 2.119.38

package/build/abaplint.d.ts

@@ -298,8 +298,7 @@ declare class AssignSource extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
-declare class AssociationName extends Expression {
-    getRunnable(): IStatementRunnable;
+declare class AssociationName extends Token {
 }
 
 declare class At implements IStructure {
@@ -2118,6 +2117,10 @@ declare class EmailTemplate extends AbstractObject {
     getDescription(): string | undefined;
 }
 
+declare class EMLEntityPath extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 export declare class Empty implements IStatement {
     getMatcher(): IStatementRunnable;
 }
@@ -2409,7 +2412,7 @@ declare namespace Expressions {
         ArrowOrDash,
         Arrow,
         AssignSource,
-        AssociationName,
+        EMLEntityPath,
         AttributeChain,
         AttributeName,
         BehaviorDefinitionName,
@@ -2547,6 +2550,11 @@ declare namespace Expressions {
         ReduceNext,
         ReportName,
         SelectCTE,
+        SQLCTEAssociations,
+        SQLCTEHierarchy,
+        SQLHierarchySource,
+        SQLHierarchyAccessor,
+        SQLHierarchyAggregate,
         Select_3 as Select,
         SimpleFieldChain,
         SimpleFieldChain2,
@@ -2561,6 +2569,9 @@ declare namespace Expressions {
         SourceField,
         Source,
         SQLAggregation,
+        SQLAssociationEntry,
+        SQLAssociationsList,
+        SQLPathSegment,
         SQLAliasField,
         SQLArithmeticOperator,
         SQLArithmetics,
@@ -2598,7 +2609,10 @@ declare namespace Expressions {
         SQLPackageSize,
         SQLOrderBy,
         SQLOver,
-        SQLPath,
+        SQLPathCardinality,
+        SQLPathForColumn,
+        SQLPathForEntity,
+        SQLPathJoinType,
         SQLPrivilegedAccess,
         SQLSetOp,
         SQLSetOpGroup,
@@ -6374,6 +6388,14 @@ declare class SQLAsName extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLAssociationEntry extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLAssociationsList extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLBypassingBuffer extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -6402,6 +6424,14 @@ declare class SQLCond extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLCTEAssociations extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLCTEHierarchy extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLField extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -6462,6 +6492,18 @@ declare class SQLHaving extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLHierarchyAccessor extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLHierarchyAggregate extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLHierarchySource extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLHints extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -6506,7 +6548,25 @@ declare class SQLPackageSize extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
-declare class SQLPath extends Expression {
+declare class SQLPathCardinality extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLPathForColumn extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLPathForEntity extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLPathJoinType extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class SQLPathSegment extends Expression {
+    private readonly nws;
+    constructor(nws?: boolean);
     getRunnable(): IStatementRunnable;
 }
 
@@ -7402,6 +7462,7 @@ declare namespace Tokens {
         Colon,
         Comment_2 as Comment,
         Identifier_2 as Identifier,
+        AssociationName,
         Pragma,
         Punctuation
     }

package/build/src/abap/1_lexer/lexer.js

@@ -203,6 +203,15 @@ class Lexer {
                     }
                 }
             }
+            if (tok === undefined && this.m === ModeNormal && s.charAt(0) === "\\") {
+                const adj = this.stream.nextChar() === "" ? 1 : 0;
+                const prevOffset = this.stream.getOffset() - s.length - adj;
+                const prevChar = prevOffset >= 0 ? this.stream.getRaw().substr(prevOffset, 1) : "";
+                const whiteBeforeBackslash = prevChar === " " || prevChar === "\n" || prevChar === "\t" || prevChar === ":";
+                if (!whiteBeforeBackslash) {
+                    tok = new tokens_1.AssociationName(pos, s);
+                }
+            }
             if (tok === undefined) {
                 tok = new tokens_1.Identifier(pos, s);
             }
@@ -224,6 +233,7 @@ class Lexer {
         splits[")"] = true;
         splits["["] = true;
         splits["]"] = true;
+        splits["\\"] = true;
         splits["\t"] = true;
         splits["\n"] = true;
         const bufs = {};

package/build/src/abap/1_lexer/tokens/association_name.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssociationName = void 0;
+const abstract_token_1 = require("./abstract_token");
+class AssociationName extends abstract_token_1.AbstractToken {
+}
+exports.AssociationName = AssociationName;
+//# sourceMappingURL=association_name.js.map

package/build/src/abap/1_lexer/tokens/index.js

@@ -58,6 +58,7 @@ __exportStar(require("./string_template_middle"), exports);
 __exportStar(require("./colon"), exports);
 __exportStar(require("./comment"), exports);
 __exportStar(require("./identifier"), exports);
+__exportStar(require("./association_name"), exports);
 __exportStar(require("./pragma"), exports);
 __exportStar(require("./punctuation"), exports);
 //# sourceMappingURL=index.js.map

package/build/src/abap/2_statements/_select_reclassify.js

@@ -45,11 +45,17 @@ function containsAggregation(children) {
             continue;
         }
         if (child.get() instanceof Expressions.SQLAggregation) {
-            return true;
+            if (child.findDirectExpression(Expressions.SQLOver) === undefined) {
+                return true;
+            }
+            continue;
         }
         if (child.get() instanceof Expressions.SQLSetOpGroup) {
             continue;
         }
+        if (child.get() instanceof Expressions.SQLFrom) {
+            continue;
+        }
         if (containsAggregation(child.getChildren())) {
             return true;
         }

package/build/src/abap/2_statements/expressions/eml_entity_path.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EMLEntityPath = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+class EMLEntityPath extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.plusPrio)((0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.AssociationName), (0, combi_1.regex)(/^\\[\w]+$/)));
+    }
+}
+exports.EMLEntityPath = EMLEntityPath;
+//# sourceMappingURL=eml_entity_path.js.map

package/build/src/abap/2_statements/expressions/entity_association.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityAssociation = void 0;
 const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
 class EntityAssociation extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^[\/\w]+(\\_|\\\\)[\/\_\w\\~]+$/);
+        return (0, combi_1.seq)((0, combi_1.regex)(/^[\/\w]+$/), (0, combi_1.plusPrio)((0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.AssociationName), (0, combi_1.regex)(/^\\[\w]+$/))));
     }
 }
 exports.EntityAssociation = EntityAssociation;

package/build/src/abap/2_statements/expressions/index.js

@@ -21,7 +21,7 @@ __exportStar(require("./arith_operator"), exports);
 __exportStar(require("./arrow_or_dash"), exports);
 __exportStar(require("./arrow"), exports);
 __exportStar(require("./assign_source"), exports);
-__exportStar(require("./association_name"), exports);
+__exportStar(require("./eml_entity_path"), exports);
 __exportStar(require("./attribute_chain"), exports);
 __exportStar(require("./attribute_name"), exports);
 __exportStar(require("./behavior_definition_name"), exports);
@@ -160,6 +160,11 @@ __exportStar(require("./reduce_body"), exports);
 __exportStar(require("./reduce_next"), exports);
 __exportStar(require("./report_name"), exports);
 __exportStar(require("./select_cte"), exports);
+__exportStar(require("./sql_cte_associations"), exports);
+__exportStar(require("./sql_cte_hierarchy"), exports);
+__exportStar(require("./sql_hierarchy_source"), exports);
+__exportStar(require("./sql_hierarchy_accessor"), exports);
+__exportStar(require("./sql_hierarchy_aggregate"), exports);
 __exportStar(require("./select"), exports);
 __exportStar(require("./simple_field_chain"), exports);
 __exportStar(require("./simple_field_chain2"), exports);
@@ -174,6 +179,9 @@ __exportStar(require("./source_field_symbol"), exports);
 __exportStar(require("./source_field"), exports);
 __exportStar(require("./source"), exports);
 __exportStar(require("./sql_aggregation"), exports);
+__exportStar(require("./sql_association_entry"), exports);
+__exportStar(require("./sql_associations_list"), exports);
+__exportStar(require("./sql_path_segment"), exports);
 __exportStar(require("./sql_alias_field"), exports);
 __exportStar(require("./sql_arithmetic_operator"), exports);
 __exportStar(require("./sql_arithmetics"), exports);
@@ -212,7 +220,10 @@ __exportStar(require("./sql_package_size"), exports);
 __exportStar(require("./sql_order_by"), exports);
 __exportStar(require("./sql_over"), exports);
 __exportStar(require("./sql_over"), exports);
-__exportStar(require("./sql_path"), exports);
+__exportStar(require("./sql_path_cardinality"), exports);
+__exportStar(require("./sql_path_for_column"), exports);
+__exportStar(require("./sql_path_for_entity"), exports);
+__exportStar(require("./sql_path_join_type"), exports);
 __exportStar(require("./sql_privileged_access"), exports);
 __exportStar(require("./sql_set_op"), exports);
 __exportStar(require("./sql_set_op_group"), exports);

package/build/src/abap/2_statements/expressions/sql_association_entry.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLAssociationEntry = void 0;
+const combi_1 = require("../combi");
+const sql_as_name_1 = require("./sql_as_name");
+const sql_path_for_entity_1 = require("./sql_path_for_entity");
+const with_name_1 = require("./with_name");
+const database_table_1 = require("./database_table");
+const version_1 = require("../../../version");
+class SQLAssociationEntry extends combi_1.Expression {
+    getRunnable() {
+        const alias = (0, combi_1.seq)("AS", sql_as_name_1.SQLAsName);
+        const redirected = (0, combi_1.seq)("REDIRECTED TO", with_name_1.WithName, "VIA", database_table_1.DatabaseTable);
+        return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)(new sql_path_for_entity_1.SQLPathForEntity(), (0, combi_1.optPrio)(alias), (0, combi_1.optPrio)(redirected)));
+    }
+}
+exports.SQLAssociationEntry = SQLAssociationEntry;
+//# sourceMappingURL=sql_association_entry.js.map

package/build/src/abap/2_statements/expressions/sql_associations_list.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLAssociationsList = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+const sql_association_entry_1 = require("./sql_association_entry");
+const version_1 = require("../../../version");
+class SQLAssociationsList extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), new sql_association_entry_1.SQLAssociationEntry(), (0, combi_1.star)((0, combi_1.seq)(",", new sql_association_entry_1.SQLAssociationEntry())), (0, combi_1.tok)(tokens_1.WParenRightW)));
+    }
+}
+exports.SQLAssociationsList = SQLAssociationsList;
+//# sourceMappingURL=sql_associations_list.js.map

package/build/src/abap/2_statements/expressions/sql_case.js

@@ -12,7 +12,7 @@ const sql_source_1 = require("./sql_source");
 class SQLCase extends combi_1.Expression {
     getRunnable() {
         const abap = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2);
-        const field = (0, combi_1.altPrio)(_1.SQLAggregation, SQLCase, _1.SQLFunction, _1.SQLPath, sql_field_name_1.SQLFieldName, constant_1.Constant);
+        const field = (0, combi_1.altPrio)(_1.SQLAggregation, SQLCase, _1.SQLFunction, _1.SQLPathForColumn, sql_field_name_1.SQLFieldName, constant_1.Constant);
         const sub = (0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW)));
         const source = (0, combi_1.altPrio)(SQLCase, _1.SQLAggregation, _1.SQLFunction, sql_field_name_1.SQLFieldName, sql_source_1.SQLSource, constant_1.Constant);
         const parenSource = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), source, (0, combi_1.tok)(tokens_1.WParenRightW));

package/build/src/abap/2_statements/expressions/sql_cds_parameters.js

@@ -8,7 +8,7 @@ const field_chain_1 = require("./field_chain");
 class SQLCDSParameters extends combi_1.Expression {
     getRunnable() {
         const param = (0, combi_1.seq)(_1.Field, "=", (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), field_chain_1.FieldChain), _1.Constant));
-        return (0, combi_1.seq)("(", param, (0, combi_1.starPrio)((0, combi_1.seq)(",", param)), ")");
+        return (0, combi_1.seq)((0, combi_1.alt)((0, combi_1.tok)(tokens_1.ParenLeft), (0, combi_1.tok)(tokens_1.ParenLeftW)), param, (0, combi_1.starPrio)((0, combi_1.seq)(",", param)), (0, combi_1.alt)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRight)));
     }
 }
 exports.SQLCDSParameters = SQLCDSParameters;

package/build/src/abap/2_statements/expressions/sql_compare.js

@@ -20,7 +20,9 @@ class SQLCompare extends combi_1.Expression {
         const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)), version_1.Version.OpenABAP);
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.SimpleSource3, paren)), version_1.Version.OpenABAP);
-        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLCase, _1.SQLAggregation, _1.SQLFunction, _1.ConstantString, (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLPath, _1.SQLFieldName), (0, combi_1.optPrio)(arith)), at), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, _1.SQLCase, _1.SQLAggregation, _1.SQLFunction, (0, combi_1.seq)(source, (0, combi_1.optPrio)(arith)))), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
+        const lhs = (0, combi_1.altPrio)(_1.SQLCase, _1.SQLAggregation, _1.SQLFunction, _1.ConstantString, (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLPathForColumn, _1.SQLFieldName), (0, combi_1.optPrio)(arith)), at);
+        const rhs = (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, _1.SQLCase, _1.SQLAggregation, _1.SQLFunction, (0, combi_1.seq)(source, (0, combi_1.optPrio)(arith)))), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul);
+        const rett = (0, combi_1.seq)(lhs, rhs);
         const exists = (0, combi_1.seq)("EXISTS", (0, combi_1.altPrio)(subSelect, simpleSubSelect));
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }

package/build/src/abap/2_statements/expressions/sql_cte_associations.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLCTEAssociations = void 0;
+const combi_1 = require("../combi");
+const sql_associations_list_1 = require("./sql_associations_list");
+const dynamic_1 = require("./dynamic");
+const version_1 = require("../../../version");
+class SQLCTEAssociations extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("ASSOCIATIONS", (0, combi_1.altPrio)(new sql_associations_list_1.SQLAssociationsList(), dynamic_1.Dynamic)));
+    }
+}
+exports.SQLCTEAssociations = SQLCTEAssociations;
+//# sourceMappingURL=sql_cte_associations.js.map

package/build/src/abap/2_statements/expressions/sql_cte_hierarchy.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLCTEHierarchy = void 0;
+const combi_1 = require("../combi");
+const sql_as_name_1 = require("./sql_as_name");
+const sql_cte_associations_1 = require("./sql_cte_associations");
+const version_1 = require("../../../version");
+class SQLCTEHierarchy extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("HIERARCHY", sql_as_name_1.SQLAsName, (0, combi_1.optPrio)((0, combi_1.seq)("WITH", sql_cte_associations_1.SQLCTEAssociations))));
+    }
+}
+exports.SQLCTEHierarchy = SQLCTEHierarchy;
+//# sourceMappingURL=sql_cte_hierarchy.js.map

package/build/src/abap/2_statements/expressions/sql_field.js

@@ -6,14 +6,14 @@ const _1 = require(".");
 const version_1 = require("../../../version");
 const tokens_1 = require("../../1_lexer/tokens");
 const sql_function_1 = require("./sql_function");
-const sql_path_1 = require("./sql_path");
+const sql_path_for_column_1 = require("./sql_path_for_column");
 class SQLField extends combi_1.Expression {
     getRunnable() {
         const atParen = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.SimpleFieldChain2, (0, combi_1.tok)(tokens_1.WParenRightW));
         const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.SimpleFieldChain2, atParen)), version_1.Version.OpenABAP);
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
         const parenFieldName = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.SQLFieldName, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.WParenRight)));
-        const fieldNoAgg = (0, combi_1.altPrio)(_1.SQLCase, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant, parenFieldName);
+        const fieldNoAgg = (0, combi_1.altPrio)(_1.SQLCase, sql_function_1.SQLFunction, sql_path_for_column_1.SQLPathForColumn, _1.SQLFieldName, abap, _1.Constant, parenFieldName);
         const field = (0, combi_1.altPrio)(_1.SQLAggregation, fieldNoAgg);
         const parenField = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), field, (0, combi_1.tok)(tokens_1.WParenRightW));
         const parenFieldNoAgg = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), fieldNoAgg, (0, combi_1.tok)(tokens_1.WParenRightW));
@@ -24,7 +24,6 @@ class SQLField extends combi_1.Expression {
         const arith = (0, combi_1.altPrio)(arithWithAgg, arithNoAgg);
         const arithSequence = (0, combi_1.seq)((0, combi_1.optPrio)("-"), field, (0, combi_1.optPrio)(arith));
         const parenArithSequence = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.optPrio)("-"), arithSequence, (0, combi_1.tok)(tokens_1.WParenRightW));
-        // allows (a-b)*(c-d) — paren groups as operands, defined after parenArithSequence
         const subExtWithAgg = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.altPrio)(parenArithSequence, parenField, field)));
         const subExtNoAgg = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.altPrio)(parenArithSequence, parenFieldNoAgg, fieldNoAgg)));
         const arithExt = (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v754, subExtWithAgg), (0, combi_1.ver)(version_1.Version.v740sp05, subExtNoAgg));

package/build/src/abap/2_statements/expressions/sql_field_list_loop.js

@@ -4,7 +4,7 @@ exports.SQLFieldListLoop = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const version_1 = require("../../../version");
-const sql_path_1 = require("./sql_path");
+const sql_path_for_column_1 = require("./sql_path_for_column");
 const tokens_1 = require("../../1_lexer/tokens");
 // loop must include one field from the database table
 class SQLFieldListLoop extends combi_1.Expression {
@@ -13,7 +13,7 @@ class SQLFieldListLoop extends combi_1.Expression {
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
         const someField = (0, combi_1.seq)(_1.SQLField, comma);
         const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2), version_1.Version.OpenABAP);
-        const fieldList = (0, combi_1.seq)((0, combi_1.star)(someField), (0, combi_1.alt)(_1.SQLFieldName, abap, sql_path_1.SQLPath, _1.Constant), (0, combi_1.optPrio)(as), comma, (0, combi_1.star)(someField));
+        const fieldList = (0, combi_1.seq)((0, combi_1.star)(someField), (0, combi_1.alt)(_1.SQLFieldName, abap, sql_path_for_column_1.SQLPathForColumn, _1.Constant), (0, combi_1.optPrio)(as), comma, (0, combi_1.star)(someField));
         const fields = (0, combi_1.alt)("*", _1.Dynamic, fieldList);
         return fields;
     }

package/build/src/abap/2_statements/expressions/sql_field_list_loop_greedy.js

@@ -4,14 +4,14 @@ exports.SQLFieldListLoopGreedy = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const version_1 = require("../../../version");
-const sql_path_1 = require("./sql_path");
+const sql_path_for_column_1 = require("./sql_path_for_column");
 const tokens_1 = require("../../1_lexer/tokens");
 class SQLFieldListLoopGreedy extends combi_1.Expression {
     getRunnable() {
         const comma = (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp05, ",", version_1.Version.OpenABAP));
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
         const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.SimpleFieldChain2), version_1.Version.OpenABAP);
-        const entry = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLField, abap, sql_path_1.SQLPath, _1.SQLFieldName, _1.Constant), (0, combi_1.optPrio)(as), comma);
+        const entry = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLField, abap, sql_path_for_column_1.SQLPathForColumn, _1.SQLFieldName, _1.Constant), (0, combi_1.optPrio)(as), comma);
         const fieldList = (0, combi_1.plusPrio)(entry);
         return (0, combi_1.altPrio)("*", _1.Dynamic, fieldList);
     }

package/build/src/abap/2_statements/expressions/sql_from_source.js

@@ -6,13 +6,17 @@ const _1 = require(".");
 const version_1 = require("../../../version");
 const tokens_1 = require("../../1_lexer/tokens");
 const with_name_1 = require("./with_name");
+const sql_path_for_entity_1 = require("./sql_path_for_entity");
+const sql_hierarchy_source_1 = require("./sql_hierarchy_source");
+const sql_hierarchy_accessor_1 = require("./sql_hierarchy_accessor");
+const sql_hierarchy_aggregate_1 = require("./sql_hierarchy_aggregate");
 class SQLFromSource extends combi_1.Expression {
     getRunnable() {
         // https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-US/abennews-752-open_sql.htm#!ABAP_MODIFICATION_1@1@
         const tab = (0, combi_1.ver)(version_1.Version.v752, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.FieldChain), version_1.Version.OpenABAP);
         const aas = (0, combi_1.seq)("AS", _1.SQLAsName);
         const privileged = (0, combi_1.ver)(version_1.Version.v752, (0, combi_1.seq)("WITH", _1.SQLPrivilegedAccess));
-        return (0, combi_1.seq)((0, combi_1.altPrio)(with_name_1.WithName, (0, combi_1.seq)(_1.DatabaseTable, (0, combi_1.optPrio)(_1.SQLCDSParameters)), tab), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(aas));
+        return (0, combi_1.seq)((0, combi_1.altPrio)(new sql_hierarchy_aggregate_1.SQLHierarchyAggregate(), new sql_hierarchy_accessor_1.SQLHierarchyAccessor(), new sql_hierarchy_source_1.SQLHierarchySource(), (0, combi_1.seq)(with_name_1.WithName, (0, combi_1.optPrio)(new sql_path_for_entity_1.SQLPathForEntity())), (0, combi_1.seq)(_1.DatabaseTable, (0, combi_1.optPrio)(_1.SQLCDSParameters), (0, combi_1.optPrio)(new sql_path_for_entity_1.SQLPathForEntity())), tab), (0, combi_1.optPrio)(privileged), (0, combi_1.optPrio)(aas));
     }
 }
 exports.SQLFromSource = SQLFromSource;

package/build/src/abap/2_statements/expressions/sql_hierarchy_accessor.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLHierarchyAccessor = void 0;
+const combi_1 = require("../combi");
+const version_1 = require("../../../version");
+const tokens_1 = require("../../1_lexer/tokens");
+const _1 = require(".");
+class SQLHierarchyAccessor extends combi_1.Expression {
+    getRunnable() {
+        const distanceTo = (0, combi_1.seq)("TO", _1.SQLSource);
+        const distanceFrom = (0, combi_1.seq)("FROM", _1.SQLSource, (0, combi_1.optPrio)(distanceTo));
+        const distance = (0, combi_1.seq)("DISTANCE", (0, combi_1.altPrio)(distanceFrom, distanceTo));
+        const accessor = (0, combi_1.seq)("SOURCE", _1.DatabaseTable, "START", "WHERE", _1.SQLCond, (0, combi_1.optPrio)(distance));
+        const name = (0, combi_1.altPrio)("HIERARCHY_DESCENDANTS", "HIERARCHY_ANCESTORS", "HIERARCHY_SIBLINGS");
+        return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)(name, (0, combi_1.tok)(tokens_1.ParenLeftW), accessor, (0, combi_1.tok)(tokens_1.WParenRightW)));
+    }
+}
+exports.SQLHierarchyAccessor = SQLHierarchyAccessor;
+//# sourceMappingURL=sql_hierarchy_accessor.js.map

package/build/src/abap/2_statements/expressions/sql_hierarchy_aggregate.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLHierarchyAggregate = void 0;
+const combi_1 = require("../combi");
+const version_1 = require("../../../version");
+const tokens_1 = require("../../1_lexer/tokens");
+const _1 = require(".");
+class SQLHierarchyAggregate extends combi_1.Expression {
+    getRunnable() {
+        const startWhere = (0, combi_1.seq)("START", "WHERE", _1.SQLCond);
+        const join = (0, combi_1.seq)("JOIN", _1.DatabaseTable, "ON", _1.SQLCond);
+        const measureItem = (0, combi_1.seq)(_1.SQLAggregation, "AS", _1.SQLAsName);
+        const measures = (0, combi_1.seq)("MEASURES", measureItem, (0, combi_1.star)((0, combi_1.seq)(",", measureItem)));
+        const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
+        const withEntry = (0, combi_1.altPrio)("SUBTOTAL", "BALANCE", (0, combi_1.seq)("NOT", "MATCHED"), "TOTAL");
+        const aggregate = (0, combi_1.seq)("SOURCE", _1.DatabaseTable, (0, combi_1.optPrio)(startWhere), (0, combi_1.optPrio)(join), measures, (0, combi_1.optPrio)(where), (0, combi_1.optPrio)((0, combi_1.seq)("WITH", withEntry, (0, combi_1.star)((0, combi_1.seq)("WITH", withEntry)))));
+        const name = (0, combi_1.altPrio)("HIERARCHY_DESCENDANTS_AGGREGATE", "HIERARCHY_ANCESTORS_AGGREGATE");
+        return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)(name, (0, combi_1.tok)(tokens_1.ParenLeftW), aggregate, (0, combi_1.tok)(tokens_1.WParenRightW)));
+    }
+}
+exports.SQLHierarchyAggregate = SQLHierarchyAggregate;
+//# sourceMappingURL=sql_hierarchy_aggregate.js.map

package/build/src/abap/2_statements/expressions/sql_hierarchy_source.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLHierarchySource = void 0;
+const combi_1 = require("../combi");
+const version_1 = require("../../../version");
+const tokens_1 = require("../../1_lexer/tokens");
+const _1 = require(".");
+class SQLHierarchySource extends combi_1.Expression {
+    getRunnable() {
+        const orderDir = (0, combi_1.optPrio)((0, combi_1.altPrio)("ASCENDING", "DESCENDING"));
+        const orderFieldName = (0, combi_1.regex)(/^(?!(?:DEPTH|MULTIPLE|ORPHAN|CACHE|CYCLE|LOAD|GENERATE|RETAIN|DEPTH)$)(\/\w+\/)?(\*?\w+~(\/\w+\/)?(\w+|\*)|\w+)$/i);
+        const orderField = (0, combi_1.seq)(orderFieldName, orderDir, (0, combi_1.optPrio)(","));
+        const siblingsOrderBy = (0, combi_1.seq)("SIBLINGS", "ORDER", "BY", (0, combi_1.altPrio)("PRIMARY KEY", _1.Dynamic, (0, combi_1.seq)(orderField, (0, combi_1.starPrio)(orderField))));
+        const cache = (0, combi_1.seq)("CACHE", (0, combi_1.altPrio)("FORCE", "OFF", "ON"));
+        const retainNulls = (0, combi_1.seq)("RETAIN", "NULLS", _1.SQLSource);
+        const cycle = (0, combi_1.seq)("CYCLE", (0, combi_1.altPrio)("BREAKUP", "ERROR"));
+        const multipleParents = (0, combi_1.seq)("MULTIPLE", "PARENTS", (0, combi_1.altPrio)((0, combi_1.seq)("NOT", "ALLOWED"), (0, combi_1.seq)("LEAVES", "ONLY"), "ALLOWED"));
+        const orphan = (0, combi_1.seq)("ORPHAN", (0, combi_1.altPrio)("IGNORE", "ERROR", "ROOT"));
+        const depth = (0, combi_1.seq)("DEPTH", _1.SQLSource);
+        const load = (0, combi_1.seq)("LOAD", (0, combi_1.altPrio)("INCREMENTAL", "BULK", _1.SQLSource));
+        const generateSpantree = (0, combi_1.seq)("GENERATE", "SPANTREE");
+        const startWhere = (0, combi_1.seq)("START", "WHERE", _1.SQLCond);
+        const period = (0, combi_1.seq)("PERIOD", "FROM", _1.SQLFieldName, "TO", _1.SQLFieldName);
+        const valid = (0, combi_1.seq)("VALID", "FROM", _1.SQLSource, "TO", _1.SQLSource);
+        const association = (0, combi_1.seq)("CHILD", "TO", "PARENT", "ASSOCIATION", _1.SQLFieldName);
+        const sourceTable = (0, combi_1.seq)((0, combi_1.altPrio)(_1.WithName, _1.DatabaseTable), (0, combi_1.optPrio)((0, combi_1.seq)("AS", _1.SQLAsName)));
+        const levelColumn = _1.SQLFieldName;
+        const levels = (0, combi_1.seq)("LEVELS", (0, combi_1.tok)(tokens_1.WParenLeftW), levelColumn, (0, combi_1.star)((0, combi_1.seq)(",", levelColumn)), (0, combi_1.tok)(tokens_1.WParenRightW));
+        const leveledGenerator = (0, combi_1.seq)(levels, (0, combi_1.optPrio)(siblingsOrderBy), (0, combi_1.optPrio)(cache), (0, combi_1.optPrio)(retainNulls));
+        const generator = (0, combi_1.seq)(association, (0, combi_1.optPrio)((0, combi_1.seq)(period, valid)), startWhere, (0, combi_1.optPrio)(siblingsOrderBy), (0, combi_1.optPrio)(depth), (0, combi_1.optPrio)(multipleParents), (0, combi_1.optPrio)(orphan), (0, combi_1.optPrio)(cache), (0, combi_1.optPrio)(cycle), (0, combi_1.optPrio)(load), (0, combi_1.optPrio)(generateSpantree));
+        return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("HIERARCHY", (0, combi_1.tok)(tokens_1.ParenLeftW), "SOURCE", sourceTable, (0, combi_1.altPrio)(leveledGenerator, generator), (0, combi_1.tok)(tokens_1.WParenRightW)));
+    }
+}
+exports.SQLHierarchySource = SQLHierarchySource;
+//# sourceMappingURL=sql_hierarchy_source.js.map

package/build/src/abap/2_statements/expressions/sql_path_cardinality.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLPathCardinality = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+class SQLPathCardinality extends combi_1.Expression {
+    getRunnable() {
+        const exact = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.regex)(/^\d+$/), (0, combi_1.tok)(tokens_1.WParenRightW));
+        const many = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), "*", (0, combi_1.tok)(tokens_1.WParenRightW));
+        return (0, combi_1.altPrio)(exact, many);
+    }
+}
+exports.SQLPathCardinality = SQLPathCardinality;
+//# sourceMappingURL=sql_path_cardinality.js.map

package/build/src/abap/2_statements/expressions/sql_path_for_column.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLPathForColumn = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+const sql_path_segment_1 = require("./sql_path_segment");
+const field_1 = require("./field");
+const version_1 = require("../../../version");
+class SQLPathForColumn extends combi_1.Expression {
+    getRunnable() {
+        const tablePrefix = (0, combi_1.regex)(/^(\/\w+\/)?\w+~$/);
+        const withPrefix = (0, combi_1.seq)(tablePrefix, (0, combi_1.plus)(new sql_path_segment_1.SQLPathSegment(true)), (0, combi_1.tok)(tokens_1.Dash), field_1.Field);
+        const standalone = (0, combi_1.seq)((0, combi_1.plus)(new sql_path_segment_1.SQLPathSegment()), (0, combi_1.tok)(tokens_1.Dash), field_1.Field);
+        return (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.altPrio)(withPrefix, standalone));
+    }
+}
+exports.SQLPathForColumn = SQLPathForColumn;
+//# sourceMappingURL=sql_path_for_column.js.map

package/build/src/abap/2_statements/expressions/sql_path_for_entity.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLPathForEntity = void 0;
+const combi_1 = require("../combi");
+const sql_path_segment_1 = require("./sql_path_segment");
+const database_table_1 = require("./database_table");
+const version_1 = require("../../../version");
+class SQLPathForEntity extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.optPrio)(database_table_1.DatabaseTable), (0, combi_1.plus)(new sql_path_segment_1.SQLPathSegment())));
+    }
+}
+exports.SQLPathForEntity = SQLPathForEntity;
+//# sourceMappingURL=sql_path_for_entity.js.map

package/build/src/abap/2_statements/expressions/sql_path_join_type.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLPathJoinType = void 0;
+const combi_1 = require("../combi");
+class SQLPathJoinType extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.altPrio)("EXACT ONE TO ONE", "ONE TO ONE", "MANY TO MANY", "MANY TO ONE", "ONE TO MANY", "LEFT OUTER", "RIGHT OUTER", "INNER");
+    }
+}
+exports.SQLPathJoinType = SQLPathJoinType;
+//# sourceMappingURL=sql_path_join_type.js.map

package/build/src/abap/2_statements/expressions/sql_path_segment.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLPathSegment = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+const sql_cds_parameters_1 = require("./sql_cds_parameters");
+const sql_cond_1 = require("./sql_cond");
+const sql_path_cardinality_1 = require("./sql_path_cardinality");
+const sql_path_join_type_1 = require("./sql_path_join_type");
+const version_1 = require("../../../version");
+class SQLPathSegment extends combi_1.Expression {
+    constructor(nws = false) {
+        super();
+        this.nws = nws;
+    }
+    getRunnable() {
+        const filter = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.BracketLeftW), (0, combi_1.optPrio)(sql_path_cardinality_1.SQLPathCardinality), (0, combi_1.optPrio)(sql_path_join_type_1.SQLPathJoinType), (0, combi_1.optPrio)((0, combi_1.seq)((0, combi_1.optPrio)("WHERE"), sql_cond_1.SQLCond)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WBracketRightW), (0, combi_1.tok)(tokens_1.WBracketRight))));
+        const params = (0, combi_1.ver)(version_1.Version.v751, sql_cds_parameters_1.SQLCDSParameters);
+        const name = this.nws
+            ? (0, combi_1.tok)(tokens_1.AssociationName)
+            : (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.AssociationName), (0, combi_1.regex)(/^\\[\w]+$/));
+        return (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)(name, (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.seq)(params, (0, combi_1.optPrio)(filter)), filter))));
+    }
+}
+exports.SQLPathSegment = SQLPathSegment;
+//# sourceMappingURL=sql_path_segment.js.map

package/build/src/abap/2_statements/statements/commit_entities.js

@@ -10,7 +10,7 @@ class CommitEntities {
         const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
         const responses = (0, combi_1.seq)("RESPONSES", failed, reported);
         const s = (0, combi_1.seq)("COMMIT ENTITIES", (0, combi_1.optPrio)("IN SIMULATION MODE"), (0, combi_1.opt)(responses), (0, combi_1.opt)((0, combi_1.seq)("RESPONSE OF", expressions_1.NamespaceSimpleName, (0, combi_1.per)(failed, reported))));
-        return (0, combi_1.ver)(version_1.Version.v754, s);
+        return (0, combi_1.ver)(version_1.Version.v754, s, version_1.Version.OpenABAP);
     }
 }
 exports.CommitEntities = CommitEntities;

package/build/src/abap/2_statements/statements/create_data.js

@@ -15,7 +15,7 @@ class CreateData {
         const initial = (0, combi_1.seq)("INITIAL SIZE", expressions_1.Source);
         const decimals = (0, combi_1.seq)("DECIMALS", expressions_1.Source);
         const uniq = (0, combi_1.alt)("UNIQUE", "NON-UNIQUE");
-        const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY");
+        const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY", version_1.Version.OpenABAP);
         const def = (0, combi_1.seq)((0, combi_1.opt)(uniq), (0, combi_1.alt)("DEFAULT KEY", emptyKey));
         const kdef = (0, combi_1.seq)((0, combi_1.opt)(uniq), "KEY", (0, combi_1.alt)((0, combi_1.plus)(expressions_1.Field), expressions_1.Dynamic));
         const key = (0, combi_1.seq)("WITH", (0, combi_1.alt)(def, kdef));

package/build/src/abap/2_statements/statements/end_test_seam.js

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const version_1 = require("../../../version");
 class EndTestSeam {
     getMatcher() {
-        return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.str)("END-TEST-SEAM"));
+        return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.str)("END-TEST-SEAM"), version_1.Version.OpenABAP);
     }
 }
 exports.EndTestSeam = EndTestSeam;

package/build/src/abap/2_statements/statements/get_permissions.js

@@ -9,7 +9,7 @@ class GetPermissions {
         const type = (0, combi_1.altPrio)("GLOBAL AUTHORIZATION", "INSTANCE");
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const s = (0, combi_1.seq)("GET PERMISSIONS ONLY", type, "ENTITY", expressions_1.SimpleName, (0, combi_1.optPrio)(from), "REQUEST", expressions_1.Source, "RESULT", expressions_1.Target, "FAILED", expressions_1.Target, "REPORTED", expressions_1.Target);
-        return (0, combi_1.ver)(version_1.Version.v754, s);
+        return (0, combi_1.ver)(version_1.Version.v754, s, version_1.Version.OpenABAP);
     }
 }
 exports.GetPermissions = GetPermissions;

package/build/src/abap/2_statements/statements/modify_entities.js

@@ -8,7 +8,7 @@ class ModifyEntities {
     getMatcher() {
         const withh = (0, combi_1.seq)("WITH", expressions_1.Source);
         const fieldsWith = (0, combi_1.seq)("FIELDS (", (0, combi_1.plus)(expressions_1.SimpleName), ")", withh);
-        const by = (0, combi_1.seq)("BY", expressions_1.AssociationName);
+        const by = (0, combi_1.seq)("BY", expressions_1.EMLEntityPath);
         const relating = (0, combi_1.seq)("RELATING TO", expressions_1.NamespaceSimpleName, "BY", expressions_1.NamespaceSimpleName);
         const execute = (0, combi_1.seq)("EXECUTE", expressions_1.NamespaceSimpleName, "FROM", expressions_1.Source);
         const create = (0, combi_1.seq)("CREATE", (0, combi_1.opt)(by), "FROM", expressions_1.Source, (0, combi_1.opt)(relating));
@@ -23,9 +23,9 @@ class ModifyEntities {
         const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
         const end = (0, combi_1.optPrio)((0, combi_1.per)(failed, result, mapped, reported));
         const entities = (0, combi_1.seq)((0, combi_1.optPrio)("AUGMENTING"), "ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plusPrio)((0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(operation))));
-        const create2 = (0, combi_1.seq)("CREATE", fieldsWith, (0, combi_1.opt)((0, combi_1.seq)("CREATE BY", expressions_1.AssociationName, fieldsWith)));
-        const create3 = (0, combi_1.seq)("CREATE BY", expressions_1.AssociationName, fieldsWith);
-        const create4 = (0, combi_1.seq)("CREATE FROM", expressions_1.Source, (0, combi_1.plus)((0, combi_1.seq)("CREATE BY", expressions_1.AssociationName, "FROM", expressions_1.Source)));
+        const create2 = (0, combi_1.seq)("CREATE", fieldsWith, (0, combi_1.opt)((0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, fieldsWith)));
+        const create3 = (0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, fieldsWith);
+        const create4 = (0, combi_1.seq)("CREATE FROM", expressions_1.Source, (0, combi_1.plus)((0, combi_1.seq)("CREATE BY", expressions_1.EMLEntityPath, "FROM", expressions_1.Source)));
         const entity = (0, combi_1.seq)("ENTITY", (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.alt)(expressions_1.NamespaceSimpleName, expressions_1.EntityAssociation), (0, combi_1.alt)(execute, create, updateFields, deleteFrom, updateSetFields, updateFrom, create2, create3, create4));
         return (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("MODIFY", (0, combi_1.alt)(entities, entity), end), version_1.Version.OpenABAP);
     }

package/build/src/abap/2_statements/statements/read_entities.js

@@ -13,11 +13,11 @@ class ReadEntities {
         const result = (0, combi_1.seq)("RESULT", expressions_1.Target);
         const failed = (0, combi_1.seq)("FAILED", expressions_1.Target);
         const reported = (0, combi_1.seq)("REPORTED", expressions_1.Target);
-        const foo = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.AssociationName)), (0, combi_1.alt)(fields, from, all), (0, combi_1.optPrio)(result));
+        const foo = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.EMLEntityPath)), (0, combi_1.alt)(fields, from, all), (0, combi_1.optPrio)(result));
         const entity = (0, combi_1.seq)("ENTITY", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(foo));
         const s = (0, combi_1.seq)("ENTITIES OF", expressions_1.NamespaceSimpleName, (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.plus)(entity), (0, combi_1.optPrio)((0, combi_1.seq)("LINK", expressions_1.Target)), (0, combi_1.optPrio)((0, combi_1.per)(failed, reported)));
-        const byall = (0, combi_1.seq)("BY", expressions_1.AssociationName, all);
-        const by = (0, combi_1.seq)("BY", expressions_1.AssociationName, fields);
+        const byall = (0, combi_1.seq)("BY", expressions_1.EMLEntityPath, all);
+        const by = (0, combi_1.seq)("BY", expressions_1.EMLEntityPath, fields);
         const sub = (0, combi_1.seq)((0, combi_1.alt)(all, fields, from, by, byall), result);
         const single = (0, combi_1.seq)("ENTITY", (0, combi_1.opt)("IN LOCAL MODE"), (0, combi_1.alt)(expressions_1.NamespaceSimpleName, expressions_1.EntityAssociation), (0, combi_1.plus)(sub), (0, combi_1.optPrio)(failed), (0, combi_1.optPrio)(reported));
         return (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("READ", (0, combi_1.alt)(s, single)), version_1.Version.OpenABAP);

package/build/src/abap/2_statements/statements/test_seam.js

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
 class TestSeam {
     getMatcher() {
-        return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("TEST-SEAM", expressions_1.TestSeamName));
+        return (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("TEST-SEAM", expressions_1.TestSeamName), version_1.Version.OpenABAP);
     }
 }
 exports.TestSeam = TestSeam;

package/build/src/abap/2_statements/statements/with.js

@@ -7,7 +7,8 @@ const expressions_1 = require("../expressions");
 const tokens_1 = require("../../1_lexer/tokens");
 class With {
     getMatcher() {
-        const cte = (0, combi_1.seq)(expressions_1.WithName, "AS", (0, combi_1.tok)(tokens_1.WParenLeftW), expressions_1.SelectCTE, (0, combi_1.tok)(tokens_1.WParenRightW));
+        const exposing = (0, combi_1.optPrio)((0, combi_1.seq)("WITH", (0, combi_1.altPrio)(new expressions_1.SQLCTEHierarchy(), expressions_1.SQLCTEAssociations)));
+        const cte = (0, combi_1.seq)(expressions_1.WithName, "AS", (0, combi_1.tok)(tokens_1.WParenLeftW), expressions_1.SelectCTE, (0, combi_1.tok)(tokens_1.WParenRightW), exposing);
         return (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("WITH", cte, (0, combi_1.star)((0, combi_1.seq)(",", cte)), expressions_1.Select));
     }
 }

package/build/src/abap/5_syntax/basic_types.js

@@ -480,16 +480,16 @@ class BasicTypes {
             options.primaryKey.type = basic_1.TableAccessType.standard;
             return new Types.TableType(structure, options);
         }
-        else if (typename && (text.startsWith("TYPE TABLE FOR CREATE ")
-            || text.startsWith("TYPE TABLE FOR READ ")
-            || text.startsWith("TYPE TABLE FOR DELETE ")
-            || text.startsWith("TYPE TABLE FOR UPDATE "))) {
+        else if (typename && this.isRAPTableFor(text)) {
             const name = typename.concatTokens();
             const ddlsName = this.getRAPBaseEntityName(name);
             const type = (_d = this.input.scope.getDDIC().lookupDDLS(ddlsName)) === null || _d === void 0 ? void 0 : _d.type;
             if (type) {
                 return new Types.TableType(basic_1.VoidType.get("RAP-TODO"), options);
             }
+            else if (this.isRAPDerivedEntityName(name)) {
+                return Types.VoidType.get(name);
+            }
             else if (this.input.scope.getDDIC().inErrorNamespace(ddlsName)) {
                 return new Types.UnknownType(`DDLS ${ddlsName} not found`);
             }
@@ -501,7 +501,7 @@ class BasicTypes {
         return this.parseType(node, name);
     }
     parseType(node, qualifiedName) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const typeName = node.findFirstExpression(Expressions.TypeName);
         let text = (_a = node.findFirstExpression(Expressions.Type)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (text === undefined) {
@@ -514,7 +514,10 @@ class BasicTypes {
             }
         }
         if (text === undefined) {
-            text = (_d = node.findFirstExpression(Expressions.FormParamType)) === null || _d === void 0 ? void 0 : _d.concatTokens().toUpperCase();
+            text = (_d = node.findFirstExpression(Expressions.TypeStructure)) === null || _d === void 0 ? void 0 : _d.concatTokens().toUpperCase();
+        }
+        if (text === undefined) {
+            text = (_e = node.findFirstExpression(Expressions.FormParamType)) === null || _e === void 0 ? void 0 : _e.concatTokens().toUpperCase();
         }
         if (text === undefined
             && node.get() instanceof Statements.Parameter
@@ -525,8 +528,11 @@ class BasicTypes {
             text = "TYPE";
         }
         let found = undefined;
-        if (text.startsWith("LIKE LINE OF ")) {
-            const name = (_e = node.findFirstExpression(Expressions.FieldChain)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+        if (this.isRAPTypeStructure(text)) {
+            return Types.VoidType.get((_f = node.findFirstExpression(Expressions.TypeStructure)) === null || _f === void 0 ? void 0 : _f.concatTokens());
+        }
+        else if (text.startsWith("LIKE LINE OF ")) {
+            const name = (_g = node.findFirstExpression(Expressions.FieldChain)) === null || _g === void 0 ? void 0 : _g.concatTokens();
             let e = node.findFirstExpression(Expressions.Type);
             if (e === undefined) {
                 e = node.findFirstExpression(Expressions.FormParamType);
@@ -549,7 +555,7 @@ class BasicTypes {
             }
         }
         else if (text.startsWith("LIKE REF TO ")) {
-            const name = (_f = node.findFirstExpression(Expressions.FieldChain)) === null || _f === void 0 ? void 0 : _f.concatTokens();
+            const name = (_h = node.findFirstExpression(Expressions.FieldChain)) === null || _h === void 0 ? void 0 : _h.concatTokens();
             const type = this.resolveLikeName(node.findFirstExpression(Expressions.Type), false);
             if (type === undefined) {
                 return new Types.UnknownType("Type error, could not resolve \"" + name + "\", parseType");
@@ -640,7 +646,7 @@ class BasicTypes {
             }
         }
         if (text.includes(" WITH INDICATORS ")) {
-            const componentName = (_h = (_g = node.findFirstExpression(Expressions.Type)) === null || _g === void 0 ? void 0 : _g.findDirectExpression(Expressions.ComponentName)) === null || _h === void 0 ? void 0 : _h.concatTokens().toUpperCase();
+            const componentName = (_k = (_j = node.findFirstExpression(Expressions.Type)) === null || _j === void 0 ? void 0 : _j.findDirectExpression(Expressions.ComponentName)) === null || _k === void 0 ? void 0 : _k.concatTokens().toUpperCase();
             if (componentName === undefined) {
                 throw new Error("parseType, componentName expected");
             }
@@ -666,12 +672,38 @@ class BasicTypes {
     getRAPBaseEntityName(name) {
         const association = name.indexOf("\\_");
         const path = name.indexOf("\\\\");
-        if (association === -1 && path === -1) {
+        const action = name.indexOf("~");
+        if (association === -1 && path === -1 && action === -1) {
             return name;
         }
-        const splitAt = association === -1 ? path : path === -1 ? association : Math.min(association, path);
+        const candidates = [association, path, action].filter(i => i !== -1);
+        const splitAt = Math.min(...candidates);
         return name.substring(0, splitAt);
     }
+    isRAPDerivedEntityName(name) {
+        return name.includes("\\") || name.includes("~");
+    }
+    isRAPTableFor(text) {
+        return text.startsWith("TYPE TABLE FOR ACTION IMPORT ")
+            || text.startsWith("TYPE TABLE FOR ACTION RESULT ")
+            || text.startsWith("TYPE TABLE FOR CREATE ")
+            || text.startsWith("TYPE TABLE FOR DELETE ")
+            || text.startsWith("TYPE TABLE FOR DETERMINATION ")
+            || text.startsWith("TYPE TABLE FOR EVENT ")
+            || text.startsWith("TYPE TABLE FOR FAILED ")
+            || text.startsWith("TYPE TABLE FOR FAILED EARLY ")
+            || text.startsWith("TYPE TABLE FOR LOCK ")
+            || text.startsWith("TYPE TABLE FOR READ ")
+            || text.startsWith("TYPE TABLE FOR READ IMPORT ")
+            || text.startsWith("TYPE TABLE FOR READ RESULT ")
+            || text.startsWith("TYPE TABLE FOR REPORTED EARLY ")
+            || text.startsWith("TYPE TABLE FOR UPDATE ");
+    }
+    isRAPTypeStructure(text) {
+        return text.startsWith("TYPE STRUCTURE FOR ")
+            || text.startsWith("TYPE RESPONSE FOR ")
+            || text.startsWith("TYPE REQUEST FOR CHANGE ");
+    }
     // todo, rewrite this method
     resolveTypeChain(expr) {
         var _a, _b, _c, _d;

package/build/src/abap/5_syntax/statements/move_corresponding.js

@@ -51,7 +51,9 @@ class MoveCorresponding {
         }
         const sourceType = source_1.Source.runSyntax(s, input);
         const targetType = target_1.Target.runSyntax(t, input);
-        if (input.scope.getVersion() < version_1.Version.v740sp05 && input.scope.getVersion() !== version_1.Version.Cloud) {
+        if (input.scope.getVersion() < version_1.Version.v740sp05
+            && input.scope.getVersion() !== version_1.Version.Cloud
+            && input.scope.getVersion() !== version_1.Version.OpenABAP) {
             if (sourceType instanceof basic_1.TableType && sourceType.isWithHeader() === false) {
                 const message = "MOVE-CORRESPONDING with tables possible from v740sp05";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));

package/build/src/abap/5_syntax/syntax.js

@@ -480,6 +480,10 @@ class SyntaxLogic {
             this.scope.addList(values);
             return true;
         }
+        else if (stru instanceof Structures.TestInjection) {
+            // todo: skipped for now
+            return true;
+        }
         return false;
     }
     updateScopeStatement(node) {

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.36";
+        return "2.119.38";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/dangerous_statement.js

@@ -61,6 +61,8 @@ class DangerousStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.exportDynpro = true;
         /** Finds instances of dynamic SQL: SELECT, UPDATE, DELETE, INSERT, MODIFY */
         this.dynamicSQL = true;
+        /** Ignore dynamic SQL in IF_RAP_QUERY_PROVIDER~SELECT implementations */
+        this.ignoreRAPQueryProvider = true;
     }
 }
 exports.DangerousStatementConf = DangerousStatementConf;
@@ -89,9 +91,19 @@ dynamic SQL can potentially create SQL injection problems`,
         this.conf = conf;
     }
     runParsed(file) {
+        var _a;
         const issues = [];
+        let ignoreDynamicSQL = false;
         for (const statementNode of file.getStatements()) {
             const statement = statementNode.get();
+            if (statement instanceof Statements.MethodImplementation) {
+                const methodName = (_a = statementNode.findFirstExpression(Expressions.MethodName)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+                ignoreDynamicSQL = this.conf.ignoreRAPQueryProvider === true
+                    && methodName === "IF_RAP_QUERY_PROVIDER~SELECT";
+            }
+            else if (statement instanceof Statements.EndMethod) {
+                ignoreDynamicSQL = false;
+            }
             let message = undefined;
             if (this.conf.execSQL && statement instanceof Statements.ExecSQL) {
                 message = "EXEC SQL";
@@ -132,7 +144,7 @@ dynamic SQL can potentially create SQL injection problems`,
             if (message) {
                 issues.push(issue_1.Issue.atStatement(file, statementNode, this.getDescription(message), this.getMetadata().key, this.conf.severity));
             }
-            if (this.conf.dynamicSQL) {
+            if (this.conf.dynamicSQL && ignoreDynamicSQL === false) {
                 message = this.findDynamicSQL(statementNode);
                 if (message) {
                     issues.push(issue_1.Issue.atStatement(file, statementNode, this.getDescription(message), this.getMetadata().key, this.conf.severity));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.119.36",
+    "version": "2.119.38",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",