Remove the auto conversion from: Where -> WhereExists

Remove the Select(params object[]) overload
sqlkata · Mar 4, 2018 · aa693ed · aa693ed
1 parent 98cb5f9
commit aa693ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 45 deletions.
diff --git a/QueryBuilder.Tests/QueryBuilderTest.cs b/QueryBuilder.Tests/QueryBuilderTest.cs
@@ -340,11 +340,22 @@ public void CombineRawWithPlaceholders()
         [Fact]
         public void NestedEmptyWhere()
         {
+            // Empty nested where should be ignored
             var query = new Query("A").Where(q => new Query().Where(q2 => new Query().Where(q3 => new Query())));
 
             var c = Compile(query);
 
             Assert.Equal("SELECT * FROM [A]", c[0]);
         }
+
+        [Fact]
+        public void NestedQuery()
+        {
+            var query = new Query("A").Where(q => new Query("B"));
+
+            var c = Compile(query);
+
+            Assert.Equal("SELECT * FROM [A]", c[0]);
+        }
     }
 }
diff --git a/QueryBuilder/Base.Where.cs b/QueryBuilder/Base.Where.cs
@@ -151,23 +151,6 @@ public Q Where(Func<Q, Q> callback)
         {
             var query = callback.Invoke(NewChild());
 
-            /*
-                if (Has("from") && Get("from").FirstOrDefault() is From)
-                {
-                    query.From((Get("from").FirstOrDefault() as From).Table);
-                }
-            */
-
-            if (query.HasComponent("from"))
-            {
-                return AddComponent("where", new ExistsCondition<Q>
-                {
-                    Query = query,
-                    IsNot = getNot(),
-                    IsOr = getOr(),
-                });
-            }
-
             return AddComponent("where", new NestedCondition<Q>
             {
                 Query = query,

diff --git a/QueryBuilder/Query.Select.cs b/QueryBuilder/Query.Select.cs
@@ -37,34 +37,6 @@ public Query SelectRaw(string expression, params object[] bindings)
             return this;
         }
 
-
-        public Query Select(params object[] columns)
-        {
-            foreach (var item in columns)
-            {
-                if (item is Raw)
-                {
-                    SelectRaw((item as Raw).Value, (item as Raw).Bindings);
-                }
-                else if (item is string)
-                {
-                    Select((string)item);
-                }
-                else if (item is Query)
-                {
-                    var query = item as Query;
-
-                    Select(query, query.QueryAlias);
-                }
-                else
-                {
-                    throw new ArgumentException("only `String`, `Raw` and `Query` are allowed");
-                }
-            }
-
-            return this;
-        }
-
         public Query Select(Query query, string alias)
         {
             Method = "select";