Fix for update

ThatRendle · ThatRendle · commit 5bcbf2ef901e · 2012-11-06T12:35:30.000Z
diff --git a/Simple.Data.BehaviourTest/Simple.Data.BehaviourTest.csproj b/Simple.Data.BehaviourTest/Simple.Data.BehaviourTest.csproj
@@ -69,6 +69,7 @@
     <Compile Include="DeleteTest.cs" />
     <Compile Include="ExceptionsTesting.cs" />
     <Compile Include="FindTest.cs" />
+    <Compile Include="GetCountTest.cs" />
     <Compile Include="GetTest.cs" />
     <Compile Include="InsertTest.cs" />
     <Compile Include="NaturalNamingTest.cs" />
diff --git a/Simple.Data.SqlTest/UpdateTests.cs b/Simple.Data.SqlTest/UpdateTests.cs
@@ -138,5 +138,23 @@ public void TestUpdateWithTimestamp()
             row = db.TimestampTest.Get(row.Id);
             Assert.AreEqual("Updated", row.Description);
         }
+
+        [Test]
+        public void TestUpdateByInputIsNotMutated()
+        {
+            var db = DatabaseHelper.Open();
+            var user = new Dictionary<string, object>() {
+              {"Id", 0},
+              {"Age", 1},
+              {"Name", "X"},
+              {"Password", "P"}
+            };
+
+            user["Id"] = db.Users.Insert(user).Id;
+
+            db.Users.UpdateById(user);
+
+            Assert.AreEqual(4, user.Keys.Count);
+        }
     }
 }
diff --git a/Simple.Data/Commands/GetCountCommand.cs b/Simple.Data/Commands/GetCountCommand.cs
@@ -32,12 +32,24 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe
         {
             var query = new SimpleQuery(dataStrategy, table.GetQualifiedName());
 
-            if (args.Length == 1 && args[0] is SimpleExpression)
+            if (args.Length == 1)
             {
-                query = query.Where((SimpleExpression)args[0]);
+                var expression = args[0] as SimpleExpression;
+                if (expression != null)
+                {
+                    return query.Where(expression).Count();
+                }
+                else
+                {
+                    throw new BadExpressionException("GetCount expects an expression or no parameters.");
+                }
+            }
+            else if (args.Length == 0)
+            {
+                return query.Count();
             }
 
-            return query.Count();
+            throw new ArgumentException("GetCount expects an expression or no parameters.");
         }
     }
 }
diff --git a/Simple.Data/DynamicTable.cs b/Simple.Data/DynamicTable.cs
@@ -137,6 +137,15 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
             return true;
         }
 
+        public override bool TrySetMember(SetMemberBinder binder, object value)
+        {
+            if (base.TrySetMember(binder, value))
+            {
+                return true;
+            }
+            throw new BadExpressionException("Cannot assign values to table columns.");
+        }
+
         public ObjectReference As(string alias)
         {
             return new ObjectReference(_tableName, (_schema != null ? new ObjectReference(_schema.GetName()) : null), _dataStrategy, alias);
diff --git a/Simple.Data/ObjectReference.cs b/Simple.Data/ObjectReference.cs
@@ -175,6 +175,15 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
             return true;
         }
 
