@entity-access/entity-access 1.0.201 → 1.0.203

package/src/query/ast/ExpressionToSql.ts

@@ -323,7 +323,9 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
     }
 
     visitIdentifier(e: Identifier): ITextQuery {
-        // need to visit parameters
+        if (e.quoted) {
+            return [this.compiler.quote(e.value)];
+        }
         return [e.value];
     }
 
@@ -358,10 +360,10 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
                 const name = this.scope.nameOf(parameter);
 
                 // need to change name as per naming convention here...
-                const namingConvention = this.compiler.namingConvention;
-                if (scope.model && namingConvention) {
-                    chain[0] = namingConvention(chain[0]);
-                }
+                // const namingConvention = this.compiler.namingConvention;
+                // if (scope.model && namingConvention) {
+                //     chain[0] = namingConvention(chain[0]);
+                // }
 
                 return [ QueryParameter.create(() => name) , "." , chain.join(".")];
             }
@@ -669,7 +671,11 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
             const scope = this.scope.get(pe);
             const peModel = scope?.model;
             if (peModel) {
-                const { relation } = peModel.getProperty(id.value);
+                const { relation, field } = peModel.getProperty(id.value);
+                if (field) {
+                    // we need to replace field with column name...
+                    return Expression.member(target, field.columnName);
+                }
                 if (relation) {
 
                     const { fkColumn } = relation;

package/src/query/ast/Expressions.ts

@@ -66,6 +66,10 @@ export abstract class Expression {
         return Identifier.create({ value: name });
     }
 
+    static quotedIdentifier(name: string) {
+        return Identifier.create({ value: name, quoted: true });
+    }
+
     static logicalAnd(left: Expression, right: Expression): BinaryExpression {
         return BinaryExpression.create({ left, operator: "AND", right});
     }
@@ -307,6 +311,7 @@ export class Constant extends Expression {
 export class Identifier extends Expression {
     readonly type = "Identifier";
     public value: string;
+    public quoted: boolean;
 }
 
 export class NullExpression extends Expression {

package/src/tests/db-tests/tests/select-map.ts

@@ -0,0 +1,19 @@
+import assert from "assert";
+import { TestConfig } from "../../TestConfig.js";
+import { createContext, headPhoneCategory } from "../../model/createContext.js";
+import Sql from "../../../sql/Sql.js";
+
+export default async function(this: TestConfig) {
+
+    if (!this.db) {
+        return;
+    }
+
+    const context = await createContext(this.driver);
+
+    const f = await context.orderItems.all()
+        .map({}, (p) => ({ orderID, amount }) => ({ orderID, amount }))
+        .first();
+
+    console.log(f);
+}