refactor: represent wheres internally as conditions (#7854)

this updates the way `QueryBuilder` works to only build the expression
strings when we are actually building queries.  this means we can more
easily separate the concerns between compiling the query and building
queries.  it also allows us to support database specific `where` features
more readily

src/find-options/FindOperator.ts

@@ -91,7 +91,7 @@ export class FindOperator<T> {
     /**
      * Gets the Type of this FindOperator
      */
-    get type(): string {
+    get type(): FindOperatorType {
         return this._type;
     }
 

src/index.ts

@@ -121,7 +121,7 @@ export {InsertQueryBuilder} from "./query-builder/InsertQueryBuilder";
 export {UpdateQueryBuilder} from "./query-builder/UpdateQueryBuilder";
 export {RelationQueryBuilder} from "./query-builder/RelationQueryBuilder";
 export {Brackets} from "./query-builder/Brackets";
-export {WhereExpression} from "./query-builder/WhereExpression";
+export {WhereExpressionBuilder} from "./query-builder/WhereExpressionBuilder";
 export {InsertResult} from "./query-builder/result/InsertResult";
 export {UpdateResult} from "./query-builder/result/UpdateResult";
 export {DeleteResult} from "./query-builder/result/DeleteResult";

src/query-builder/Brackets.ts

@@ -1,4 +1,4 @@
-import {WhereExpression} from "./WhereExpression";
+import {WhereExpressionBuilder} from "./WhereExpressionBuilder";
 
 /**
  * Syntax sugar.
@@ -9,13 +9,13 @@ export class Brackets {
     /**
      * WHERE expression that will be taken into brackets.
      */
-    whereFactory: (qb: WhereExpression) => any;
+    whereFactory: (qb: WhereExpressionBuilder) => any;
 
     /**
      * Given WHERE query builder that will build a WHERE expression that will be taken into brackets.
      */
-    constructor(whereFactory: (qb: WhereExpression) => any) {
+    constructor(whereFactory: (qb: WhereExpressionBuilder) => any) {
         this.whereFactory = whereFactory;
     }
 
-}
+}

src/query-builder/DeleteQueryBuilder.ts

@@ -7,7 +7,7 @@ import {Connection} from "../connection/Connection";
 import {QueryRunner} from "../query-runner/QueryRunner";
 import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
 import {PostgresDriver} from "../driver/postgres/PostgresDriver";
-import {WhereExpression} from "./WhereExpression";
+import {WhereExpressionBuilder} from "./WhereExpressionBuilder";
 import {Brackets} from "./Brackets";
 import {DeleteResult} from "./result/DeleteResult";
 import {ReturningStatementNotSupportedError} from "../error/ReturningStatementNotSupportedError";
@@ -20,7 +20,7 @@ import {BetterSqlite3Driver} from "../driver/better-sqlite3/BetterSqlite3Driver"
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
-export class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> implements WhereExpression {
+export class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> implements WhereExpressionBuilder {
 
     // -------------------------------------------------------------------------
     // Constructor
@@ -149,7 +149,7 @@ export class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> implements
      */
     where(where: Brackets|string|((qb: this) => string)|ObjectLiteral|ObjectLiteral[], parameters?: ObjectLiteral): this {
         this.expressionMap.wheres = []; // don't move this block below since computeWhereParameter can add where expressions
-        const condition = this.computeWhereParameter(where);
+        const condition = this.getWhereCondition(where);
         if (condition)
             this.expressionMap.wheres = [{ type: "simple", condition: condition }];
         if (parameters)
@@ -162,7 +162,7 @@ export class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> implements
      * Additionally you can add parameters used in where expression.
      */
     andWhere(where: Brackets|string|((qb: this) => string)|ObjectLiteral|ObjectLiteral[], parameters?: ObjectLiteral): this {
-        this.expressionMap.wheres.push({ type: "and", condition: this.computeWhereParameter(where) });
+        this.expressionMap.wheres.push({ type: "and", condition: this.getWhereCondition(where) });
         if (parameters) this.setParameters(parameters);
         return this;
     }
@@ -172,7 +172,7 @@ export class DeleteQueryBuilder<Entity> extends QueryBuilder<Entity> implements
      * Additionally you can add parameters used in where expression.
      */
     orWhere(where: Brackets|string|((qb: this) => string)|ObjectLiteral|ObjectLiteral[], parameters?: ObjectLiteral): this {
-        this.expressionMap.wheres.push({ type: "or", condition: this.computeWhereParameter(where) });
+        this.expressionMap.wheres.push({ type: "or", condition: this.getWhereCondition(where) });
         if (parameters) this.setParameters(parameters);
         return this;
     }