Updated delete syntax

jasondentler · Feb 18, 2011 · 235e7a2 · 235e7a2
1 parent 30bb2e4
commit 235e7a2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 14 deletions.
diff --git a/src/FluentDML/FluentDML.csproj b/src/FluentDML/FluentDML.csproj
@@ -40,6 +40,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IDeleteWhere.cs" />
     <Compile Include="SyntaxExample.cs" />
     <Compile Include="IUpsertSet.cs" />
     <Compile Include="IDelete.cs" />

diff --git a/src/FluentDML/IDelete.cs b/src/FluentDML/IDelete.cs
@@ -7,7 +7,7 @@ namespace FluentDML
     public interface IDelete<T>
     {
 
-        IDbCommand Where(Expression<Func<T, bool>> predicate);
+        IDeleteWhere<T> Where(Expression<Func<T, bool>> predicate);
 
     }
 }
diff --git a/src/FluentDML/IDeleteWhere.cs b/src/FluentDML/IDeleteWhere.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Data;
+using System.Linq.Expressions;
+
+namespace FluentDML
+{
+    public interface IDeleteWhere<T>
+    {
+
+        IDeleteWhere<T> And(Expression<Func<T, bool>> predicate);
+        IDbCommand ToCommand();
+
+    }
+}
diff --git a/src/FluentDML/SyntaxExample.cs b/src/FluentDML/SyntaxExample.cs
@@ -2,32 +2,39 @@
 
 namespace FluentDML
 {
-    class SyntaxExample
+    internal class SyntaxExample
     {
 
         public SyntaxExample()
         {
-            Update<SyntaxExample>()
+
+            var evnt = new SomeEvent();
+
+            Update<SomeViewModel>()
                 .Set(c => c.Value1, "name")
                 .Set(c => c.Value2, 1)
                 .Where(c => c.Id == new Guid())
-                .And(c => c.Value2 == 1);
+                .And(c => c.Value2 == 1)
+                .ToCommand();
 
-            Update<SyntaxExample>()
-                .MapFrom(new object())
+            Update<SomeViewModel>()
+                .MapFrom(evnt)
                 .WithId(c => c.Id);
 
-            Upsert<SyntaxExample>()
+            Upsert<SomeViewModel>()
                 .Set(c => c.Value1, "name")
                 .Set(c => c.Value2, 1)
                 .WithId(c => c.Id);
 
-            Upsert<SyntaxExample>()
-                .MapFrom(new object())
+            Upsert<SomeViewModel>()
+                .MapFrom(evnt)
                 .WithId(c => c.Id);
 
-            Delete<SyntaxExample>()
-                .Where(c => c.Id == new Guid());
+            Delete<SomeViewModel>()
+                .Where(c => c.Id == new Guid())
+                .And(c => c.Value2 == 1)
+                .ToCommand();
+
         }
 
         public IDelete<T> Delete<T>()
@@ -45,10 +52,20 @@ public IUpdate<T> Update<T>()
             throw new NotImplementedException();
         }
 
-        public string Value1 { get; set; }
-        public int Value2 { get; set; }
+        protected class SomeViewModel
+        {
+            public Guid Id { get; set; }
+            public string Value1 { get; set; }
+            public int Value2 { get; set; }
+        }
+
+        protected class SomeEvent
+        {
+            public Guid Id { get; set; }
+            public string Value1 { get; set; }
+            public int Value2 { get; set; }
+        }
 
-        public Guid Id { get; set; }
 
     }
 }