@abaplint/core 2.91.23 → 2.91.24

package/build/abaplint.d.ts

@@ -1933,6 +1933,7 @@ declare namespace Expressions {
         SQLCompareOperator,
         SQLCompare,
         SQLCond,
+        SQLField,
         SQLFieldListLoop,
         SQLFieldList,
         SQLFieldName,
@@ -4938,6 +4939,10 @@ declare class SQLCond extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLField extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLFieldList extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -163,6 +163,7 @@ __exportStar(require("./sql_client"), exports);
 __exportStar(require("./sql_compare_operator"), exports);
 __exportStar(require("./sql_compare"), exports);
 __exportStar(require("./sql_cond"), exports);
+__exportStar(require("./sql_field"), exports);
 __exportStar(require("./sql_field_list_loop"), exports);
 __exportStar(require("./sql_field_list"), exports);
 __exportStar(require("./sql_field_name"), exports);

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

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLField = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const version_1 = require("../../../version");
+const tokens_1 = require("../../1_lexer/tokens");
+const sql_function_1 = require("./sql_function");
+const simple_field_chain_1 = require("./simple_field_chain");
+const sql_path_1 = require("./sql_path");
+class SQLField extends combi_1.Expression {
+    getRunnable() {
+        const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), simple_field_chain_1.SimpleFieldChain));
+        const as = (0, combi_1.seq)("AS", _1.SQLAsName);
+        const field = (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLCase, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant);
+        const sub = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW))));
+        const arith = (0, combi_1.ver)(version_1.Version.v740sp05, sub);
+        return (0, combi_1.seq)(field, (0, combi_1.optPrio)(arith), (0, combi_1.optPrio)(as));
+    }
+}
+exports.SQLField = SQLField;
+//# sourceMappingURL=sql_field.js.map

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

@@ -4,19 +4,10 @@ exports.SQLFieldList = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const version_1 = require("../../../version");
-const tokens_1 = require("../../1_lexer/tokens");
-const sql_function_1 = require("./sql_function");
-const simple_field_chain_1 = require("./simple_field_chain");
-const sql_path_1 = require("./sql_path");
 class SQLFieldList extends combi_1.Expression {
     getRunnable() {
         const comma = (0, combi_1.optPrio)((0, combi_1.ver)(version_1.Version.v740sp05, ","));
-        const abap = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), simple_field_chain_1.SimpleFieldChain));
-        const as = (0, combi_1.seq)("AS", _1.SQLAsName);
-        const field = (0, combi_1.altPrio)(_1.SQLAggregation, _1.SQLCase, sql_function_1.SQLFunction, sql_path_1.SQLPath, _1.SQLFieldName, abap, _1.Constant);
-        const sub = (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/", "&&"), (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenLeftW)), field, (0, combi_1.optPrio)((0, combi_1.tok)(tokens_1.WParenRightW))));
-        const arith = (0, combi_1.ver)(version_1.Version.v740sp05, sub);
-        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.plusPrio)((0, combi_1.seq)(field, (0, combi_1.optPrio)(arith), (0, combi_1.optPrio)(as), comma)));
+        return (0, combi_1.altPrio)("*", _1.Dynamic, (0, combi_1.plusPrio)((0, combi_1.seq)(_1.SQLField, comma)));
     }
 }
 exports.SQLFieldList = SQLFieldList;

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

@@ -4,14 +4,13 @@ exports.SQLFieldListLoop = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
 const version_1 = require("../../../version");
-const sql_function_1 = require("./sql_function");
 const sql_path_1 = require("./sql_path");
 // loop must include one field from the database table
 class SQLFieldListLoop extends combi_1.Expression {
     getRunnable() {
         const comma = (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp05, ","));
         const as = (0, combi_1.seq)("AS", _1.SQLAsName);
-        const someField = (0, combi_1.seq)((0, combi_1.alt)(_1.SQLFieldName, sql_path_1.SQLPath, _1.SQLAggregation, sql_function_1.SQLFunction, _1.SQLCase), (0, combi_1.optPrio)(as), comma);
+        const someField = (0, combi_1.seq)(_1.SQLField, comma);
         const fieldList = (0, combi_1.seq)((0, combi_1.star)(someField), (0, combi_1.alt)(_1.SQLFieldName, sql_path_1.SQLPath), (0, combi_1.optPrio)(as), comma, (0, combi_1.star)(someField));
         const fields = (0, combi_1.alt)("*", _1.Dynamic, fieldList);
         return fields;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -421,7 +421,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
             return undefined;
         }
         let fieldDefinition = "";
-        const fields = fieldList.findDirectExpressions(Expressions.SQLFieldName);
+        const fields = fieldList.findAllExpressions(Expressions.SQLFieldName);
         const name = ((_c = inlineData.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "error";
         if (fields.length === 1) {
             fieldDefinition = `DATA ${name} TYPE ${tableName}-${fields[0].concatTokens()}.`;
@@ -477,7 +477,7 @@ ${indentation}`);
             return undefined;
         }
         let fieldDefinitions = "";
-        for (const f of fieldList.findDirectExpressions(Expressions.SQLFieldName)) {
+        for (const f of fieldList.findAllExpressions(Expressions.SQLFieldName)) {
             let fieldName = f.concatTokens();
             if (fieldName.includes("~")) {
                 const split = fieldName.split("~");

package/build/src/rules/select_add_order_by.js

@@ -60,8 +60,8 @@ If the target is a sorted/hashed table, no issue is reported`,
                     continue;
                 }
                 // skip COUNT(*)
-                const list = s.findFirstExpression(Expressions.SQLFieldList);
-                if ((list === null || list === void 0 ? void 0 : list.getChildren().length) === 1 && ((_a = list.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.SQLAggregation) {
+                const list = s.findAllExpressions(Expressions.SQLField);
+                if (list.length === 1 && ((_a = list[0].getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.SQLAggregation) {
                     continue;
                 }
                 else if (s.findFirstExpression(Expressions.SQLOrderBy)) {

package/package.json

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