+        public override bool TrySetMember(SetMemberBinder binder, object value)
+        {
+            if (base.TrySetMember(binder, value))
+            {
+                return true;
+            }
+            throw new BadExpressionException("Cannot assign values to object references.");
+        }
+
         public dynamic this[string name]
         {
             get { return new ObjectReference(name, this); }
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -698,22 +698,22 @@ public T ToScalarOrDefault<T>()
 
         public dynamic First()
         {
-            return Run().First();
+            return Take(1).Run().First();
         }
 
         public dynamic FirstOrDefault()
         {
-            return Run().FirstOrDefault();
+            return Take(1).Run().FirstOrDefault();
         }
 
         public T First<T>()
         {
-            return Cast<T>().First();
+            return Take(1).Cast<T>().First();
         }
 
         public T FirstOrDefault<T>()
         {
-            return Cast<T>().FirstOrDefault();
+            return Take(1).Cast<T>().FirstOrDefault();
         }
 
         public T First<T>(Func<T, bool> predicate)
@@ -728,22 +728,22 @@ public T FirstOrDefault<T>(Func<T, bool> predicate)
 
         public dynamic Single()
         {
-            return Run().First();
+            return Take(1).Run().First();
         }
 
         public dynamic SingleOrDefault()
         {
-            return Run().FirstOrDefault();
+            return Take(1).Run().FirstOrDefault();
         }
 
         public T Single<T>()
         {
-            return Cast<T>().Single();
+            return Take(1).Cast<T>().Single();
         }
 
         public T SingleOrDefault<T>()
         {
-            return Cast<T>().SingleOrDefault();
+            return Take(1).Cast<T>().SingleOrDefault();
         }
 
         public T Single<T>(Func<T, bool> predicate)

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,24 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe`
`32`	`32`	`{`
`33`	`33`	`var query = new SimpleQuery(dataStrategy, table.GetQualifiedName());`
`34`	`34`
`35`		`- if (args.Length == 1 && args[0] is SimpleExpression)`
	`35`	`+ if (args.Length == 1)`
`36`	`36`	`{`
`37`		`- query = query.Where((SimpleExpression)args[0]);`
	`37`	`+ var expression = args[0] as SimpleExpression;`
	`38`	`+ if (expression != null)`
	`39`	`+ {`
	`40`	`+ return query.Where(expression).Count();`
	`41`	`+ }`
	`42`	`+ else`
	`43`	`+ {`
	`44`	`+ throw new BadExpressionException("GetCount expects an expression or no parameters.");`
	`45`	`+ }`
	`46`	`+ }`
	`47`	`+ else if (args.Length == 0)`
	`48`	`+ {`
	`49`	`+ return query.Count();`
`38`	`50`	`}`
`39`	`51`
`40`		`- return query.Count();`
	`52`	`+ throw new ArgumentException("GetCount expects an expression or no parameters.");`
`41`	`53`	`}`
`42`	`54`	`}`
`43`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -698,22 +698,22 @@ public T ToScalarOrDefault<T>()`
`698`	`698`
`699`	`699`	`public dynamic First()`
`700`	`700`	`{`
`701`		`- return Run().First();`
	`701`	`+ return Take(1).Run().First();`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`public dynamic FirstOrDefault()`
`705`	`705`	`{`
`706`		`- return Run().FirstOrDefault();`
	`706`	`+ return Take(1).Run().FirstOrDefault();`
`707`	`707`	`}`
`708`	`708`
`709`	`709`	`public T First<T>()`
`710`	`710`	`{`
`711`		`- return Cast<T>().First();`
	`711`	`+ return Take(1).Cast<T>().First();`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`public T FirstOrDefault<T>()`
`715`	`715`	`{`
`716`		`- return Cast<T>().FirstOrDefault();`
	`716`	`+ return Take(1).Cast<T>().FirstOrDefault();`
`717`	`717`	`}`
`718`	`718`
`719`	`719`	`public T First<T>(Func<T, bool> predicate)`
`@@ -728,22 +728,22 @@ public T FirstOrDefault<T>(Func<T, bool> predicate)`
`728`	`728`
`729`	`729`	`public dynamic Single()`
`730`	`730`	`{`
`731`		`- return Run().First();`
	`731`	`+ return Take(1).Run().First();`
`732`	`732`	`}`
`733`	`733`
`734`	`734`	`public dynamic SingleOrDefault()`
`735`	`735`	`{`
`736`		`- return Run().FirstOrDefault();`
	`736`	`+ return Take(1).Run().FirstOrDefault();`
`737`	`737`	`}`
`738`	`738`
`739`	`739`	`public T Single<T>()`
`740`	`740`	`{`
`741`		`- return Cast<T>().Single();`
	`741`	`+ return Take(1).Cast<T>().Single();`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`public T SingleOrDefault<T>()`
`745`	`745`	`{`
`746`		`- return Cast<T>().SingleOrDefault();`
	`746`	`+ return Take(1).Cast<T>().SingleOrDefault();`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`public T Single<T>(Func<T, bool> predicate)`