typeorm 0.3.27-dev.22b26d1 → 0.3.27-dev.34d8714

package/query-builder/SelectQueryBuilder.js

@@ -907,6 +907,11 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
         const hasOffset = this.expressionMap.offset !== undefined &&
             this.expressionMap.offset !== null &&
             this.expressionMap.offset > 0;
+        if (entitiesAndRaw.entities.length === 0 && (hasSkip || hasOffset)) {
+            // when skip or offset were used and no results found, we need to execute a full count
+            // (the given offset may have exceeded the actual number of rows)
+            return undefined;
+        }
         // offset overrides skip when no join is defined
         const previousResults = hasOffset
             ? this.expressionMap.offset
@@ -2499,22 +2504,47 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
         else {
             const andConditions = [];
             for (const key in where) {
-                if (where[key] === undefined || where[key] === null)
-                    continue;
+                let parameterValue = where[key];
                 const propertyPath = embedPrefix ? embedPrefix + "." + key : key;
                 const column = metadata.findColumnWithPropertyPathStrict(propertyPath);
                 const embed = metadata.findEmbeddedWithPropertyPath(propertyPath);
                 const relation = metadata.findRelationWithPropertyPath(propertyPath);
-                if (!embed && !column && !relation)
+                if (!embed && !column && !relation) {
                     throw new EntityPropertyNotFoundError_1.EntityPropertyNotFoundError(propertyPath, metadata);
+                }
+                if (parameterValue === undefined) {
+                    const undefinedBehavior = this.connection.options.invalidWhereValuesBehavior
+                        ?.undefined || "ignore";
+                    if (undefinedBehavior === "throw") {
+                        throw new error_1.TypeORMError(`Undefined value encountered in property '${alias}.${key}' of a where condition. ` +
+                            `Set 'invalidWhereValuesBehavior.undefined' to 'ignore' in connection options to skip properties with undefined values.`);
+                    }
+                    continue;
+                }
+                if (parameterValue === null) {
+                    const nullBehavior = this.connection.options.invalidWhereValuesBehavior
+                        ?.null || "ignore";
+                    if (nullBehavior === "ignore") {
+                        continue;
+                    }
+                    else if (nullBehavior === "throw") {
+                        throw new error_1.TypeORMError(`Null value encountered in property '${alias}.${key}' of a where condition. ` +
+                            `To match with SQL NULL, the IsNull() operator must be used. ` +
+                            `Set 'invalidWhereValuesBehavior.null' to 'ignore' or 'sql-null' in connection options to skip or handle null values.`);
+                    }
+                    // 'sql-null' behavior continues to the next logic
+                }
                 if (column) {
                     let aliasPath = `${alias}.${propertyPath}`;
                     if (column.isVirtualProperty && column.query) {
                         aliasPath = `(${column.query(this.escape(alias))})`;
                     }
+                    if (parameterValue === null) {
+                        andConditions.push(`${aliasPath} IS NULL`);
+                        continue;
+                    }
                     // const parameterName = alias + "_" + propertyPath.split(".").join("_") + "_" + parameterIndex;
                     // todo: we need to handle other operators as well?
-                    let parameterValue = where[key];
                     if (InstanceChecker_1.InstanceChecker.isEqualOperator(where[key])) {
                         parameterValue = where[key].value;
                     }
@@ -2530,37 +2560,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     if (this.connection.driver.options.type === "mssql") {
                         parameterValue = this.connection.driver.parametrizeValues(column, parameterValue);
                     }
-                    // if (parameterValue === null) {
-                    //     andConditions.push(`${aliasPath} IS NULL`);
-                    //
-                    // } else if (parameterValue instanceof FindOperator) {
-                    //     // let parameters: any[] = [];
-                    //     // if (parameterValue.useParameter) {
-                    //     //     const realParameterValues: any[] = parameterValue.multipleParameters ? parameterValue.value : [parameterValue.value];
-                    //     //     realParameterValues.forEach((realParameterValue, realParameterValueIndex) => {
-                    //     //
-                    //     //         // don't create parameters for number to prevent max number of variables issues as much as possible
-                    //     //         if (typeof realParameterValue === "number") {
-                    //     //             parameters.push(realParameterValue);
-                    //     //
-                    //     //         } else {
-                    //     //             this.expressionMap.nativeParameters[parameterName + realParameterValueIndex] = realParameterValue;
-                    //     //             parameterIndex++;
-                    //     //             parameters.push(this.connection.driver.createParameter(parameterName + realParameterValueIndex, parameterIndex - 1));
-                    //     //         }
-                    //     //     });
-                    //     // }
-                    //     andConditions.push(
-                    //         this.createWhereConditionExpression(this.getWherePredicateCondition(aliasPath, parameterValue))
-                    //         // parameterValue.toSql(this.connection, aliasPath, parameters));
-                    //     )
-                    //
-                    // } else {
-                    //     this.expressionMap.nativeParameters[parameterName] = parameterValue;
-                    //     parameterIndex++;
-                    //     const parameter = this.connection.driver.createParameter(parameterName, parameterIndex - 1);
-                    //     andConditions.push(`${aliasPath} = ${parameter}`);
-                    // }
                     andConditions.push(this.createWhereConditionExpression(this.getWherePredicateCondition(aliasPath, parameterValue)));
                     // this.conditions.push(`${alias}.${propertyPath} = :${paramName}`);
                     // this.expressionMap.parameters[paramName] = where[key]; // todo: handle functions and other edge cases
@@ -2571,6 +2570,19 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         andConditions.push(condition);
                 }
                 else if (relation) {
+                    if (where[key] === null) {
+                        const nullBehavior = this.connection.options.invalidWhereValuesBehavior
+                            ?.null || "ignore";
+                        if (nullBehavior === "sql-null") {
+                            andConditions.push(`${alias}.${propertyPath} IS NULL`);
+                        }
+                        else if (nullBehavior === "throw") {
+                            throw new error_1.TypeORMError(`Null value encountered in property '${alias}.${key}' of a where condition. ` +
+                                `Set 'invalidWhereValuesBehavior.null' to 'ignore' or 'sql-null' in connection options to skip or handle null values.`);
+                        }
+                        // 'ignore' behavior falls through to continue
+                        continue;
+                    }
                     // if all properties of where are undefined we don't need to join anything
                     // this can happen when user defines map with conditional queries inside
                     if (typeof where[key] === "object") {