@abaplint/core 2.113.82 → 2.113.84

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

@@ -6,7 +6,8 @@ const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
 class Module {
     getMatcher() {
-        const ret = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("INPUT", "OUTPUT", "ON CHAIN-REQUEST")));
+        const sw = (0, combi_1.seq)("SWITCH", expressions_1.NamespaceSimpleName);
+        const ret = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("INPUT", "OUTPUT", "ON CHAIN-REQUEST", "ON CHAIN-INPUT", sw)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }

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

@@ -85,10 +85,55 @@ class Select {
         for (const s of node.findDirectExpressions(Expressions.SQLOrderBy)) {
             new sql_order_by_1.SQLOrderBy().runSyntax(s, input);
         }
+        if (this.isStrictMode(node)) {
+            this.strictModeChecks(node, input);
+        }
         if (input.scope.getType() === _scope_type_1.ScopeType.OpenSQL) {
             input.scope.pop(node.getLastToken().getEnd());
         }
     }
+    // there are multiple rules, but gotta start somewhere
+    isStrictMode(node) {
+        const into = node.findDirectExpressionsMulti([Expressions.SQLIntoList, Expressions.SQLIntoStructure, Expressions.SQLIntoTable])[0];
+        const where = node.findDirectExpression(Expressions.SQLCond);
+        // INTO is after WHERE
+        if (into && where && into.getFirstToken().getStart().isAfter(where.getFirstToken().getStart())) {
+            return true;
+        }
+        // FIELDS is used
+        if (node.findFirstExpression(Expressions.SQLFields)) {
+            return true;
+        }
+        // any field is escaped with @
+        for (const source of node.findAllExpressions(Expressions.SQLSource)) {
+            if (source.getFirstToken().getStr() === "@") {
+                return true;
+            }
+        }
+        // comma used in FROM
+        const fieldList = node.findFirstExpression(Expressions.SQLFieldList);
+        if (fieldList && fieldList.findDirectTokenByText(",")) {
+            return true;
+        }
+        return false;
+    }
+    strictModeChecks(node, input) {
+        const sources = node.findAllExpressions(Expressions.SQLSource);
+        for (const source of sources) {
+            const first = source.getFirstChild();
+            if ((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.SQLAliasField) {
+                continue;
+            }
+            else if ((first === null || first === void 0 ? void 0 : first.getFirstToken().getStr()) === "@") {
+                continue;
+            }
+            else if ((first === null || first === void 0 ? void 0 : first.getChildren()[0].get()) instanceof Expressions.Constant) {
+                continue;
+            }
+            const message = `SELECT: "${source.concatTokens()}" must be escaped with @ in strict mode`;
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+        }
+    }
     handleInto(node, input, fields, dbSources) {
         const intoTable = node.findDirectExpression(Expressions.SQLIntoTable);
         if (intoTable) {

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

@@ -5,6 +5,7 @@ const Expressions = require("../../2_statements/expressions");
 const select_1 = require("../expressions/select");
 class Select {
     runSyntax(node, input) {
+        // for UNION statements there are multiple select parts
         const selects = node.findDirectExpressions(Expressions.Select);
         for (let i = 0; i < selects.length; i++) {
             const last = i === selects.length - 1;

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.82";
+        return "2.113.84";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -403,6 +403,10 @@ Make sure to test the downported code, it might not always be completely correct
         if (found) {
             return found;
         }
+        found = this.downportSQLMoveInto(low, high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.downportSQLExtras(low, high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -536,6 +540,39 @@ Make sure to test the downported code, it might not always be completely correct
         return undefined;
     }
     //////////////////////////////////////////
+    /** move INTO from after WHERE to after FROM */
+    downportSQLMoveInto(low, high, lowFile, _highSyntax) {
+        var _a;
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        // note: SQLCond is also used in JOIN(FROM) conditions
+        const where = (_a = high.findFirstExpression(Expressions.Select)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.SQLCond);
+        if (where === undefined) {
+            return undefined;
+        }
+        let into = high.findFirstExpression(Expressions.SQLIntoList);
+        if (into === undefined) {
+            into = high.findFirstExpression(Expressions.SQLIntoStructure);
+        }
+        if (into === undefined) {
+            into = high.findFirstExpression(Expressions.SQLIntoTable);
+        }
+        if (into === undefined) {
+            return undefined;
+        }
+        if (where.getLastToken().getEnd().isBefore(into.getFirstToken().getStart()) === false) {
+            return undefined;
+        }
+        const from = high.findFirstExpression(Expressions.SQLFrom);
+        if (from === undefined) {
+            return undefined;
+        }
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, from.getLastToken().getEnd(), ` ` + into.concatTokens());
+        const fix2 = edit_helper_1.EditHelper.deleteRange(lowFile, into.getFirstToken().getStart(), into.getLastToken().getEnd());
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, low.getFirstToken(), "SQL, move INTO", this.getMetadata().key, this.conf.severity, fix);
+    }
     /** removes @'s and commas */
     downportSQLExtras(low, high, lowFile, highSyntax) {
         if (!(low.get() instanceof _statement_1.Unknown)) {

package/package.json

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