From aa12f786ca7197c36f69d9fcfeaf7ab3a81ba4e4 Mon Sep 17 00:00:00 2001
From: Umed Khudoiberdiev <zarrhost@gmail.com>
Date: Wed, 7 Feb 2018 17:07:35 +0500
Subject: [PATCH] fixed issue when empty with only " AND " query builder
 expression is generated

---
 package.json                      | 2 +-
 src/query-builder/QueryBuilder.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index b387c2388..0a3acbe0d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typeorm",
   "private": true,
-  "version": "0.2.0-alpha.17",
+  "version": "0.2.0-alpha.18",
   "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, WebSQL, MongoDB databases.",
   "license": "MIT",
   "readmeFilename": "README.md",
diff --git a/src/query-builder/QueryBuilder.ts b/src/query-builder/QueryBuilder.ts
index 90033eb9e..f04fc7ecb 100644
--- a/src/query-builder/QueryBuilder.ts
+++ b/src/query-builder/QueryBuilder.ts
@@ -738,8 +738,8 @@ export abstract class QueryBuilder<Entity> {
                                 parameterIndex++;
                                 return `${aliasPath} = ${this.connection.driver.createParameter(parameterName, parameterIndex - 1)}`;
                             }
-                        }).join(" AND ");
-                    }).join(" AND ");
+                        }).filter(expression => !!expression).join(" AND ");
+                    }).filter(expression => !!expression).join(" AND ");
                 });
 
             } else {