typeorm 0.3.18-dev.ff6e875 → 0.3.19-dev.633c4e3

package/query-builder/QueryBuilder.js

@@ -46,6 +46,9 @@ class QueryBuilder {
             this.expressionMap = connectionOrQueryBuilder.expressionMap.clone();
         }
     }
+    static registerQueryBuilderClass(name, factory) {
+        QueryBuilder.queryBuilderRegistry[name] = factory;
+    }
     // -------------------------------------------------------------------------
     // Accessors
     // -------------------------------------------------------------------------
@@ -73,22 +76,18 @@ class QueryBuilder {
                 { selection: selection, aliasName: selectionAliasName },
             ];
         }
-        // loading it dynamically because of circular issue
-        const SelectQueryBuilderCls = require("./SelectQueryBuilder").SelectQueryBuilder;
         if (InstanceChecker_1.InstanceChecker.isSelectQueryBuilder(this))
             return this;
-        return new SelectQueryBuilderCls(this);
+        return QueryBuilder.queryBuilderRegistry["SelectQueryBuilder"](this);
     }
     /**
      * Creates INSERT query.
      */
     insert() {
         this.expressionMap.queryType = "insert";
-        // loading it dynamically because of circular issue
-        const InsertQueryBuilderCls = require("./InsertQueryBuilder").InsertQueryBuilder;
         if (InstanceChecker_1.InstanceChecker.isInsertQueryBuilder(this))
             return this;
-        return new InsertQueryBuilderCls(this);
+        return QueryBuilder.queryBuilderRegistry["InsertQueryBuilder"](this);
     }
     /**
      * Creates UPDATE query and applies given update values.
@@ -107,38 +106,30 @@ class QueryBuilder {
         }
         this.expressionMap.queryType = "update";
         this.expressionMap.valuesSet = updateSet;
-        // loading it dynamically because of circular issue
-        const UpdateQueryBuilderCls = require("./UpdateQueryBuilder").UpdateQueryBuilder;
         if (InstanceChecker_1.InstanceChecker.isUpdateQueryBuilder(this))
             return this;
-        return new UpdateQueryBuilderCls(this);
+        return QueryBuilder.queryBuilderRegistry["UpdateQueryBuilder"](this);
     }
     /**
      * Creates DELETE query.
      */
     delete() {
         this.expressionMap.queryType = "delete";
-        // loading it dynamically because of circular issue
-        const DeleteQueryBuilderCls = require("./DeleteQueryBuilder").DeleteQueryBuilder;
         if (InstanceChecker_1.InstanceChecker.isDeleteQueryBuilder(this))
             return this;
-        return new DeleteQueryBuilderCls(this);
+        return QueryBuilder.queryBuilderRegistry["DeleteQueryBuilder"](this);
     }
     softDelete() {
         this.expressionMap.queryType = "soft-delete";
-        // loading it dynamically because of circular issue
-        const SoftDeleteQueryBuilderCls = require("./SoftDeleteQueryBuilder").SoftDeleteQueryBuilder;
         if (InstanceChecker_1.InstanceChecker.isSoftDeleteQueryBuilder(this))
             return this;
-        return new SoftDeleteQueryBuilderCls(this);
+        return QueryBuilder.queryBuilderRegistry["SoftDeleteQueryBuilder"](this);
     }
     restore() {
         this.expressionMap.queryType = "restore";
-        // loading it dynamically because of circular issue
-        const SoftDeleteQueryBuilderCls = require("./SoftDeleteQueryBuilder").SoftDeleteQueryBuilder;
         if (InstanceChecker_1.InstanceChecker.isSoftDeleteQueryBuilder(this))
             return this;
-        return new SoftDeleteQueryBuilderCls(this);
+        return QueryBuilder.queryBuilderRegistry["SoftDeleteQueryBuilder"](this);
     }
     /**
      * Sets entity's relation with which this query builder gonna work.
@@ -154,11 +145,9 @@ class QueryBuilder {
             const mainAlias = this.createFromAlias(entityTarget);
             this.expressionMap.setMainAlias(mainAlias);
         }
-        // loading it dynamically because of circular issue
-        const RelationQueryBuilderCls = require("./RelationQueryBuilder").RelationQueryBuilder;
         if (InstanceChecker_1.InstanceChecker.isRelationQueryBuilder(this))
             return this;
-        return new RelationQueryBuilderCls(this);
+        return QueryBuilder.queryBuilderRegistry["RelationQueryBuilder"](this);
     }
     /**
      * Checks if given relation or relations exist in the entity.
@@ -532,7 +521,7 @@ class QueryBuilder {
         // In some dialects query nesting is available - but not all.  Because of this, we'll need
         // to scrub "ending" characters from the SQL but otherwise we can leave everything else
         // as-is and it should be valid.
-        return `/* ${this.expressionMap.comment.replace("*/", "")} */ `;
+        return `/* ${this.expressionMap.comment.replace(/\*\//g, "")} */ `;
     }
     /**
      * Time travel queries for CockroachDB
@@ -679,9 +668,19 @@ class QueryBuilder {
             const expression = this.createWhereConditionExpression(clause.condition);
             switch (clause.type) {
                 case "and":
-                    return (index > 0 ? "AND " : "") + expression;
+                    return ((index > 0 ? "AND " : "") +
+                        `${this.connection.options.isolateWhereStatements
+                            ? "("
+                            : ""}${expression}${this.connection.options.isolateWhereStatements
+                            ? ")"
+                            : ""}`);
                 case "or":
-                    return (index > 0 ? "OR " : "") + expression;
+                    return ((index > 0 ? "OR " : "") +
+                        `${this.connection.options.isolateWhereStatements
+                            ? "("
+                            : ""}${expression}${this.connection.options.isolateWhereStatements
+                            ? ")"
+                            : ""}`);
             }
             return expression;
         })
@@ -757,6 +756,8 @@ class QueryBuilder {
                 return `${this.createWhereConditionExpression(condition.condition, true)}`;
             case "and":
                 return condition.parameters.join(" AND ");
+            case "or":
+                return condition.parameters.join(" OR ");
         }
         throw new TypeError(`Unsupported FindOperator ${FindOperator_1.FindOperator.constructor.name}`);
     }
@@ -1048,6 +1049,13 @@ class QueryBuilder {
                     parameters: values.map((operator) => this.createWhereConditionExpression(this.getWherePredicateCondition(aliasPath, operator))),
                 };
             }
+            else if (parameterValue.type === "or") {
+                const values = parameterValue.value;
+                return {
+                    operator: parameterValue.type,
+                    parameters: values.map((operator) => this.createWhereConditionExpression(this.getWherePredicateCondition(aliasPath, operator))),
+                };
+            }
             else {
                 return {
                     operator: parameterValue.type,
@@ -1125,5 +1133,9 @@ class QueryBuilder {
     }
 }
 exports.QueryBuilder = QueryBuilder;
+/**
+ * Contains all registered query builder classes.
+ */
+QueryBuilder.queryBuilderRegistry = {};
 
 //# sourceMappingURL=QueryBuilder.js.map