Skip to content
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
52 changes: 52 additions & 0 deletions EFCore.CheckConstraints.Test/ValidationCheckConstraintTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,46 @@ public virtual void RangeWithExclusiveMaximum()
Assert.Equal("[RangeWithExclusiveMaximum] >= 1 AND [RangeWithExclusiveMaximum] < 5", ratingCheckConstraint.Sql);
}

[Fact]
public virtual void RangeWithoutMinimum()
{
var entityType = BuildEntityType<Blog>();

var ratingCheckConstraint = Assert.Single(entityType.GetCheckConstraints(), c => c.Name == "CK_Blog_RangeWithoutMinimum_Range");
Assert.NotNull(ratingCheckConstraint);
Assert.Equal("[RangeWithoutMinimum] <= 5", ratingCheckConstraint.Sql);
}

[Fact]
public virtual void RangeWithoutMaximum()
{
var entityType = BuildEntityType<Blog>();

var ratingCheckConstraint = Assert.Single(entityType.GetCheckConstraints(), c => c.Name == "CK_Blog_RangeWithoutMaximum_Range");
Assert.NotNull(ratingCheckConstraint);
Assert.Equal("[RangeWithoutMaximum] >= 1", ratingCheckConstraint.Sql);
}

[Fact]
public virtual void RangeAlmostWithoutMinimum()
{
var entityType = BuildEntityType<Blog>();

var ratingCheckConstraint = Assert.Single(entityType.GetCheckConstraints(), c => c.Name == "CK_Blog_RangeAlmostWithoutMinimum_Range");
Assert.NotNull(ratingCheckConstraint);
Assert.Equal("[RangeAlmostWithoutMinimum] > -2147483648 AND [RangeAlmostWithoutMinimum] <= 5", ratingCheckConstraint.Sql);
}

[Fact]
public virtual void RangeAlmostWithoutMaximum()
{
var entityType = BuildEntityType<Blog>();

var ratingCheckConstraint = Assert.Single(entityType.GetCheckConstraints(), c => c.Name == "CK_Blog_RangeAlmostWithoutMaximum_Range");
Assert.NotNull(ratingCheckConstraint);
Assert.Equal("[RangeAlmostWithoutMaximum] >= 1 AND [RangeAlmostWithoutMaximum] < 2147483647", ratingCheckConstraint.Sql);
}

[Fact]
public void MinLength()
{
Expand Down Expand Up @@ -219,6 +259,18 @@ class Blog
[Range(1, 5, MaximumIsExclusive = true)]
public int RangeWithExclusiveMaximum { get; set; }

[Range(int.MinValue, 5)]
public int RangeWithoutMinimum { get; set; }

[Range(1, int.MaxValue)]
public int RangeWithoutMaximum { get; set; }

[Range(int.MinValue, 5, MinimumIsExclusive = true)]
public int RangeAlmostWithoutMinimum { get; set; }

[Range(1, int.MaxValue, MaximumIsExclusive = true)]
public int RangeAlmostWithoutMaximum { get; set; }

[MinLength(4)]
public string Name { get; set; } = null!;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,25 +196,41 @@ protected virtual void AddRangeConstraint(

sql.Clear();

if (attribute is { MinimumIsExclusive: false, MaximumIsExclusive: false })
switch (attribute)
{
sql
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(" BETWEEN ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Minimum))
.Append(" AND ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Maximum));
}
else
{
sql
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(attribute.MinimumIsExclusive ? " > " : " >= ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Minimum))
.Append(" AND ")
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(attribute.MaximumIsExclusive ? " < " : " <= ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Maximum));
case { Minimum: int.MinValue, MinimumIsExclusive: false }:
sql
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(attribute.MaximumIsExclusive ? " < " : " <= ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Maximum));
break;

case { Maximum: int.MaxValue, MaximumIsExclusive: false }:
sql
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(attribute.MinimumIsExclusive ? " > " : " >= ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Minimum));
break;

case { MinimumIsExclusive: false, MaximumIsExclusive: false }:
sql
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(" BETWEEN ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Minimum))
.Append(" AND ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Maximum));
break;

default:
sql
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(attribute.MinimumIsExclusive ? " > " : " >= ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Minimum))
.Append(" AND ")
.Append(_sqlGenerationHelper.DelimitIdentifier(columnName))
.Append(attribute.MaximumIsExclusive ? " < " : " <= ")
.Append(typeMapping.GenerateSqlLiteral(attribute.Maximum));
break;
}

var constraintName = $"CK_{tableName}_{columnName}_Range";
Expand Down