typeorm 0.2.25 → 0.2.29

package/browser/query-builder/QueryBuilder.js

@@ -1,8 +1,10 @@
-import * as tslib_1 from "tslib";
+import { __awaiter, __generator, __read, __spread, __values } from "tslib";
 import { QueryExpressionMap } from "./QueryExpressionMap";
 import { Brackets } from "./Brackets";
 import { EntityMetadata } from "../metadata/EntityMetadata";
 import { SqljsDriver } from "../driver/sqljs/SqljsDriver";
+import { PostgresDriver } from "../driver/postgres/PostgresDriver";
+import { CockroachDriver } from "../driver/cockroachdb/CockroachDriver";
 import { SqlServerDriver } from "../driver/sqlserver/SqlServerDriver";
 import { OracleDriver } from "../driver/oracle/OracleDriver";
 import { EntitySchema } from "../";
@@ -220,7 +222,7 @@ var QueryBuilder = /** @class */ (function () {
      * Prints sql to stdout using console.log.
      */
     QueryBuilder.prototype.printSql = function () {
-        var _a = tslib_1.__read(this.getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
+        var _a = __read(this.getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
         this.connection.logger.logQuery(query, parameters);
         return this;
     };
@@ -244,12 +246,12 @@ var QueryBuilder = /** @class */ (function () {
      * Executes sql generated by query builder and returns raw database results.
      */
     QueryBuilder.prototype.execute = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a, sql, parameters, queryRunner;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = tslib_1.__read(this.getQueryAndParameters(), 2), sql = _a[0], parameters = _a[1];
+                        _a = __read(this.getQueryAndParameters(), 2), sql = _a[0], parameters = _a[1];
                         queryRunner = this.obtainQueryRunner();
                         _b.label = 1;
                     case 1:
@@ -290,6 +292,15 @@ var QueryBuilder = /** @class */ (function () {
     QueryBuilder.prototype.clone = function () {
         return new this.constructor(this);
     };
+    /**
+     * Includes a Query comment in the query builder.  This is helpful for debugging purposes,
+     * such as finding a specific query in the database server's logs, or for categorization using
+     * an APM product.
+     */
+    QueryBuilder.prototype.comment = function (comment) {
+        this.expressionMap.comment = comment;
+        return this;
+    };
     /**
      * Disables escaping.
      */
@@ -371,21 +382,22 @@ var QueryBuilder = /** @class */ (function () {
             });
         }
         else {
-            var subQuery = "";
-            if (entityTarget instanceof Function) {
-                var subQueryBuilder = entityTarget(this.subQuery());
-                this.setParameters(subQueryBuilder.getParameters());
-                subQuery = subQueryBuilder.getQuery();
-            }
-            else {
-                subQuery = entityTarget;
+            if (typeof entityTarget === "string") {
+                var isSubquery = entityTarget.substr(0, 1) === "(" && entityTarget.substr(-1) === ")";
+                return this.expressionMap.createAlias({
+                    type: "from",
+                    name: aliasName,
+                    tablePath: !isSubquery ? entityTarget : undefined,
+                    subQuery: isSubquery ? entityTarget : undefined,
+                });
             }
-            var isSubQuery = entityTarget instanceof Function || entityTarget.substr(0, 1) === "(" && entityTarget.substr(-1) === ")";
+            var subQueryBuilder = entityTarget(this.subQuery());
+            this.setParameters(subQueryBuilder.getParameters());
+            var subquery = subQueryBuilder.getQuery();
             return this.expressionMap.createAlias({
                 type: "from",
                 name: aliasName,
-                tablePath: isSubQuery === false ? entityTarget : undefined,
-                subQuery: isSubQuery === true ? subQuery : undefined,
+                subQuery: subquery
             });
         }
     };
@@ -393,36 +405,107 @@ var QueryBuilder = /** @class */ (function () {
      * Replaces all entity's propertyName to name in the given statement.
      */
     QueryBuilder.prototype.replacePropertyNames = function (statement) {
+        var e_1, _a;
         var _this = this;
-        this.expressionMap.aliases.forEach(function (alias) {
+        // Escape special characters in regular expressions
+        // Per https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Escaping
+        var escapeRegExp = function (s) { return s.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&"); };
+        var _loop_1 = function (alias) {
+            var e_2, _a, e_3, _b, e_4, _c;
             if (!alias.hasMetadata)
-                return;
-            var replaceAliasNamePrefix = _this.expressionMap.aliasNamePrefixingEnabled ? alias.name + "\\." : "";
-            var replacementAliasNamePrefix = _this.expressionMap.aliasNamePrefixingEnabled ? _this.escape(alias.name) + "." : "";
-            alias.metadata.columns.forEach(function (column) {
-                var expression = "([ =\(]|^.{0})" + replaceAliasNamePrefix + column.propertyPath + "([ =\)\,]|.{0}$)";
-                statement = statement.replace(new RegExp(expression, "gm"), "$1" + replacementAliasNamePrefix + _this.escape(column.databaseName) + "$2");
-                var expression2 = "([ =\(]|^.{0})" + replaceAliasNamePrefix + column.propertyName + "([ =\)\,]|.{0}$)";
-                statement = statement.replace(new RegExp(expression2, "gm"), "$1" + replacementAliasNamePrefix + _this.escape(column.databaseName) + "$2");
-            });
-            alias.metadata.relations.forEach(function (relation) {
-                tslib_1.__spread(relation.joinColumns, relation.inverseJoinColumns).forEach(function (joinColumn) {
-                    var expression = "([ =\(]|^.{0})" + replaceAliasNamePrefix + relation.propertyPath + "\\." + joinColumn.referencedColumn.propertyPath + "([ =\)\,]|.{0}$)";
-                    statement = statement.replace(new RegExp(expression, "gm"), "$1" + replacementAliasNamePrefix + _this.escape(joinColumn.databaseName) + "$2"); // todo: fix relation.joinColumns[0], what if multiple columns
-                });
-                if (relation.joinColumns.length > 0) {
-                    var expression = "([ =\(]|^.{0})" + replaceAliasNamePrefix + relation.propertyPath + "([ =\)\,]|.{0}$)";
-                    statement = statement.replace(new RegExp(expression, "gm"), "$1" + replacementAliasNamePrefix + _this.escape(relation.joinColumns[0].databaseName) + "$2"); // todo: fix relation.joinColumns[0], what if multiple columns
+                return "continue";
+            var replaceAliasNamePrefix = this_1.expressionMap.aliasNamePrefixingEnabled ? alias.name + "." : "";
+            var replacementAliasNamePrefix = this_1.expressionMap.aliasNamePrefixingEnabled ? this_1.escape(alias.name) + "." : "";
+            var replacements = {};
+            try {
+                for (var _d = (e_2 = void 0, __values(alias.metadata.columns)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var column = _e.value;
+                    if (!(column.propertyPath in replacements))
+                        replacements[column.propertyPath] = column.databaseName;
+                    if (!(column.propertyName in replacements))
+                        replacements[column.propertyName] = column.databaseName;
+                    if (!(column.databaseName in replacements))
+                        replacements[column.databaseName] = column.databaseName;
                 }
-            });
-        });
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            try {
+                for (var _f = (e_3 = void 0, __values(alias.metadata.relations)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    var relation = _g.value;
+                    try {
+                        for (var _h = (e_4 = void 0, __values(__spread(relation.joinColumns, relation.inverseJoinColumns))), _j = _h.next(); !_j.done; _j = _h.next()) {
+                            var joinColumn = _j.value;
+                            var key = relation.propertyPath + "." + joinColumn.referencedColumn.propertyPath;
+                            if (!(key in replacements))
+                                replacements[key] = joinColumn.databaseName;
+                        }
+                    }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                    }
+                    if (relation.joinColumns.length > 0 && !(relation.propertyPath in replacements))
+                        replacements[relation.propertyPath] = relation.joinColumns[0].databaseName;
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            var replacementKeys = Object.keys(replacements);
+            if (replacementKeys.length) {
+                statement = statement.replace(new RegExp("(?<=[ =(]|^.{0})" +
+                    (escapeRegExp(replaceAliasNamePrefix) + "(" + replacementKeys.map(escapeRegExp).join("|") + ")") +
+                    "(?=[ =),]|.{0}$)", "gm"), function (_, p) {
+                    return "" + replacementAliasNamePrefix + _this.escape(replacements[p]);
+                });
+            }
+        };
+        var this_1 = this;
+        try {
+            for (var _b = __values(this.expressionMap.aliases), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var alias = _c.value;
+                _loop_1(alias);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
         return statement;
     };
+    QueryBuilder.prototype.createComment = function () {
+        if (!this.expressionMap.comment) {
+            return "";
+        }
+        // ANSI SQL 2003 support C style comments - comments that start with `/*` and end with `*/`
+        // 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("*/", "") + " */ ";
+    };
     /**
      * Creates "WHERE" expression.
      */
     QueryBuilder.prototype.createWhereExpression = function () {
-        var conditions = this.createWhereExpressionString();
+        var conditionsArray = [];
+        var whereExpression = this.createWhereExpressionString();
+        whereExpression.trim() && conditionsArray.push(this.createWhereExpressionString());
         if (this.expressionMap.mainAlias.hasMetadata) {
             var metadata = this.expressionMap.mainAlias.metadata;
             // Adds the global condition of "non-deleted" for the entity with delete date columns in select query.
@@ -431,21 +514,29 @@ var QueryBuilder = /** @class */ (function () {
                     ? this.expressionMap.mainAlias.name + "." + metadata.deleteDateColumn.propertyName
                     : metadata.deleteDateColumn.propertyName;
                 var condition = this.replacePropertyNames(column) + " IS NULL";
-                conditions = (conditions.length ? "(" + conditions + ") AND" : "") + " " + condition;
+                conditionsArray.push(condition);
             }
             if (metadata.discriminatorColumn && metadata.parentEntityMetadata) {
                 var column = this.expressionMap.aliasNamePrefixingEnabled
                     ? this.expressionMap.mainAlias.name + "." + metadata.discriminatorColumn.databaseName
                     : metadata.discriminatorColumn.databaseName;
                 var condition = this.replacePropertyNames(column) + " IN (:...discriminatorColumnValues)";
-                return " WHERE " + (conditions.length ? "(" + conditions + ") AND" : "") + " " + condition;
+                conditionsArray.push(condition);
             }
         }
-        if (!conditions.length) // TODO copy in to discriminator condition
-            return this.expressionMap.extraAppendedAndWhereCondition ? " WHERE " + this.replacePropertyNames(this.expressionMap.extraAppendedAndWhereCondition) : "";
-        if (this.expressionMap.extraAppendedAndWhereCondition)
-            return " WHERE (" + conditions + ") AND " + this.replacePropertyNames(this.expressionMap.extraAppendedAndWhereCondition);
-        return " WHERE " + conditions;
+        if (this.expressionMap.extraAppendedAndWhereCondition) {
+            var condition = this.replacePropertyNames(this.expressionMap.extraAppendedAndWhereCondition);
+            conditionsArray.push(condition);
+        }
+        if (!conditionsArray.length) {
+            return " ";
+        }
+        else if (conditionsArray.length === 1) {
+            return " WHERE " + conditionsArray[0];
+        }
+        else {
+            return " WHERE ( " + conditionsArray.join(" ) AND ( ") + " )";
+        }
     };
     /**
      * Creates "RETURNING" / "OUTPUT" expression.
@@ -459,7 +550,7 @@ var QueryBuilder = /** @class */ (function () {
         if (typeof this.expressionMap.returning !== "string" &&
             this.expressionMap.extraReturningColumns.length > 0 &&
             driver.isReturningSqlSupported()) {
-            columns.push.apply(columns, tslib_1.__spread(this.expressionMap.extraReturningColumns.filter(function (column) {
+            columns.push.apply(columns, __spread(this.expressionMap.extraReturningColumns.filter(function (column) {
                 return columns.indexOf(column) === -1;
             })));
         }
@@ -507,7 +598,7 @@ var QueryBuilder = /** @class */ (function () {
         if (Array.isArray(this.expressionMap.returning)) {
             this.expressionMap.returning.forEach(function (columnName) {
                 if (_this.expressionMap.mainAlias.hasMetadata) {
-                    columns.push.apply(columns, tslib_1.__spread(_this.expressionMap.mainAlias.metadata.findColumnsWithPropertyPath(columnName)));
+                    columns.push.apply(columns, __spread(_this.expressionMap.mainAlias.metadata.findColumnsWithPropertyPath(columnName)));
                 }
             });
         }
@@ -533,8 +624,8 @@ var QueryBuilder = /** @class */ (function () {
      * Creates "WHERE" expression and variables for the given "ids".
      */
     QueryBuilder.prototype.createWhereIdsExpression = function (ids) {
-        var _this = this;
         var _a;
+        var _this = this;
         var metadata = this.expressionMap.mainAlias.metadata;
         var normalized = (Array.isArray(ids) ? ids : [ids]).map(function (id) { return metadata.ensureEntityIdMap(id); });
         // using in(...ids) for single primary key entities
@@ -576,6 +667,9 @@ var QueryBuilder = /** @class */ (function () {
             return where;
         if (where instanceof Brackets) {
             var whereQueryBuilder = this.createQueryBuilder();
+            whereQueryBuilder.expressionMap.mainAlias = this.expressionMap.mainAlias;
+            whereQueryBuilder.expressionMap.aliasNamePrefixingEnabled = this.expressionMap.aliasNamePrefixingEnabled;
+            whereQueryBuilder.expressionMap.nativeParameters = this.expressionMap.nativeParameters;
             where.whereFactory(whereQueryBuilder);
             var whereString = whereQueryBuilder.createWhereExpressionString();
             this.setParameters(whereQueryBuilder.getParameters());
@@ -607,14 +701,19 @@ var QueryBuilder = /** @class */ (function () {
                             else if (parameterValue instanceof FindOperator) {
                                 var parameters_1 = [];
                                 if (parameterValue.useParameter) {
-                                    var realParameterValues = parameterValue.multipleParameters ? parameterValue.value : [parameterValue.value];
-                                    realParameterValues.forEach(function (realParameterValue, realParameterValueIndex) {
-                                        _this.expressionMap.nativeParameters[parameterName + (parameterBaseCount + realParameterValueIndex)] = realParameterValue;
-                                        parameterIndex_1++;
-                                        parameters_1.push(_this.connection.driver.createParameter(parameterName + (parameterBaseCount + realParameterValueIndex), parameterIndex_1 - 1));
-                                    });
+                                    if (parameterValue.objectLiteralParameters) {
+                                        _this.setParameters(parameterValue.objectLiteralParameters);
+                                    }
+                                    else {
+                                        var realParameterValues = parameterValue.multipleParameters ? parameterValue.value : [parameterValue.value];
+                                        realParameterValues.forEach(function (realParameterValue, realParameterValueIndex) {
+                                            _this.expressionMap.nativeParameters[parameterName + (parameterBaseCount + realParameterValueIndex)] = realParameterValue;
+                                            parameterIndex_1++;
+                                            parameters_1.push(_this.connection.driver.createParameter(parameterName + (parameterBaseCount + realParameterValueIndex), parameterIndex_1 - 1));
+                                        });
+                                    }
                                 }
-                                return parameterValue.toSql(_this.connection, aliasPath, parameters_1);
+                                return _this.computeFindOperatorExpression(parameterValue, aliasPath, parameters_1);
                             }
                             else {
                                 _this.expressionMap.nativeParameters[parameterName] = parameterValue;
@@ -649,11 +748,62 @@ var QueryBuilder = /** @class */ (function () {
         }
         return "";
     };
+    /**
+     * Gets SQL needs to be inserted into final query.
+     */
+    QueryBuilder.prototype.computeFindOperatorExpression = function (operator, aliasPath, parameters) {
+        var driver = this.connection.driver;
+        switch (operator.type) {
+            case "not":
+                if (operator.child) {
+                    return "NOT(" + this.computeFindOperatorExpression(operator.child, aliasPath, parameters) + ")";
+                }
+                else {
+                    return aliasPath + " != " + parameters[0];
+                }
+            case "lessThan":
+                return aliasPath + " < " + parameters[0];
+            case "lessThanOrEqual":
+                return aliasPath + " <= " + parameters[0];
+            case "moreThan":
+                return aliasPath + " > " + parameters[0];
+            case "moreThanOrEqual":
+                return aliasPath + " >= " + parameters[0];
+            case "equal":
+                return aliasPath + " = " + parameters[0];
+            case "ilike":
+                if (driver instanceof PostgresDriver || driver instanceof CockroachDriver) {
+                    return aliasPath + " ILIKE " + parameters[0];
+                }
+                return "UPPER(" + aliasPath + ") LIKE UPPER(" + parameters[0] + ")";
+            case "like":
+                return aliasPath + " LIKE " + parameters[0];
+            case "between":
+                return aliasPath + " BETWEEN " + parameters[0] + " AND " + parameters[1];
+            case "in":
+                if (parameters.length === 0) {
+                    return "0=1";
+                }
+                return aliasPath + " IN (" + parameters.join(", ") + ")";
+            case "any":
+                return aliasPath + " = ANY(" + parameters[0] + ")";
+            case "isNull":
+                return aliasPath + " IS NULL";
+            case "raw":
+                if (operator.getSql) {
+                    return operator.getSql(aliasPath);
+                }
+                else {
+                    return aliasPath + " = " + operator.value;
+                }
+        }
+        throw new TypeError("Unsupported FindOperator " + FindOperator.constructor.name);
+    };
     /**
      * Creates a query builder used to execute sql queries inside this query builder.
      */
     QueryBuilder.prototype.obtainQueryRunner = function () {
-        return this.queryRunner || this.connection.createQueryRunner("master");
+        return this.queryRunner || this.connection.createQueryRunner();
     };
     return QueryBuilder;
 }());