Fix bugs with odd types and ToScalarOrDefault

ThatRendle · ThatRendle · commit bbcf28b6edf4 · 2011-06-10T13:25:35.000+01:00
diff --git a/NugetPackAll.cmd b/NugetPackAll.cmd
@@ -0,0 +1,11 @@
+cd Simple.Data
+call NugetPack.cmd
+cd ..\Simple.Data.Ado
+call NugetPack.cmd
+cd ..\Simple.Data.Mocking
+call NugetPack.cmd
+cd ..\Simple.Data.SqlCe40
+call NugetPack.cmd
+cd ..\Simple.Data.SqlServer
+call NugetPack.cmd
+cd ..
diff --git a/Simple.Data.Ado/CommandBuilder.cs b/Simple.Data.Ado/CommandBuilder.cs
@@ -185,13 +185,8 @@ private static IDbDataParameter CreateSingleParameter(object value, IDbCommand c
             var parameter = command.CreateParameter();
             parameter.ParameterName = name;
             parameter.DbType = dbType;
-            parameter.Value = GetTheDataParameterValue(value);
+            parameter.Value = CommandHelper.FixObjectType(value);
             return parameter;
         }
-
-        private static object GetTheDataParameterValue(object value)
-        {
-            return value ?? DBNull.Value;
-        }
     }
 }
diff --git a/Simple.Data.Ado/CommandHelper.cs b/Simple.Data.Ado/CommandHelper.cs
@@ -71,7 +71,7 @@ private static void PrepareCommand(CommandBuilder commandBuilder, IDbCommand com
             }
         }
 
-        private static object FixObjectType(object value)
+        public static object FixObjectType(object value)
         {
             if (value == null) return DBNull.Value;
             if (TypeHelper.IsKnownType(value.GetType())) return value;
diff --git a/Simple.Data.Ado/NugetPack.cmd b/Simple.Data.Ado/NugetPack.cmd
@@ -0,0 +1 @@
+..\nuget\nuget pack -sym Simple.Data.Ado.csproj
diff --git a/Simple.Data.Mocking/NugetPack.cmd b/Simple.Data.Mocking/NugetPack.cmd
@@ -0,0 +1 @@
+..\nuget\nuget pack -sym Simple.Data.Mocking.csproj
diff --git a/Simple.Data.SqlCe40/NugetPack.cmd b/Simple.Data.SqlCe40/NugetPack.cmd
@@ -0,0 +1 @@
+..\nuget\nuget pack -sym Simple.Data.SqlCe40.csproj
diff --git a/Simple.Data.SqlServer/NugetPack.cmd b/Simple.Data.SqlServer/NugetPack.cmd
@@ -0,0 +1 @@
+..\nuget\nuget pack -sym Simple.Data.SqlServer.csproj
diff --git a/Simple.Data.SqlTest/ConversionTests.cs b/Simple.Data.SqlTest/ConversionTests.cs
@@ -25,6 +25,16 @@ public void WeirdTypeGetsConvertedToInt()
             Assert.AreEqual(1, user.Id);
         }
 
+        [Test]
+        public void WeirdTypeUsedInQueryGetsConvertedToInt()
+        {
+            var weirdValue = new WeirdType(1);
+            var db = DatabaseHelper.Open();
+            var user = db.Users.QueryById(weirdValue).FirstOrDefault();
+            Assert.IsNotNull(user);
+            Assert.AreEqual(1, user.Id);
+        }
+
         [Test]
         public void InsertingWeirdTypesFromExpando()
         {
diff --git a/Simple.Data.SqlTest/QueryTest.cs b/Simple.Data.SqlTest/QueryTest.cs
@@ -126,5 +126,19 @@ public void ShouldDirectlyQueryDetailTable()
             Assert.IsNotNull(order);
             Assert.AreEqual(1, order.OrderId);
         }
+
+        [Test]
+        public void ShouldReturnNullWhenNoRowFound()
+        {
+            var db = DatabaseHelper.Open();
+            string name = db.Customers
+                        .Query()
+                        .Select(db.Customers.Name)
+                        .Where(db.Customers.CustomerId == 0) // There is no CustomerId 0
+                        .OrderByName()
+                        .Take(1) // Should return only one record no matter what
+                        .ToScalarOrDefault<string>();
+            Assert.IsNull(name);
+        }
     }
 }
diff --git a/Simple.Data.sln.docstates b/Simple.Data.sln.docstates
diff --git a/Simple.Data/NugetPack.cmd b/Simple.Data/NugetPack.cmd
@@ -0,0 +1 @@
+..\nuget\nuget pack -sym Simple.Data.csproj
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -264,13 +264,13 @@ public dynamic ToScalar()
         public dynamic ToScalarOrDefault()
         {
             var data = _adapter.RunQuery(this).ToArray();
-            if (data.Length != 1)
+            if (data.Length == 0)
             {
-                throw new SimpleDataException("Query returned multiple rows; cannot return scalar value.");
+                return null;
             }
-            if (data[0].Count == 0)
+            if (data.Length != 1)
             {
-                return null;
+                throw new SimpleDataException("Query returned multiple rows; cannot return scalar value.");
             }
             if (data[0].Count > 1)
             {

Original file line number	Diff line number	Diff line change
`@@ -185,13 +185,8 @@ private static IDbDataParameter CreateSingleParameter(object value, IDbCommand c`
`185`	`185`	`var parameter = command.CreateParameter();`
`186`	`186`	`parameter.ParameterName = name;`
`187`	`187`	`parameter.DbType = dbType;`
`188`		`- parameter.Value = GetTheDataParameterValue(value);`
	`188`	`+ parameter.Value = CommandHelper.FixObjectType(value);`
`189`	`189`	`return parameter;`
`190`	`190`	`}`
`191`		`-`
`192`		`- private static object GetTheDataParameterValue(object value)`
`193`		`- {`
`194`		`- return value ?? DBNull.Value;`
`195`		`- }`
`196`	`191`	`}`
`197`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private static void PrepareCommand(CommandBuilder commandBuilder, IDbCommand com`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- private static object FixObjectType(object value)`
	`74`	`+ public static object FixObjectType(object value)`
`75`	`75`	`{`
`76`	`76`	`if (value == null) return DBNull.Value;`
`77`	`77`	`if (TypeHelper.IsKnownType(value.GetType())) return value;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+..\nuget\nuget pack -sym Simple.Data.Ado.csproj`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+..\nuget\nuget pack -sym Simple.Data.Mocking.csproj`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+..\nuget\nuget pack -sym Simple.Data.SqlCe40.csproj`