修复 ISelect2 以上 WhereIf 条件作用反了 bug

28810 · 28810 · commit acc1754e2e9b · 2019-04-18T13:54:11.000+08:00
diff --git a/FreeSql.Tests/UnitTest1.cs b/FreeSql.Tests/UnitTest1.cs
@@ -143,9 +143,33 @@ public void Test1() {
 			).ToList();
 
 
+			var groupbysql = g.mysql.Select<TestInfo>().From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				.Where(a => a.Id == 1)
+				.WhereIf(false, a => a.Id == 2)
+			)
+			.WhereIf(true, (a, b, c) => a.Id == 3)
+			.GroupBy((a, b, c) => new { tt2 = a.Title.Substring(0, 2), mod4 = a.Id % 4 })
+			.Having(a => a.Count() > 0 && a.Avg(a.Key.mod4) > 0 && a.Max(a.Key.mod4) > 0)
+			.Having(a => a.Count() < 300 || a.Avg(a.Key.mod4) < 100)
+			.OrderBy(a => a.Key.tt2)
+			.OrderByDescending(a => a.Count()).ToSql(a => new { a.Key.mod4, a.Key.tt2 });
+
+			var groupbysql2 = g.mysql.Select<TestInfo>().From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+				.Where(a => a.Id == 1)
+				.WhereIf(true, a => a.Id == 2)
+			)
+			.WhereIf(false, (a, b, c) => a.Id == 3)
+			.GroupBy((a, b, c) => new { tt2 = a.Title.Substring(0, 2), mod4 = a.Id % 4 })
+			.Having(a => a.Count() > 0 && a.Avg(a.Key.mod4) > 0 && a.Max(a.Key.mod4) > 0)
+			.Having(a => a.Count() < 300 || a.Avg(a.Key.mod4) < 100)
+			.OrderBy(a => a.Key.tt2)
+			.OrderByDescending(a => a.Count()).ToSql(a => a.Key.mod4);
+
 			var groupby = g.mysql.Select<TestInfo>().From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
 				.Where(a => a.Id == 1)
+				.WhereIf(true, a => a.Id == 2)
 			)
+			.WhereIf(true, (a,b,c) => a.Id == 3)
 			.GroupBy((a, b, c) => new { tt2 = a.Title.Substring(0, 2), mod4 = a.Id % 4 })
 			.Having(a => a.Count() > 0 && a.Avg(a.Key.mod4) > 0 && a.Max(a.Key.mod4) > 0)
 			.Having(a => a.Count() < 300 || a.Avg(a.Key.mod4) < 100)
diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>0.5.1.2</Version>
+		<Version>0.5.1.3</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>YeXiangQin</Authors>
 		<Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description>
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs
@@ -147,8 +147,7 @@ ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ISelect<T1, T2, T3, T4, T5, T6,
 		}
 
 		ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this.Where(null);
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
 			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
 		}
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs
@@ -221,8 +221,7 @@ public ISelect<T1> Where<T2, T3, T4, T5>(Expression<Func<T1, T2, T3, T4, T5, boo
 		public ISelect<T1> WhereDynamic(object dywhere) => this.Where(_commonUtils.WhereObject(_tables.First().Table, $"{_tables.First().Alias}.", dywhere));
 
 		public ISelect<T1> WhereIf(bool condition, Expression<Func<T1, bool>> exp) {
-			if (condition == false) return this;
-			if (exp == null) return this;
+			if (condition == false || exp == null) return this;
 			_tables[0].Parameter = exp.Parameters[0];
 			return this.InternalWhere(exp?.Body);
 		}
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs
@@ -131,10 +131,9 @@ ISelect<T1, T2> ISelect<T1, T2>.Where(Expression<Func<T1, T2, bool>> exp) {
 		}
 
 		ISelect<T1, T2> ISelect<T1, T2>.WhereIf(bool condition, Expression<Func<T1, T2, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2>.Any(Expression<Func<T1, T2, bool>> exp) {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs
@@ -133,10 +133,9 @@ ISelect<T1, T2, T3> ISelect<T1, T2, T3>.Where(Expression<Func<T1, T2, T3, bool>>
 		}
 
 		ISelect<T1, T2, T3> ISelect<T1, T2, T3>.WhereIf(bool condition, Expression<Func<T1, T2, T3, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2, T3>.Any(Expression<Func<T1, T2, T3, bool>> exp) {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs
@@ -135,10 +135,9 @@ ISelect<T1, T2, T3, T4> ISelect<T1, T2, T3, T4>.Where(Expression<Func<T1, T2, T3
 		}
 
 		ISelect<T1, T2, T3, T4> ISelect<T1, T2, T3, T4>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2, T3, T4>.Any(Expression<Func<T1, T2, T3, T4, bool>> exp) {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs
@@ -137,10 +137,9 @@ ISelect<T1, T2, T3, T4, T5> ISelect<T1, T2, T3, T4, T5>.Where(Expression<Func<T1
 		}
 
 		ISelect<T1, T2, T3, T4, T5> ISelect<T1, T2, T3, T4, T5>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2, T3, T4, T5>.Any(Expression<Func<T1, T2, T3, T4, T5, bool>> exp) {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs
@@ -139,10 +139,9 @@ ISelect<T1, T2, T3, T4, T5, T6> ISelect<T1, T2, T3, T4, T5, T6>.Where(Expression
 		}
 
 		ISelect<T1, T2, T3, T4, T5, T6> ISelect<T1, T2, T3, T4, T5, T6>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2, T3, T4, T5, T6>.Any(Expression<Func<T1, T2, T3, T4, T5, T6, bool>> exp) {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs
@@ -141,10 +141,9 @@ ISelect<T1, T2, T3, T4, T5, T6, T7> ISelect<T1, T2, T3, T4, T5, T6, T7>.Where(Ex
 		}
 
 		ISelect<T1, T2, T3, T4, T5, T6, T7> ISelect<T1, T2, T3, T4, T5, T6, T7>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, T7, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2, T3, T4, T5, T6, T7>.Any(Expression<Func<T1, T2, T3, T4, T5, T6, T7, bool>> exp) {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs
@@ -143,10 +143,9 @@ ISelect<T1, T2, T3, T4, T5, T6, T7, T8> ISelect<T1, T2, T3, T4, T5, T6, T7, T8>.
 		}
 
 		ISelect<T1, T2, T3, T4, T5, T6, T7, T8> ISelect<T1, T2, T3, T4, T5, T6, T7, T8>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, T7, T8, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2, T3, T4, T5, T6, T7, T8>.Any(Expression<Func<T1, T2, T3, T4, T5, T6, T7, T8, bool>> exp) {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs
@@ -145,10 +145,9 @@ ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> ISelect<T1, T2, T3, T4, T5, T6, T7,
 		}
 
 		ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, bool>> exp) {
-			if (condition) return this.Where(null);
-			if (exp == null) return this.Where(null);
+			if (condition == false || exp == null) return this;
 			for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];
-			return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;
+			return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));
 		}
 
 		bool ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9>.Any(Expression<Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, bool>> exp) {

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,7 @@ ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ISelect<T1, T2, T3, T4, T5, T6,`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, bool>> exp) {`
`150`		`- if (condition) return this.Where(null);`
`151`		`- if (exp == null) return this.Where(null);`
	`150`	`+ if (condition == false \|\| exp == null) return this.Where(null);`
`152`	`151`	`for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];`
`153`	`152`	`return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;`
`154`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,7 @@ public ISelect<T1> Where<T2, T3, T4, T5>(Expression<Func<T1, T2, T3, T4, T5, boo`
`221`	`221`	`public ISelect<T1> WhereDynamic(object dywhere) => this.Where(_commonUtils.WhereObject(_tables.First().Table, $"{_tables.First().Alias}.", dywhere));`
`222`	`222`
`223`	`223`	`public ISelect<T1> WhereIf(bool condition, Expression<Func<T1, bool>> exp) {`
`224`		`- if (condition == false) return this;`
`225`		`- if (exp == null) return this;`
	`224`	`+ if (condition == false \|\| exp == null) return this;`
`226`	`225`	`_tables[0].Parameter = exp.Parameters[0];`
`227`	`226`	`return this.InternalWhere(exp?.Body);`
`228`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,10 +131,9 @@ ISelect<T1, T2> ISelect<T1, T2>.Where(Expression<Func<T1, T2, bool>> exp) {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`ISelect<T1, T2> ISelect<T1, T2>.WhereIf(bool condition, Expression<Func<T1, T2, bool>> exp) {`
`134`		`- if (condition) return this.Where(null);`
`135`		`- if (exp == null) return this.Where(null);`
	`134`	`+ if (condition == false \|\| exp == null) return this;`
`136`	`135`	`for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];`
`137`		`- return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;`
	`136`	`+ return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`bool ISelect<T1, T2>.Any(Expression<Func<T1, T2, bool>> exp) {`
Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,9 @@ ISelect<T1, T2, T3> ISelect<T1, T2, T3>.Where(Expression<Func<T1, T2, T3, bool>>`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`ISelect<T1, T2, T3> ISelect<T1, T2, T3>.WhereIf(bool condition, Expression<Func<T1, T2, T3, bool>> exp) {`
`136`		`- if (condition) return this.Where(null);`
`137`		`- if (exp == null) return this.Where(null);`
	`136`	`+ if (condition == false \|\| exp == null) return this;`
`138`	`137`	`for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];`
`139`		`- return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;`
	`138`	`+ return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));`
`140`	`139`	`}`
`141`	`140`
`142`	`141`	`bool ISelect<T1, T2, T3>.Any(Expression<Func<T1, T2, T3, bool>> exp) {`
Original file line number	Diff line number	Diff line change
`@@ -135,10 +135,9 @@ ISelect<T1, T2, T3, T4> ISelect<T1, T2, T3, T4>.Where(Expression<Func<T1, T2, T3`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`ISelect<T1, T2, T3, T4> ISelect<T1, T2, T3, T4>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, bool>> exp) {`
`138`		`- if (condition) return this.Where(null);`
`139`		`- if (exp == null) return this.Where(null);`
	`138`	`+ if (condition == false \|\| exp == null) return this;`
`140`	`139`	`for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];`
`141`		`- return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;`
	`140`	`+ return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`bool ISelect<T1, T2, T3, T4>.Any(Expression<Func<T1, T2, T3, T4, bool>> exp) {`
Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,9 @@ ISelect<T1, T2, T3, T4, T5> ISelect<T1, T2, T3, T4, T5>.Where(Expression<Func<T1`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`ISelect<T1, T2, T3, T4, T5> ISelect<T1, T2, T3, T4, T5>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, bool>> exp) {`
`140`		`- if (condition) return this.Where(null);`
`141`		`- if (exp == null) return this.Where(null);`
	`140`	`+ if (condition == false \|\| exp == null) return this;`
`142`	`141`	`for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];`
`143`		`- return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;`
	`142`	`+ return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));`
`144`	`143`	`}`
`145`	`144`
`146`	`145`	`bool ISelect<T1, T2, T3, T4, T5>.Any(Expression<Func<T1, T2, T3, T4, T5, bool>> exp) {`
Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,9 @@ ISelect<T1, T2, T3, T4, T5, T6> ISelect<T1, T2, T3, T4, T5, T6>.Where(Expression`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`ISelect<T1, T2, T3, T4, T5, T6> ISelect<T1, T2, T3, T4, T5, T6>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, bool>> exp) {`
`142`		`- if (condition) return this.Where(null);`
`143`		`- if (exp == null) return this.Where(null);`
	`142`	`+ if (condition == false \|\| exp == null) return this;`
`144`	`143`	`for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];`
`145`		`- return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;`
	`144`	`+ return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`bool ISelect<T1, T2, T3, T4, T5, T6>.Any(Expression<Func<T1, T2, T3, T4, T5, T6, bool>> exp) {`
Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,9 @@ ISelect<T1, T2, T3, T4, T5, T6, T7> ISelect<T1, T2, T3, T4, T5, T6, T7>.Where(Ex`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`ISelect<T1, T2, T3, T4, T5, T6, T7> ISelect<T1, T2, T3, T4, T5, T6, T7>.WhereIf(bool condition, Expression<Func<T1, T2, T3, T4, T5, T6, T7, bool>> exp) {`
`144`		`- if (condition) return this.Where(null);`
`145`		`- if (exp == null) return this.Where(null);`
	`144`	`+ if (condition == false \|\| exp == null) return this;`
`146`	`145`	`for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a];`
`147`		`- return condition ? this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null)) : this;`
	`146`	`+ return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null));`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`bool ISelect<T1, T2, T3, T4, T5, T6, T7>.Any(Expression<Func<T1, T2, T3, T4, T5, T6, T7, bool>> exp) {`