Merge pull request #67 from MerifondNewMarkets/feature/bitwise-expres…

…sions-AND-OR Adding support for bitwise AND and OR expressions
artiomchi · Sep 17, 2019 · 218e54c · 218e54c
2 parents 7ebc636 + a6fbbdf
commit 218e54c
Show file tree

Hide file tree

Showing 5 changed files with 122 additions and 1 deletion.
diff --git a/src/FlexLabs.EntityFrameworkCore.Upsert/FlexLabs.EntityFrameworkCore.Upsert.csproj b/src/FlexLabs.EntityFrameworkCore.Upsert/FlexLabs.EntityFrameworkCore.Upsert.csproj
@@ -16,8 +16,11 @@ Also supports injecting sql command generators to add support for other provider
     <RepositoryUrl>https://github.com/artiomchi/FlexLabs.Upsert</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>Entity Framework Core entity-framework-core EF EntityFramework EntityFrameworkCore EFCore Upsert</PackageTags>
-    <VersionPrefix>2.2.0</VersionPrefix>
+    <VersionPrefix>2.2.1</VersionPrefix>
     <PackageReleaseNotes>
+v2.2.1:      
++ Support for more expressions (Bitwise AND and bitwise OR)
+
 v2.2.0:      
 + Support for more expressions (AND and OR)
 + Support for default column values and expressions

