@abaplint/core 2.100.5 → 2.101.0

package/build/abaplint.d.ts

@@ -1265,6 +1265,7 @@ export declare class CurrentScope {
     private static addBuiltIn;
     private constructor();
     getVersion(): Version;
+    getRegistry(): IRegistry;
     addType(type: TypedIdentifier | undefined): void;
     addTypeNamed(name: string, type: TypedIdentifier | undefined): void;
     addExtraLikeType(type: TypedIdentifier | undefined): void;
@@ -1278,6 +1279,7 @@ export declare class CurrentScope {
     addListPrefix(identifiers: readonly TypedIdentifier[], prefix: string): void;
     addList(identifiers: readonly TypedIdentifier[]): void;
     addReference(usage: Token | undefined, referencing: Identifier | undefined, type: ReferenceType | undefined, filename: string, extra?: IReferenceExtras): void;
+    addSQLConversion(fieldName: string, message: string, token: Token): void;
     findFunctionModule(name: string | undefined): FunctionModuleDefinition | undefined;
     findObjectDefinition(name: string | undefined): IClassDefinition | IInterfaceDefinition | undefined;
     isBadiDef(name: string): boolean;
@@ -3547,6 +3549,11 @@ declare interface IScopeData {
     idefs: IInterfaceDefinition[];
     forms: IFormDefinition[];
     references: IReference[];
+    sqlConversion: {
+        fieldName: string;
+        message: string;
+        token: Token;
+    }[];
 }
 
 declare interface IScopeIdentifier {

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

@@ -38,6 +38,9 @@ class CurrentScope {
     getVersion() {
         return this.reg.getConfig().getVersion();
     }
+    getRegistry() {
+        return this.reg;
+    }
     addType(type) {
         if (type === undefined) {
             return;
@@ -137,6 +140,10 @@ class CurrentScope {
         const position = new _identifier_1.Identifier(usage, filename);
         (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().references.push({ position, resolved: referencing, referenceType: type, extra });
     }
+    addSQLConversion(fieldName, message, token) {
+        var _a;
+        (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().sqlConversion.push({ fieldName, message, token });
+    }
     ///////////////////////////
     findFunctionModule(name) {
         if (name === undefined) {

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

@@ -8,7 +8,7 @@ class DatabaseTable {
         const name = token.getStr();
         if (name === "(") {
             // dynamic
-            return;
+            return undefined;
         }
         const found = scope.getDDIC().lookupTableOrView2(name);
         if (found === undefined && scope.getDDIC().inErrorNamespace(name) === true) {
@@ -21,6 +21,7 @@ class DatabaseTable {
             scope.addReference(token, found.getIdentifier(), _reference_1.ReferenceType.TableReference, filename);
             scope.getDDICReferences().addUsing(scope.getParentObj(), { object: found, token: token, filename: filename });
         }
+        return found;
     }
 }
 exports.DatabaseTable = DatabaseTable;

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

@@ -6,17 +6,16 @@ const basic_1 = require("../../types/basic");
 const inline_data_1 = require("./inline_data");
 const target_1 = require("./target");
 const sql_from_1 = require("./sql_from");
-const source_1 = require("./source");
 const sql_for_all_entries_1 = require("./sql_for_all_entries");
 const _scope_type_1 = require("../_scope_type");
+const sql_source_1 = require("./sql_source");
+const sql_compare_1 = require("./sql_compare");
 class Select {
     runSyntax(node, scope, filename, skipImplicitInto = false) {
         var _a, _b;
         const token = node.getFirstToken();
         const from = node.findDirectExpression(Expressions.SQLFrom);
-        if (from) {
-            new sql_from_1.SQLFrom().runSyntax(from, scope, filename);
-        }
+        const dbSources = from ? new sql_from_1.SQLFrom().runSyntax(from, scope, filename) : [];
         for (const inline of node.findAllExpressions(Expressions.InlineData)) {
             // todo, for now these are voided
             new inline_data_1.InlineData().runSyntax(inline, scope, filename, new basic_1.VoidType("SELECT_todo"));
@@ -42,11 +41,22 @@ class Select {
                 }
             }
         }
-        for (const s of node.findAllExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+        // OFFSET
+        for (const s of node.findDirectExpressions(Expressions.SQLSource)) {
+            new sql_source_1.SQLSource().runSyntax(s, scope, filename);
+        }
+        for (const up of node.findDirectExpressions(Expressions.SQLUpTo)) {
+            for (const s of up.findDirectExpressions(Expressions.SQLSource)) {
+                new sql_source_1.SQLSource().runSyntax(s, scope, filename);
+            }
+        }
+        for (const fae of node.findDirectExpressions(Expressions.SQLForAllEntries)) {
+            for (const s of fae.findDirectExpressions(Expressions.SQLSource)) {
+                new sql_source_1.SQLSource().runSyntax(s, scope, filename);
+            }
         }
-        for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+        for (const s of node.findAllExpressions(Expressions.SQLCompare)) {
+            new sql_compare_1.SQLCompare().runSyntax(s, scope, filename, dbSources);
         }
         if (scope.getType() === _scope_type_1.ScopeType.OpenSQL) {
             scope.pop(node.getLastToken().getEnd());

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLCompare = void 0;
+const Expressions = require("../../2_statements/expressions");
+const basic_1 = require("../../types/basic");
+const sql_source_1 = require("./sql_source");
+class SQLCompare {
+    runSyntax(node, scope, filename, tables) {
+        var _a;
+        let sourceType;
+        let token;
+        for (const s of node.findAllExpressions(Expressions.SQLSource)) {
+            token = s.getFirstToken();
+            sourceType = new sql_source_1.SQLSource().runSyntax(s, scope, filename);
+        }
+        const fieldName = (_a = node.findDirectExpression(Expressions.SQLFieldName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+        if (fieldName && sourceType && token) {
+            // check compatibility for rule sql_value_conversion
+            const targetType = this.findType(fieldName, tables, scope);
+            let message = "";
+            if (sourceType instanceof basic_1.IntegerType
+                && targetType instanceof basic_1.CharacterType) {
+                message = "Integer to CHAR conversion";
+            }
+            else if (sourceType instanceof basic_1.IntegerType
+                && targetType instanceof basic_1.NumericType) {
+                message = "Integer to NUMC conversion";
+            }
+            else if (sourceType instanceof basic_1.NumericType
+                && targetType instanceof basic_1.IntegerType) {
+                message = "NUMC to Integer conversion";
+            }
+            else if (sourceType instanceof basic_1.CharacterType
+                && targetType instanceof basic_1.IntegerType) {
+                message = "CHAR to Integer conversion";
+            }
+            else if (sourceType instanceof basic_1.CharacterType
+                && targetType instanceof basic_1.CharacterType
+                && sourceType.getLength() > targetType.getLength()) {
+                message = "Source field longer than database field, CHAR -> CHAR";
+            }
+            else if (sourceType instanceof basic_1.NumericType
+                && targetType instanceof basic_1.NumericType
+                && sourceType.getLength() > targetType.getLength()) {
+                message = "Source field longer than database field, NUMC -> NUMC";
+            }
+            if (message !== "") {
+                scope.addSQLConversion(fieldName, message, token);
+            }
+        }
+    }
+    findType(fieldName, tables, scope) {
+        for (const t of tables) {
+            const type = t === null || t === void 0 ? void 0 : t.parseType(scope.getRegistry());
+            if (type instanceof basic_1.StructureType) {
+                return type.getComponentByName(fieldName);
+            }
+        }
+        return undefined;
+    }
+}
+exports.SQLCompare = SQLCompare;
+//# sourceMappingURL=sql_compare.js.map

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

@@ -6,6 +6,7 @@ const dynamic_1 = require("./dynamic");
 const database_table_1 = require("./database_table");
 class SQLFrom {
     runSyntax(node, scope, filename) {
+        const ret = [];
         const fromList = node.findAllExpressions(Expressions.SQLFromSource);
         for (const from of fromList) {
             for (const d of from.findAllExpressions(Expressions.Dynamic)) {
@@ -13,9 +14,10 @@ class SQLFrom {
             }
             const dbtab = from.findFirstExpression(Expressions.DatabaseTable);
             if (dbtab !== undefined) {
-                new database_table_1.DatabaseTable().runSyntax(dbtab, scope, filename);
+                ret.push(new database_table_1.DatabaseTable().runSyntax(dbtab, scope, filename));
             }
         }
+        return ret;
     }
 }
 exports.SQLFrom = SQLFrom;

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLSource = void 0;
+const Expressions = require("../../2_statements/expressions");
+const source_1 = require("./source");
+class SQLSource {
+    runSyntax(node, scope, filename) {
+        for (const s of node.findAllExpressions(Expressions.Source)) {
+            return new source_1.Source().runSyntax(s, scope, filename);
+        }
+        for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
+            return new source_1.Source().runSyntax(s, scope, filename);
+        }
+        return undefined;
+    }
+}
+exports.SQLSource = SQLSource;
+//# sourceMappingURL=sql_source.js.map

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

@@ -15,6 +15,7 @@ class ScopeData {
             extraLikeTypes: {},
             deferred: [],
             references: [],
+            sqlConversion: [],
         };
     }
     getData() {

package/build/src/registry.js

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

package/build/src/rules/index.js

@@ -143,6 +143,7 @@ __exportStar(require("./smim_consistency"), exports);
 __exportStar(require("./space_before_colon"), exports);
 __exportStar(require("./space_before_dot"), exports);
 __exportStar(require("./sql_escape_host_variables"), exports);
+__exportStar(require("./sql_value_conversion"), exports);
 __exportStar(require("./start_at_tab"), exports);
 __exportStar(require("./static_call_via_instance"), exports);
 __exportStar(require("./strict_sql"), exports);

package/build/src/rules/reduce_string_templates.js

@@ -42,6 +42,9 @@ class ReduceStringTemplates extends _abap_rule_1.ABAPRule {
                     for (const second of source.findDirectExpressions(Expressions.StringTemplate)) {
                         issues.push(issue_1.Issue.atToken(file, second.getFirstToken(), "Nested string templates, reduce", this.getMetadata().key, this.conf.severity));
                     }
+                    if (ts.findDirectExpression(Expressions.StringTemplateFormatting)) {
+                        continue;
+                    }
                     for (const constant of source.findDirectExpressions(Expressions.Constant)) {
                         for (const constantString of constant.findDirectExpressions(Expressions.ConstantString)) {
                             issues.push(issue_1.Issue.atToken(file, constantString.getFirstToken(), "Constant string in text template, reduce", this.getMetadata().key, this.conf.severity));

package/build/src/rules/sql_value_conversion.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLValueConversion = exports.SQLValueConversionConf = void 0;
+const issue_1 = require("../issue");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const objects_1 = require("../objects");
+const syntax_1 = require("../abap/5_syntax/syntax");
+const _abap_object_1 = require("../objects/_abap_object");
+class SQLValueConversionConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.SQLValueConversionConf = SQLValueConversionConf;
+class SQLValueConversion {
+    constructor() {
+        this.conf = new SQLValueConversionConf();
+    }
+    getMetadata() {
+        return {
+            key: "sql_value_conversion",
+            title: "Implicit SQL Value Conversion",
+            shortDescription: `Ensure types match when selecting from database`,
+            extendedInformation: `
+* Integer to CHAR conversion
+* Integer to NUMC conversion
+* NUMC to Integer conversion
+* CHAR to Integer conversion
+* Source field longer than database field, CHAR -> CHAR
+* Source field longer than database field, NUMC -> NUMC`,
+            tags: [],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    initialize(reg) {
+        this.reg = reg;
+        return this;
+    }
+    run(obj) {
+        if (!(obj instanceof _abap_object_1.ABAPObject) || obj instanceof objects_1.Interface) {
+            return [];
+        }
+        // messages defined in sql_compare.ts
+        const issues = this.traverse(new syntax_1.SyntaxLogic(this.reg, obj).run().spaghetti.getTop());
+        return issues;
+    }
+    traverse(node) {
+        const ret = [];
+        for (const r of node.getData().sqlConversion) {
+            const file = this.reg.getFileByName(node.getIdentifier().filename);
+            if (file === undefined) {
+                continue;
+            }
+            ret.push(issue_1.Issue.atToken(file, r.token, r.message, this.getMetadata().key, this.getConfig().severity));
+        }
+        for (const c of node.getChildren()) {
+            ret.push(...this.traverse(c));
+        }
+        return ret;
+    }
+}
+exports.SQLValueConversion = SQLValueConversion;
+//# sourceMappingURL=sql_value_conversion.js.map

package/package.json

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