@abaplint/core 2.120.27 → 2.120.28

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

@@ -9,7 +9,7 @@ const sql_field_1 = require("./sql_field");
 const sql_grouping_sets_1 = require("./sql_grouping_sets");
 class SQLGroupBy extends combi_1.Expression {
     getRunnable() {
-        const fieldName = (0, combi_1.alt)(sql_field_name_1.SQLFieldName, dynamic_1.Dynamic);
+        const fieldName = (0, combi_1.seq)((0, combi_1.stopBefore)("ORDER", "BY"), (0, combi_1.alt)(sql_field_name_1.SQLFieldName, dynamic_1.Dynamic));
         const expr = (0, combi_1.ver)(version_1.Release.v740sp02, sql_field_1.SQLField, { also: combi_1.AlsoIn.OpenABAP });
         const newGroup = (0, combi_1.ver)(version_1.Release.v740sp02, (0, combi_1.seq)("GROUP BY", expr, (0, combi_1.altPrio)((0, combi_1.plus)((0, combi_1.seq)(",", expr)), (0, combi_1.optPrio)((0, combi_1.plus)(fieldName)))), { also: combi_1.AlsoIn.OpenABAP });
         const old = (0, combi_1.seq)((0, combi_1.plus)((0, combi_1.seq)(fieldName, ",")), fieldName);

package/build/src/abap/5_syntax/expressions/_check_database_fields.js

@@ -25,7 +25,7 @@ function checkDatabaseFields(fields, dbSources, input, token) {
         if (field === "*") {
             continue;
         }
-        if (/^\w+$/.test(field) && type.getComponentByName(field) === undefined) {
+        if (/^[A-Z_]\w*$/i.test(field) && type.getComponentByName(field) === undefined) {
             const message = `checkFields, field ${field} not found`;
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, token, message));
             return;

package/build/src/abap/5_syntax/expressions/select.js

@@ -74,7 +74,7 @@ class Select {
             return;
         }
         (0, _check_database_fields_1.checkDatabaseFields)(fields.map(field => field.code), dbSources, input, node.getFirstToken());
-        const intoExpression = this.handleInto(node, input, fields, dbSources);
+        const intoExpression = this.handleInto(node, input, fields, dbSources, from);
         const fae = node.findDirectExpression(Expressions.SQLForAllEntries);
         if (fae) {
             input.scope.push(_scope_type_1.ScopeType.OpenSQL, "SELECT", token.getStart(), input.filename);
@@ -235,12 +235,12 @@ class Select {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
         }
     }
-    static handleInto(node, input, fields, dbSources) {
+    static handleInto(node, input, fields, dbSources, from) {
         const intoTable = node.findDirectExpression(Expressions.SQLIntoTable);
         if (intoTable) {
             const inline = intoTable.findFirstExpression(Expressions.InlineData);
             if (inline) {
-                inline_data_1.InlineData.runSyntax(inline, input, this.buildTableType(fields, dbSources, input.scope));
+                inline_data_1.InlineData.runSyntax(inline, input, this.buildTableType(fields, dbSources, input.scope, from));
             }
             return intoTable;
         }
@@ -388,11 +388,36 @@ class Select {
             return basic_1.VoidType.get("SELECT_todo13");
         }
     }
-    static buildTableType(fields, dbSources, scope) {
-        if (dbSources.length !== 1) {
+    static buildTableType(fields, dbSources, scope, from) {
+        var _a;
+        const tableOptions = { withHeader: false, keyType: basic_1.TableKeyType.empty };
+        if (dbSources.length > 1) {
+            const sourceInfos = this.buildDatabaseSourceInfos(from, dbSources);
+            if (fields.length === 1 && fields[0].code === "*") {
+                const components = [];
+                for (const info of sourceInfos) {
+                    const type = (_a = info.source) === null || _a === void 0 ? void 0 : _a.parseType(scope.getRegistry());
+                    if (!(type instanceof basic_1.StructureType)) {
+                        return basic_1.VoidType.get("SELECT_todo3");
+                    }
+                    components.push({ name: info.alias || info.name, type });
+                }
+                return new basic_1.TableType(new basic_1.StructureType(components), tableOptions, undefined);
+            }
+            const components = [];
+            for (const field of fields) {
+                const type = this.findFieldType(field.code, sourceInfos, scope);
+                if (type === undefined) {
+                    return basic_1.VoidType.get("SELECT_todo3");
+                }
+                const name = field.as || field.code.split("~").pop();
+                components.push({ name, type });
+            }
+            return new basic_1.TableType(new basic_1.StructureType(components), tableOptions, undefined);
+        }
+        else if (dbSources.length !== 1) {
             return basic_1.VoidType.get("SELECT_todo3");
         }
-        const tableOptions = { withHeader: false, keyType: basic_1.TableKeyType.empty };
         if (dbSources[0] === undefined) {
             // then its a voided table
             return new basic_1.TableType(basic_1.VoidType.get("SELECT_todo4"), tableOptions, undefined);
@@ -418,6 +443,39 @@ class Select {
         }
         return basic_1.VoidType.get("SELECT_todo7");
     }
+    static buildDatabaseSourceInfos(from, dbSources) {
+        const fromSources = from.findAllExpressions(Expressions.SQLFromSource);
+        return dbSources.map((source, index) => {
+            var _a, _b;
+            const fromSource = fromSources[index];
+            const name = ((_a = fromSource === null || fromSource === void 0 ? void 0 : fromSource.findFirstExpression(Expressions.DatabaseTable)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().replace(/^\*/, "").toUpperCase()) || "";
+            const alias = ((_b = fromSource === null || fromSource === void 0 ? void 0 : fromSource.findDirectExpression(Expressions.SQLAsName)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase()) || "";
+            return { source, name, alias };
+        });
+    }
+    static findFieldType(code, sourceInfos, scope) {
+        var _a;
+        const separator = code.indexOf("~");
+        const qualifier = separator >= 0 ? code.substring(0, separator) : undefined;
+        const fieldName = separator >= 0 ? code.substring(separator + 1) : code;
+        const candidates = qualifier === undefined
+            ? sourceInfos
+            : sourceInfos.filter(info => info.alias === qualifier || info.name === qualifier);
+        for (const candidate of candidates) {
+            let type = (_a = candidate.source) === null || _a === void 0 ? void 0 : _a.parseType(scope.getRegistry());
+            for (const component of fieldName.split("-")) {
+                if (!(type instanceof basic_1.StructureType)) {
+                    type = undefined;
+                    break;
+                }
+                type = type.getComponentByName(component);
+            }
+            if (type) {
+                return type;
+            }
+        }
+        return undefined;
+    }
     static findFields(node, input) {
         var _a, _b;
         let expr = undefined;
@@ -431,7 +489,7 @@ class Select {
             let code = field.concatTokens().toUpperCase();
             const as = ((_b = field.findDirectExpression(Expressions.SQLAsName)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
             if (as !== "") {
-                code = code.replace(" AS " + as, "");
+                code = code.replace(" AS " + as.toUpperCase(), "");
             }
             ret.push({ code, as, expression: field });
         }

package/build/src/abap/5_syntax/expressions/value_body.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValueBody = void 0;
+const nodes_1 = require("../../nodes");
 const Expressions = __importStar(require("../../2_statements/expressions"));
 const for_1 = require("./for");
 const source_1 = require("./source");
@@ -43,7 +44,7 @@ const basic_1 = require("../../types/basic");
 const _syntax_input_1 = require("../_syntax_input");
 class ValueBody {
     static runSyntax(node, input, targetType) {
-        var _a, _b;
+        var _a, _b, _c;
         if (node === undefined) {
             return targetType;
         }
@@ -60,26 +61,45 @@ class ValueBody {
             }
         }
         const fields = new Set();
-        for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
-            field_assignment_1.FieldAssignment.runSyntax(s, input, targetType);
-            if (node.findDirectExpression(Expressions.ValueBodyLine) === undefined) {
-                // todo: refine, still needs to be checked when there are table lines
-                const fieldname = (_a = s.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+        const hasTableLines = node.findDirectExpression(Expressions.ValueBodyLine) !== undefined;
+        for (const child of node.getChildren()) {
+            if (!(child instanceof nodes_1.ExpressionNode)) {
+                continue;
+            }
+            else if (child.get() instanceof Expressions.FieldAssignment) {
+                const fieldname = (_a = child.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+                if (fieldname && hasTableLines === false && fields.has(fieldname)) {
+                    const message = "Duplicate field assignment";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
                 if (fieldname) {
-                    if (fields.has(fieldname)) {
+                    fields.add(fieldname);
+                }
+            }
+            else if (child.get() instanceof Expressions.ValueBodyLine) {
+                const rowFields = new Set(fields);
+                for (const assignment of child.findDirectExpressions(Expressions.FieldAssignment)) {
+                    const fieldname = (_b = assignment.findDirectExpression(Expressions.FieldSub)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase();
+                    if (fieldname && rowFields.has(fieldname)) {
                         const message = "Duplicate field assignment";
-                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, s.getFirstToken(), message));
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, assignment.getFirstToken(), message));
                         return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                     }
-                    fields.add(fieldname);
+                    if (fieldname) {
+                        rowFields.add(fieldname);
+                    }
                 }
             }
         }
+        for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
+            field_assignment_1.FieldAssignment.runSyntax(s, input, targetType);
+        }
         let type = undefined; // todo, this is only correct if there is a single source in the body
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             type = source_1.Source.runSyntax(s, input, type);
         }
-        for (const s of ((_b = node.findDirectExpression(Expressions.ValueBase)) === null || _b === void 0 ? void 0 : _b.findDirectExpressions(Expressions.Source)) || []) {
+        for (const s of ((_c = node.findDirectExpression(Expressions.ValueBase)) === null || _c === void 0 ? void 0 : _c.findDirectExpressions(Expressions.Source)) || []) {
             type = source_1.Source.runSyntax(s, input, type);
         }
         for (const foo of node.findDirectExpressions(Expressions.ValueBodyLine)) {

package/build/src/registry.js

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

package/package.json

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