@abaplint/transpiler 2.7.4 → 2.7.6

package/build/src/expressions/sql_cond.d.ts

@@ -1,9 +1,10 @@
 import { Nodes } from "@abaplint/core";
+import * as abaplint from "@abaplint/core";
 import { IExpressionTranspiler } from "./_expression_transpiler";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class SQLCondTranspiler implements IExpressionTranspiler {
-    transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
+    transpile(node: Nodes.ExpressionNode, traversal: Traversal, table?: abaplint.Objects.Table | undefined): Chunk;
     private sqlIn;
     private basicCondition;
     private sqlSource;

package/build/src/expressions/sql_cond.js

@@ -7,8 +7,9 @@ const chunk_1 = require("../chunk");
 const simple_source3_1 = require("./simple_source3");
 const field_chain_1 = require("./field_chain");
 const sql_field_name_1 = require("./sql_field_name");
+const transpile_types_1 = require("../transpile_types");
 class SQLCondTranspiler {
-    transpile(node, traversal) {
+    transpile(node, traversal, table) {
         var _a;
         let ret = "";
         for (const c of node.getChildren()) {
@@ -31,11 +32,11 @@ class SQLCondTranspiler {
                     ret += this.sqlIn(c, traversal);
                 }
                 else {
-                    ret += this.basicCondition(c, traversal, traversal.getFilename());
+                    ret += this.basicCondition(c, traversal, traversal.getFilename(), table);
                 }
             }
             else if (c instanceof abaplint.Nodes.ExpressionNode) {
-                ret += " " + this.transpile(c, traversal).getCode();
+                ret += " " + this.transpile(c, traversal, table).getCode();
             }
             else {
                 ret += " " + c.concatTokens();
@@ -54,10 +55,10 @@ class SQLCondTranspiler {
         const ret = `" + abap.expandIN("${fieldName.concatTokens()}", ${source.concatTokens()}) + "`;
         return ret;
     }
-    basicCondition(c, traversal, filename) {
+    basicCondition(c, traversal, filename, table) {
         let ret = "";
         if (c.getChildren().length !== 3) {
-            return this.basicConditionNew(c, traversal, filename);
+            return this.basicConditionNew(c, traversal, filename, table);
         }
         let fieldName = undefined;
         const fieldNameExpression = c.findDirectExpression(abaplint.Expressions.SQLFieldName);
@@ -68,7 +69,7 @@ class SQLCondTranspiler {
         const source = c.findDirectExpression(abaplint.Expressions.SQLSource);
         if (fieldName && source && operator === undefined && c.findDirectTokenByText("LIKE")) {
             ret += fieldName + " LIKE ";
-            ret += this.sqlSource(source, traversal, filename);
+            ret += this.sqlSource(source, traversal, filename, table);
             return ret;
         }
         if (fieldName === undefined || operator === undefined || source === undefined) {
@@ -82,10 +83,10 @@ class SQLCondTranspiler {
             op = "<>";
         }
         ret += fieldName + " " + op + " ";
-        ret += this.sqlSource(source, traversal, filename);
+        ret += this.sqlSource(source, traversal, filename, table);
         return ret;
     }
-    sqlSource(source, traversal, filename) {
+    sqlSource(source, traversal, filename, table) {
         let ret = "";
         const simple = source.findDirectExpression(abaplint.Expressions.SimpleSource3);
         const alias = source.findDirectExpression(abaplint.Expressions.SQLAliasField);
@@ -111,7 +112,12 @@ class SQLCondTranspiler {
         }
         else {
             const concat = source.concatTokens();
-            if (concat.startsWith("`")) {
+            const conversionField = traversal.isSQLConversion(source.getFirstToken());
+            if (conversionField) {
+                const field = (table === null || table === void 0 ? void 0 : table.parseType(traversal.reg)).getComponentByName(conversionField);
+                ret += "'\" + " + new transpile_types_1.TranspileTypes().toType(field) + ".set(" + concat + ").get() + \"'";
+            }
+            else if (concat.startsWith("`")) {
                 ret += "'" + concat.substring(1, concat.length - 1) + "'";
             }
             else {
@@ -120,7 +126,7 @@ class SQLCondTranspiler {
         }
         return ret;
     }
-    basicConditionNew(node, traversal, filename) {
+    basicConditionNew(node, traversal, filename, table) {
         let ret = "";
         for (const child of node.getChildren()) {
             if (ret !== "") {
@@ -132,7 +138,7 @@ class SQLCondTranspiler {
             }
             else if (child.get() instanceof abaplint.Expressions.SQLSource
                 && child instanceof abaplint.Nodes.ExpressionNode) {
-                ret += this.sqlSource(child, traversal, filename);
+                ret += this.sqlSource(child, traversal, filename, table);
             }
             else {
                 ret += child.concatTokens();

package/build/src/expressions/sql_from.js

@@ -22,13 +22,19 @@ class SQLFromTranspiler {
             }
             else {
                 if (c.findFirstExpression(abaplint.Expressions.Dynamic)) {
-                    chunk.appendString(c.concatTokens() + " ");
+                    let concat = c.concatTokens();
+                    if (concat.startsWith("'")) {
+                        // no escaping needed, guess its not possible to have table names with single or double quote part of name
+                        concat = "\\\"" + concat.substring(1, concat.length - 1) + "\\\"";
+                    }
+                    chunk.appendString(concat + " ");
                 }
                 else if (c.concatTokens().includes("/")) {
-                    chunk.appendString("'" + c.concatTokens() + "' ");
+                    chunk.appendString("\\\"" + c.concatTokens() + "\\\" ");
                 }
                 else {
-                    chunk.appendString(c.concatTokens() + " ");
+                    const concat = c.concatTokens();
+                    chunk.appendString(concat + " ");
                 }
             }
         }

package/build/src/expressions/sql_from_source.js

@@ -12,7 +12,11 @@ class SQLFromSourceTranspiler {
                 chunk.appendString(c.concatTokens() + " ");
             }
             else if (c.get() instanceof abaplint.Expressions.DatabaseTable && c.concatTokens().includes("/")) {
-                chunk.appendString("'" + c.concatTokens() + "' ");
+                chunk.appendString("\"" + c.concatTokens() + "\" ");
+            }
+            else if (c.get() instanceof abaplint.Expressions.DatabaseTable && c.concatTokens().startsWith("('")) {
+                const concat = c.concatTokens();
+                chunk.appendString("\\\"" + concat.substring(2, concat.length - 2).toLowerCase() + "\\\" ");
             }
             else {
                 chunk.appendString(c.concatTokens() + " ");

package/build/src/statements/insert_database.js

@@ -22,7 +22,7 @@ class InsertDatabaseTranspiler {
             const tvalues = traversal.traverse(fromTable);
             options.push(`"table": ` + tvalues.getCode());
         }
-        return new chunk_1.Chunk(`await abap.statements.insertDatabase(${table.getCode()}, {${options.join(", ")}});`);
+        return new chunk_1.Chunk(`await abap.statements.insertDatabase(${table.getCode().toLowerCase()}, {${options.join(", ")}});`);
     }
 }
 exports.InsertDatabaseTranspiler = InsertDatabaseTranspiler;

package/build/src/statements/select.d.ts

@@ -4,6 +4,6 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class SelectTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal, targetOverride?: string): Chunk;
-    private findKeys;
+    private findTable;
     private isWhereExpression;
 }

package/build/src/statements/select.js

@@ -42,6 +42,7 @@ class SelectTranspiler {
         if (from) {
             select += new sql_from_1.SQLFromTranspiler().transpile(from, traversal).getCode();
         }
+        const { table, keys } = this.findTable(node, traversal);
         let where = undefined;
         for (const sqlCond of node.findAllExpressions(abaplint.Expressions.SQLCond)) {
             if (this.isWhereExpression(node, sqlCond)) {
@@ -49,7 +50,7 @@ class SelectTranspiler {
             }
         }
         if (where) {
-            select += "WHERE " + traversal.traverse(where).getCode() + " ";
+            select += "WHERE " + new expressions_1.SQLCondTranspiler().transpile(where, traversal, table).getCode() + " ";
         }
         const upTo = node.findFirstExpression(abaplint.Expressions.SQLUpTo);
         if (upTo) {
@@ -85,7 +86,6 @@ class SelectTranspiler {
             runtimeOptions = `, {` + runtimeOptionsList.join(", ") + `}`;
         }
         let extra = "";
-        const keys = this.findKeys(node, traversal);
         if (keys.length > 0) {
             extra = `, primaryKey: ${JSON.stringify(keys)}`;
         }
@@ -118,16 +118,17 @@ class SelectTranspiler {
             return new chunk_1.Chunk().append(`await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}${runtimeOptions});`, node, traversal);
         }
     }
-    findKeys(node, traversal) {
+    findTable(node, traversal) {
         let keys = [];
+        let tabl = undefined;
         const from = node.findAllExpressions(abaplint.Expressions.SQLFromSource).map(e => e.concatTokens());
         if (from.length === 1) {
-            const tabl = traversal.findTable(from[0]);
+            tabl = traversal.findTable(from[0]);
             if (tabl) {
                 keys = tabl.listKeys(traversal.reg).map(k => k.toLowerCase());
             }
         }
-        return keys;
+        return { table: tabl, keys };
     }
     isWhereExpression(node, expression) {
         // check if previous token before sqlCond is "WHERE". It could also be "ON" in case of join condition

package/build/src/statements/update_database.js

@@ -19,7 +19,7 @@ class UpdateDatabaseTranspiler {
             for (const set of sets) {
                 const name = (_a = set.findDirectExpression(abaplint.Expressions.SQLFieldName)) === null || _a === void 0 ? void 0 : _a.concatTokens();
                 const source = traversal.traverse(set.findDirectExpression(abaplint.Expressions.SQLSource));
-                s.push("\"'" + name + "' = '\" + " + source.getCode() + ".get() + \"'\"");
+                s.push("\"\\\"" + name + "\\\" = '\" + " + source.getCode() + ".get() + \"'\"");
             }
             options.push(`"set": [${s.join(",")}]`);
         }

package/build/src/traversal.d.ts

@@ -28,6 +28,7 @@ export declare class Traversal {
     private mapVisibility;
     buildAttributes(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined, scope: abaplint.ISpaghettiScopeNode | undefined, prefix?: string): string[];
     isBuiltinMethod(token: abaplint.Token): boolean;
+    isSQLConversion(token: abaplint.Token): string | undefined;
     findMethodReference(token: abaplint.Token, scope: ISpaghettiScopeNode | undefined): undefined | {
         def: abaplint.Types.MethodDefinition;
         name: string;

package/build/src/traversal.js

@@ -241,6 +241,15 @@ class Traversal {
         }
         return false;
     }
+    isSQLConversion(token) {
+        const scope = this.findCurrentScopeByToken(token);
+        for (const s of (scope === null || scope === void 0 ? void 0 : scope.getData().sqlConversion) || []) {
+            if (s.token.getStart().equals(token.getStart())) {
+                return s.fieldName;
+            }
+        }
+        return undefined;
+    }
     findMethodReference(token, scope) {
         var _a, _b;
         let candidate = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.7.4",
+  "version": "2.7.6",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.100.3",
+    "@abaplint/core": "^2.101.0",
     "source-map": "^0.7.4"
   },
   "devDependencies": {