diff --git a/src/FlexLabs.EntityFrameworkCore.Upsert/Internal/ExpressionHelpers.cs b/src/FlexLabs.EntityFrameworkCore.Upsert/Internal/ExpressionHelpers.cs
@@ -128,6 +128,8 @@ private static object GetValueInternal<TSource>(this Expression expression, Lamb
                 case ExpressionType.NotEqual:
                 case ExpressionType.AndAlso:
                 case ExpressionType.OrElse:
+                case ExpressionType.And:
+                case ExpressionType.Or:
                     {
                         var exp = (BinaryExpression)expression;
                         if (!nested)

diff --git a/src/FlexLabs.EntityFrameworkCore.Upsert/Runners/RelationalUpsertCommandRunner.cs b/src/FlexLabs.EntityFrameworkCore.Upsert/Runners/RelationalUpsertCommandRunner.cs
@@ -219,9 +219,11 @@ protected virtual string ExpandExpression(KnownExpression expression, Func<strin
             switch (expression.ExpressionType)
             {
                 case ExpressionType.Add:
+                case ExpressionType.And:
                 case ExpressionType.Divide:
                 case ExpressionType.Modulo:
                 case ExpressionType.Multiply:
+                case ExpressionType.Or:
                 case ExpressionType.Subtract:
                 case ExpressionType.LessThan:
                 case ExpressionType.LessThanOrEqual:
@@ -307,9 +309,11 @@ protected virtual string GetSimpleOperator(ExpressionType expressionType)
             switch (expressionType)
             {
                 case ExpressionType.Add: return "+";
+                case ExpressionType.And: return "&";
                 case ExpressionType.Divide: return "/";
                 case ExpressionType.Modulo: return "%";
                 case ExpressionType.Multiply: return "*";
+                case ExpressionType.Or: return "|";
                 case ExpressionType.Subtract: return "-";
                 case ExpressionType.LessThan: return "<";
                 case ExpressionType.LessThanOrEqual: return "<=";

diff --git a/test/FlexLabs.EntityFrameworkCore.Upsert.Tests/EF/BasicTest.cs b/test/FlexLabs.EntityFrameworkCore.Upsert.Tests/EF/BasicTest.cs
@@ -841,6 +841,86 @@ public void Upsert_PageVisit_Update_On_WhenMatched_ValueMultiply(TestDbContext.D
             }
         }
 
+        [Theory]
+        [MemberData(nameof(GetDatabaseEngines))]
+        public void Upsert_PageVisit_Update_On_WhenMatched_ValueBitwiseOr(TestDbContext.DbDriver driver)
+        {
+            ResetDb(driver);
+            using (var dbContext = new TestDbContext(_dataContexts[driver]))
+            {
+                var newVisit = new PageVisit
+                {
+                    UserID = 1,
+                    Date = DateTime.Today,
+                    Visits = 1,
+                    FirstVisit = _now,
+                    LastVisit = _now,
+                };
+
+                dbContext.PageVisits.Upsert(newVisit)
+                    .On(pv => new { pv.UserID, pv.Date })
+                    .WhenMatched(pv => new PageVisit
+                    {
+                        Visits = pv.Visits | 3,
+                        LastVisit = _now,
+                    })
+                    .Run();
+
+                Assert.Collection(dbContext.PageVisits.OrderBy(c => c.ID),
+                    visit => AssertEqual(_dbVisitOld, visit),
+                    visit =>
+                    {
+                        Assert.Equal(newVisit.UserID, visit.UserID);
+                        Assert.Equal(newVisit.Date, visit.Date);
+                        Assert.NotEqual(newVisit.Visits, visit.Visits);
+                        Assert.Equal(_dbVisit.Visits | 3, visit.Visits);
+                        Assert.NotEqual(newVisit.FirstVisit, visit.FirstVisit);
+                        Assert.Equal(_dbVisit.FirstVisit, visit.FirstVisit);
+                        Assert.Equal(newVisit.LastVisit, visit.LastVisit);
+                    });
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(GetDatabaseEngines))]
+        public void Upsert_PageVisit_Update_On_WhenMatched_ValueBitwiseAnd(TestDbContext.DbDriver driver)
+        {
+            ResetDb(driver);
+            using (var dbContext = new TestDbContext(_dataContexts[driver]))
+            {
+                var newVisit = new PageVisit
+                {
+                    UserID = 1,
+                    Date = DateTime.Today,
+                    Visits = 1,
+                    FirstVisit = _now,
+                    LastVisit = _now,
+                };
+
+                dbContext.PageVisits.Upsert(newVisit)
+                    .On(pv => new { pv.UserID, pv.Date })
+                    .WhenMatched(pv => new PageVisit
+                    {
+                        Visits = pv.Visits & 3,
+                        LastVisit = _now,
+                    })
+                    .Run();
+
+                Assert.Collection(dbContext.PageVisits.OrderBy(c => c.ID),
+                    visit => AssertEqual(_dbVisitOld, visit),
+                    visit =>
+                    {
+                        Assert.Equal(newVisit.UserID, visit.UserID);
+                        Assert.Equal(newVisit.Date, visit.Date);
+                        Assert.NotEqual(newVisit.Visits, visit.Visits);
+                        Assert.Equal(_dbVisit.Visits & 3, visit.Visits);
+                        Assert.NotEqual(newVisit.FirstVisit, visit.FirstVisit);
+                        Assert.Equal(_dbVisit.FirstVisit, visit.FirstVisit);
+                        Assert.Equal(newVisit.LastVisit, visit.LastVisit);
+                    });
+            }
+        }
+
         [Theory]
         [MemberData(nameof(GetDatabaseEngines))]
         public void Upsert_PageVisit_Update_On_WhenMatched_ValueDivide(TestDbContext.DbDriver driver)

diff --git a/test/FlexLabs.EntityFrameworkCore.Upsert.Tests/Internal/ExpressionHelpersTests.cs b/test/FlexLabs.EntityFrameworkCore.Upsert.Tests/Internal/ExpressionHelpersTests.cs
@@ -204,6 +204,38 @@ public void ExpressionHelpersTests_ValueModulo()
             IsConstantValue(knownValue.Value2, 4);
         }
 
+        [Fact]
+        public void ExpressionHelpersTests_ValueBitwiseOr()
+        {
+            Expression<Func<TestEntity, TestEntity>> exp = e => new TestEntity
+            {
+                Num1 = e.Num1 | 1,
+            };
+
+            var memberAssig = GetMemberExpression(exp);
+            var expValue = memberAssig.GetValue<TestEntity>(exp);
+
+            var knownValue = IsKnownExpression(expValue, ExpressionType.Or);
+            IsPropertyValue(knownValue.Value1, "Num1", true);
+            IsConstantValue(knownValue.Value2, 1);
+        }
+
+        [Fact]
+        public void ExpressionHelpersTests_ValueBitwiseAnd()
+        {
+            Expression<Func<TestEntity, TestEntity>> exp = e => new TestEntity
+            {
+                Num1 = e.Num1 & 1,
+            };
+
+            var memberAssig = GetMemberExpression(exp);
+            var expValue = memberAssig.GetValue<TestEntity>(exp);
+
+            var knownValue = IsKnownExpression(expValue, ExpressionType.And);
+            IsPropertyValue(knownValue.Value1, "Num1", true);
+            IsConstantValue(knownValue.Value2, 1);
+        }
+
         [Fact]
         public void ExpressionHelpersTests_Property()
         {