#1387 - Adicionada possibilidade de informar em um where uma coluna para um alias da projection onde ele não aplique o alias padrão da tabela

Author: fernandocode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "database-builder",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "Library to assist in creating and maintaining SQL commands.",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

src/core/column-params.ts

@@ -1,6 +1,7 @@
 import { ValueTypeToParse } from "./utils";
+import { Resultable } from "./resultable";
 
 export interface ColumnParams {
-    column: string;
+    column: string | Resultable;
     params: ValueTypeToParse[];
 }

src/core/column-ref.ts

@@ -1,5 +1,6 @@
+import { Resultable } from "./resultable";
 
-export class ColumnRef {
+export class ColumnRef implements Resultable {
     constructor(
         public column?: string,
         public alias?: string

src/core/plan-ref.ts

@@ -1,5 +1,6 @@
+import { Resultable } from "./resultable";
 
-export class PlanRef {
+export class PlanRef implements Resultable {
     constructor(
         public value?: string
     ) {

src/core/resultable.ts

@@ -0,0 +1,3 @@
+export interface Resultable {
+    result(): string;
+}

src/core/utils.ts

@@ -24,6 +24,7 @@ import { MetadataTableBase } from "../metadata-table-base";
 import { ProjectionCompile } from "../crud/projection-compile";
 import * as lodash from "lodash";
 import { QueryCompiled } from ".";
+import { Resultable } from "./resultable";
 
 export type ParamType = ValueType | ReplacementParam;
 
@@ -169,6 +170,13 @@ export class Utils {
         return instance instanceof PlanRef;
     }
 
+    public static isResultable(instance: any): instance is Resultable {
+        return instance
+            && this.isObject(instance)
+            && "result" in instance
+            && this.isFunction(instance.result);
+    }
+
     public static isEmpty(value: any): boolean {
         if (this.isBoolean(value) || this.isDate(value)) {
             return this.isNull(value);
@@ -247,13 +255,14 @@ export class Utils {
                     params: []
                 };
             case (ExpressionOrValueEnum.Ref):
-                return {
-                    column: (expression as ColumnRef).result(),
-                    params: []
-                };
+            // return {
+            //     column: (expression as ColumnRef).result(),
+            //     params: []
+            // };
             case (ExpressionOrValueEnum.Plan):
                 return {
-                    column: (expression as PlanRef).result(),
+                    // column: (expression as PlanRef).result(),
+                    column: expression as Resultable,
                     params: []
                 };
             case (ExpressionOrValueEnum.Value):
@@ -381,12 +390,15 @@ export class Utils {
     }
 
     public static addAlias(
-        column: string, alias: string
+        column: string | Resultable, alias: string
     ): string {
-        if (column && alias && Utils.isNameColumn(column)) {
+        if (this.isResultable(column)) {
+            return (column as Resultable).result();
+        }
+        if (column && alias && Utils.isNameColumn(column as string)) {
             return `${alias}.${column}`;
         }
-        return column;
+        return column as string;
     }
 
     private static isColumnReservedNameOrNotAllowed(columnName: string): boolean {

src/crud/where-base-builder.ts

@@ -455,7 +455,7 @@ export abstract class WhereBaseBuilder<
                 params: []
             } as ColumnParams;
             param.forEach((value) => {
-                result.column += result.column.length > 0 ? ", ?" : "?";
+                result.column += (result.column as string).length > 0 ? ", ?" : "?";
                 result.params.push(value);
             });
             return result;

src/test/executable-builder.spec.ts

@@ -9,12 +9,11 @@ describe("ExecutableBuilder", () => {
 
     beforeEach(async () => {
         database = await new SQLiteDatabase().init();
-        console.log("database", database);
     });
 
     it("build sql batch", () => {
 
-        const execute = new ExecutableBuilder(true);
+        const execute = new ExecutableBuilder(false);
         const compiled = [
             {
                 query: "DROP TABLE IF EXISTS MyTable",
@@ -53,7 +52,7 @@ describe("ExecutableBuilder", () => {
     });
 
     it("executeBatch", async () => {
-        const execute = new ExecutableBuilder(true);
+        const execute = new ExecutableBuilder(false);
         const compiled = [
             {
                 query: "DROP TABLE IF EXISTS MyTable",
@@ -69,8 +68,6 @@ describe("ExecutableBuilder", () => {
             } as QueryCompiled
         ];
         const result = await execute.executeBatch(compiled, database).toPromise();
-        console.log("result", result.length, result);
-        console.log("equal", result.length, compiled.length);
         expect(result.length).to.equal(compiled.length);
         expect(result[2].rowsAffected).to.equal(1);
         expect(result[2].insertId).to.equal(1);

src/test/where.spec.ts

@@ -6,6 +6,8 @@ import * as moment from "moment";
 import { Crud } from "../crud/crud";
 import { getMapper } from "./mappers-table-new";
 import { TestClazzRef } from "./models/test-clazz-ref";
+import { PlanRef } from "../core/plan-ref";
+import { ColumnRef } from "../core/column-ref";
 
 describe("Where", () => {
 
@@ -632,4 +634,18 @@ describe("Where", () => {
         expect(result[0].query).to.equal("SELECT (tes.id || tes.description) AS iddescription FROM TestClazz AS tes WHERE (tes.id || tes.description) = ?");
     });
 
+    it("where in column alias by projection without alias table default", () => {
+        const query = crud.query(TestClazz);
+        query.projection(projection => {
+            projection.add(x => x.id, "iiiiddd");
+        });
+        query.where(where => {
+            where.equal(new PlanRef("iiiiddd"), x => x.id);
+            where.equal(new ColumnRef("description", query.alias()), new ColumnRef("dateStr"));
+        });
+        const result = query.compile();
+        expect(result[0].params.length).to.equal(0);
+        expect(result[0].query).to.equal("SELECT tes.id AS iiiiddd FROM TestClazz AS tes WHERE iiiiddd = tes.id AND tes.description = dateStr");
+    });
+
 });