Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delegate where(boolean) to WhereTrue/WhereFalse methods #510

Merged
merged 3 commits into from
Jul 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions QueryBuilder.Tests/GeneralTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -435,5 +435,61 @@ public void UnsafeLiteral_Update()

Assert.Equal("UPDATE [Table] SET [Count] = Count + 1", c[EngineCodes.SqlServer].ToString());
}

[Fact]
public void Passing_Boolean_To_Where_Should_Call_WhereTrue_Or_WhereFalse()
{
var query = new Query("Table").Where("Col", true);

var engines = new[] {
EngineCodes.SqlServer,
};

var c = Compilers.Compile(engines, query);

Assert.Equal("SELECT * FROM [Table] WHERE [Col] = cast(1 as bit)", c[EngineCodes.SqlServer].ToString());
}

[Fact]
public void Passing_Boolean_False_To_Where_Should_Call_WhereTrue_Or_WhereFalse()
{
var query = new Query("Table").Where("Col", false);

var engines = new[] {
EngineCodes.SqlServer,
};

var c = Compilers.Compile(engines, query);

Assert.Equal("SELECT * FROM [Table] WHERE [Col] = cast(0 as bit)", c[EngineCodes.SqlServer].ToString());
}

[Fact]
public void Passing_Negative_Boolean_To_Where_Should_Call_WhereTrue_Or_WhereFalse()
{
var query = new Query("Table").Where("Col", "!=", true);

var engines = new[] {
EngineCodes.SqlServer,
};

var c = Compilers.Compile(engines, query);

Assert.Equal("SELECT * FROM [Table] WHERE [Col] != cast(1 as bit)", c[EngineCodes.SqlServer].ToString());
}

[Fact]
public void Passing_Negative_Boolean_False_To_Where_Should_Call_WhereTrue_Or_WhereFalse()
{
var query = new Query("Table").Where("Col", "!=", false);

var engines = new[] {
EngineCodes.SqlServer,
};

var c = Compilers.Compile(engines, query);

Assert.Equal("SELECT * FROM [Table] WHERE [Col] != cast(0 as bit)", c[EngineCodes.SqlServer].ToString());
}
}
}
6 changes: 3 additions & 3 deletions QueryBuilder.Tests/ParameterTypeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ public class ParameterTypeGenerator : IEnumerable<object[]>
new object[] {Convert.ToSingle("10.5", CultureInfo.InvariantCulture).ToString(), 10.5},
new object[] {"-2", -2},
new object[] {Convert.ToSingle("-2.8", CultureInfo.InvariantCulture).ToString(), -2.8},
new object[] {"true", true},
new object[] {"false", false},
new object[] {"'2018-10-28 19:22:00'", new DateTime(2018, 10, 28, 19, 22, 0, DateTimeKind.Utc)},
new object[] {"cast(1 as bit)", true},
new object[] {"cast(0 as bit)", false},
new object[] {"'2018-10-28 19:22:00'", new DateTime(2018, 10, 28, 19, 22, 0)},
new object[] {"0 /* First */", EnumExample.First},
new object[] {"1 /* Second */", EnumExample.Second},
new object[] {"'a string'", "a string"},
Expand Down
2 changes: 1 addition & 1 deletion QueryBuilder.Tests/SqlServer/NestedSelectTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void SqlCompile_QueryLimitAndNestedLimit_BindingValue()
// var q = new Query().From("Foo").Where("C", "c").WhereExists(n).Where("A", "a");

var actual = compiler.Compile(q).ToString();
Assert.Contains("SELECT * FROM [Foo] WHERE [x] = true AND NOT EXISTS (SELECT 1 FROM [Bar])",
Assert.Contains("SELECT * FROM [Foo] WHERE [x] = cast(1 as bit) AND NOT EXISTS (SELECT 1 FROM [Bar])",
actual);
// Assert.Contains("SELECT * FROM [Foo] WHERE [C] = 'c' AND EXISTS (SELECT TOP (1) 1 FROM [Bar]) AND [A] = 'a'", actual);
}
Expand Down
10 changes: 10 additions & 0 deletions QueryBuilder/Base.Where.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ public Q Where(string column, string op, object value)
return Not(op != "=").WhereNull(column);
}

if (value is bool boolValue)
{
if (op != "=")
{
Not();
}

return boolValue ? WhereTrue(column) : WhereFalse(column);
}

return AddComponent("where", new BasicCondition
{
Column = column,
Expand Down