@abaplint/core 2.97.3 → 2.97.4

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

@@ -7,7 +7,7 @@ const version_1 = require("../../../version");
 class CallFunction {
     getMatcher() {
         const starting = (0, combi_1.seq)("STARTING NEW TASK", expressions_1.SimpleSource2);
-        const update = (0, combi_1.str)("IN UPDATE TASK");
+        const update = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.str)("IN UPDATE TASK"));
         const unit = (0, combi_1.seq)("UNIT", expressions_1.Source);
         const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.altPrio)("TASK", unit)));
         const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodName, "ON END OF TASK");

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.97.3";
+        return "2.97.4";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/sql_escape_host_variables.js

@@ -51,7 +51,7 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
                 || s.get() instanceof Statements.SelectLoop
                 || s.get() instanceof Statements.InsertDatabase
                 || s.get() instanceof Statements.DeleteDatabase) {
-                for (const o of s.findAllExpressions(Expressions.SQLSource)) {
+                for (const o of s.findAllExpressionsMulti([Expressions.SQLSource, Expressions.SQLSourceSimple])) {
                     const first = o.getFirstChild();
                     if (((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.Source && first.getChildren()[0].get() instanceof Expressions.FieldChain)
                         || ((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.SimpleSource3 && first.getChildren()[0].get() instanceof Expressions.FieldChain)) {

package/build/src/rules/strict_sql.js

@@ -53,6 +53,7 @@ Activates from v750 and up`,
                 || s.get() instanceof Statements.SelectLoop) {
                 const expr = s.findDirectExpression(Expressions.Select);
                 const where = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLCond);
+                const order = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLOrderBy);
                 const into = (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoStructure))
                     || (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoTable));
                 if (into === undefined || where === undefined) {
@@ -62,8 +63,11 @@ Activates from v750 and up`,
                     continue;
                 }
                 const fix1 = edit_helper_1.EditHelper.deleteRange(file, into.getFirstToken().getStart(), into.getLastToken().getEnd());
-                const whereLast = where.getLastToken();
-                const fix2 = edit_helper_1.EditHelper.insertAt(file, whereLast.getEnd(), " " + into.concatTokens());
+                let last = where.getLastToken();
+                if (order && order.getLastToken().getEnd().isAfter(last.getEnd())) {
+                    last = order.getLastToken();
+                }
+                const fix2 = edit_helper_1.EditHelper.insertAt(file, last.getEnd(), " " + into.concatTokens());
                 const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
                 const message = "INTO/APPENDING must be last in strict SQL";
                 const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);

package/package.json

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