@abaplint/core 2.97.0 → 2.97.3

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

@@ -269,7 +269,7 @@ class BasicTypes {
         return undefined;
     }
     parseTable(node, name) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const typename = node.findFirstExpression(Expressions.TypeName);
         const text = (_a = node.findFirstExpression(Expressions.TypeTable)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (text === undefined) {
@@ -292,7 +292,8 @@ class BasicTypes {
         }
         const typeTableKeys = node.findAllExpressions(expressions_1.TypeTableKey);
         const firstKey = typeTableKeys[0];
-        const isNamed = (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpression(expressions_1.Field)) !== undefined;
+        const isNamed = (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpression(expressions_1.Field)) !== undefined
+            && ((_b = firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpression(expressions_1.Field)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase()) !== "PRIMARY_KEY";
         const primaryKey = {
             name: "primary_key",
             type: type || basic_1.TableAccessType.standard,
@@ -311,7 +312,7 @@ class BasicTypes {
         const secondaryKeys = [];
         for (let i = start; i < typeTableKeys.length; i++) {
             const row = typeTableKeys[i];
-            const name = (_b = row.findDirectExpression(expressions_1.Field)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+            const name = (_c = row.findDirectExpression(expressions_1.Field)) === null || _c === void 0 ? void 0 : _c.concatTokens();
             if (name === undefined) {
                 continue;
             }
@@ -407,7 +408,7 @@ class BasicTypes {
         else if (typename && (text.startsWith("TYPE TABLE FOR CREATE ")
             || text.startsWith("TYPE TABLE FOR UPDATE "))) {
             const name = typename.concatTokens();
-            const type = (_c = this.scope.getDDIC().lookupDDLS(name)) === null || _c === void 0 ? void 0 : _c.type;
+            const type = (_d = this.scope.getDDIC().lookupDDLS(name)) === null || _d === void 0 ? void 0 : _d.type;
             if (type) {
                 return new Types.TableType(new basic_1.VoidType("RapTodo"), options);
             }

package/build/src/registry.js

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

package/build/src/rules/strict_sql.js

@@ -8,6 +8,7 @@ const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const version_1 = require("../version");
 const _irule_1 = require("./_irule");
+const edit_helper_1 = require("../edit_helper");
 class StrictSQLConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.StrictSQLConf = StrictSQLConf;
@@ -25,8 +26,10 @@ class StrictSQL extends _abap_rule_1.ABAPRule {
 
 https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-us/abenopensql_strict_mode_750.htm
 
-Also see separate rule sql_escape_host_variables`,
-            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Syntax],
+Also see separate rule sql_escape_host_variables
+
+Activates from v750 and up`,
+            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Syntax, _irule_1.RuleTag.Quickfix],
         };
     }
     getConfig() {
@@ -41,7 +44,7 @@ Also see separate rule sql_escape_host_variables`,
         if (type === "INTF" || type === "TYPE") {
             return [];
         }
-        if (this.reg.getConfig().getVersion() < version_1.Version.v740sp02
+        if (this.reg.getConfig().getVersion() < version_1.Version.v750
             && this.reg.getConfig().getVersion() !== version_1.Version.Cloud) {
             return [];
         }
@@ -55,11 +58,15 @@ Also see separate rule sql_escape_host_variables`,
                 if (into === undefined || where === undefined) {
                     continue;
                 }
-                if (where.getFirstToken().getStart().isBefore(into.getFirstToken().getStart())) {
+                else if (where.getFirstToken().getStart().isBefore(into.getFirstToken().getStart())) {
                     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());
+                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);
+                const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
                 issues.push(issue);
                 break;
             }

package/package.json

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