Wrapping up pull requests into NuGet release 0.9.7.1

ThatRendle · ThatRendle · commit 170dae2cc6e2 · 2011-10-21T12:37:06.000+01:00
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -19,6 +19,6 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("0.9.6.2")]
-[assembly: AssemblyFileVersion("0.9.6.2")]
+[assembly: AssemblyVersion("0.9.7.1")]
+[assembly: AssemblyFileVersion("0.9.7.1")]
 
diff --git a/Simple.Data.Ado/ProcedureExecutor.cs b/Simple.Data.Ado/ProcedureExecutor.cs
@@ -118,7 +118,12 @@ private static void SetParameters(Procedure procedure, IDbCommand cmd, IDictiona
                 cmdParameter.Direction = parameter.Direction;
                 //Tim Cartwright: I added size and dbtype so inout/out params would function properly.
                 //not setting the proper dbtype and size with out put parameters causes the exception: "Size property has an invalid size of 0"
-                cmdParameter.DbType = parameter.Dbtype;
+                // Mark: Just adding a quick check here so that if the Provider-specific type has been set by setting the value, this will not
+                // override that.
+                if (cmdParameter.DbType != parameter.Dbtype)
+                {
+                    cmdParameter.DbType = parameter.Dbtype;
+                }
                 cmdParameter.Size = parameter.Size;
                 cmd.Parameters.Add(cmdParameter);
                 i++;
diff --git a/Simple.Data.Ado/QueryBuilder.cs b/Simple.Data.Ado/QueryBuilder.cs
@@ -175,7 +175,7 @@ private string ToOrderByDirective(OrderByClause item)
         {
             var col = _table.FindColumn(item.Reference.GetName());
             var direction = item.Direction == OrderByDirection.Descending ? " DESC" : string.Empty;
-            return col.QuotedName + direction;
+            return col.QualifiedName + direction;
         }
 
         private string GetSelectClause(ObjectName tableName)
diff --git a/Simple.Data.Ado/Schema/Column.cs b/Simple.Data.Ado/Schema/Column.cs
@@ -59,6 +59,11 @@ public string QuotedName
             get { return _table.DatabaseSchema.QuoteObjectName(_actualName); }
         }
 
+        public string QualifiedName
+        {
+            get { return _table.QualifiedName + "." + QuotedName; }
+        }
+
         public bool IsIdentity
         {
             get { return _isIdentity; }
diff --git a/Simple.Data.Ado/Simple.Data.Ado.nuspec b/Simple.Data.Ado/Simple.Data.Ado.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Simple.Data.Ado</id>
-    <version>0.9.6.2</version>
+    <version>0.9.7.1</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>ADO Adapter for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Core" version="0.9.6.2" />
+      <dependency id="Simple.Data.Core" version="0.9.7.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.BehaviourTest/NaturalNamingTest.cs b/Simple.Data.BehaviourTest/NaturalNamingTest.cs
@@ -33,31 +33,31 @@ public void DotNetNamingIsCorrectlyResolvedInFind()
         public void DotNetNamingIsCorrectlyResolvedInOrderBy()
         {
             _db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderByCustomerName().ToList<dynamic>();
-            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name]");
+            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name]");
             Parameter(0).Is("Arthur");
         }
 
         [Test]
         public void DotNetNamingIsCorrectlyResolvedInOrderByExpression()
         {
             _db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderBy(_db.Customers.CustomerName).ToList<dynamic>();
-            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name]");
+            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name]");
             Parameter(0).Is("Arthur");
         }
 
         [Test]
         public void SortOrderIsCorrectlyResolvedInOrderByExpression()
         {
             _db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderBy(_db.Customers.CustomerName, OrderByDirection.Descending).ToList<dynamic>();
-            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name] desc");
+            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name] desc");
             Parameter(0).Is("Arthur");
         }
 
         [Test]
         public void SortOrderIsCorrectlyResolvedInOrderByThenByExpression()
         {
             _db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderBy(_db.Customers.CustomerName, OrderByDirection.Descending).ThenBy(_db.Customers.CustomerId, OrderByDirection.Ascending).ToList<dynamic>();
-            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name] desc, [customerid]");
+            GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name] desc, [dbo].[customers].[customerid]");
             Parameter(0).Is("Arthur");
         }
 
diff --git a/Simple.Data.Mocking/Simple.Data.Mocking.nuspec b/Simple.Data.Mocking/Simple.Data.Mocking.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.Mocking</id>
-    <version>0.9.6.2</version>
+    <version>0.9.7.1</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>XML-based Mocking adapter for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>database data .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="0.9.6.2" />
+      <dependency id="Simple.Data.Ado" version="0.9.7.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec b/Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.SqlCompact40</id>
-    <version>0.9.6.2</version>
+    <version>0.9.7.1</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver compact sqlce database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="0.9.6.2" />
+      <dependency id="Simple.Data.Ado" version="0.9.7.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec b/Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Simple.Data.SqlServer</id>
-    <version>0.9.6.2</version>
+    <version>0.9.7.1</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <description>SQL Server ADO provider for the Simple.Data data access library.</description> 
@@ -12,7 +12,7 @@
     <tags>sqlserver database data ado .net40</tags>
     <language>en-us</language>
     <dependencies>
-      <dependency id="Simple.Data.Ado" version="0.9.6.2" />
+      <dependency id="Simple.Data.Ado" version="0.9.7.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data/Simple.Data.nuspec b/Simple.Data/Simple.Data.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Simple.Data.Core</id>
-    <version>0.9.6.2</version>
+    <version>0.9.7.1</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ private string ToOrderByDirective(OrderByClause item)`
`175`	`175`	`{`
`176`	`176`	`var col = _table.FindColumn(item.Reference.GetName());`
`177`	`177`	`var direction = item.Direction == OrderByDirection.Descending ? " DESC" : string.Empty;`
`178`		`- return col.QuotedName + direction;`
	`178`	`+ return col.QualifiedName + direction;`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`private string GetSelectClause(ObjectName tableName)`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,11 @@ public string QuotedName`
`59`	`59`	`get { return _table.DatabaseSchema.QuoteObjectName(_actualName); }`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ public string QualifiedName`
	`63`	`+ {`
	`64`	`+ get { return _table.QualifiedName + "." + QuotedName; }`
	`65`	`+ }`
	`66`	`+`
`62`	`67`	`public bool IsIdentity`
`63`	`68`	`{`
`64`	`69`	`get { return _isIdentity; }`
Original file line number	Diff line number	Diff line change
`@@ -33,31 +33,31 @@ public void DotNetNamingIsCorrectlyResolvedInFind()`
`33`	`33`	`public void DotNetNamingIsCorrectlyResolvedInOrderBy()`
`34`	`34`	`{`
`35`	`35`	`_db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderByCustomerName().ToList<dynamic>();`
`36`		`- GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name]");`
	`36`	`+ GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name]");`
`37`	`37`	`Parameter(0).Is("Arthur");`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[Test]`
`41`	`41`	`public void DotNetNamingIsCorrectlyResolvedInOrderByExpression()`
`42`	`42`	`{`
`43`	`43`	`_db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderBy(_db.Customers.CustomerName).ToList<dynamic>();`
`44`		`- GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name]");`
	`44`	`+ GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name]");`
`45`	`45`	`Parameter(0).Is("Arthur");`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`[Test]`
`49`	`49`	`public void SortOrderIsCorrectlyResolvedInOrderByExpression()`
`50`	`50`	`{`
`51`	`51`	`_db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderBy(_db.Customers.CustomerName, OrderByDirection.Descending).ToList<dynamic>();`
`52`		`- GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name] desc");`
	`52`	`+ GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name] desc");`
`53`	`53`	`Parameter(0).Is("Arthur");`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`[Test]`
`57`	`57`	`public void SortOrderIsCorrectlyResolvedInOrderByThenByExpression()`
`58`	`58`	`{`
`59`	`59`	`_db.Customers.FindAll(_db.Customers.CustomerName == "Arthur").OrderBy(_db.Customers.CustomerName, OrderByDirection.Descending).ThenBy(_db.Customers.CustomerId, OrderByDirection.Ascending).ToList<dynamic>();`
`60`		`- GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [customer_name] desc, [customerid]");`
	`60`	`+ GeneratedSqlIs("select [dbo].[customers].[customerid],[dbo].[customers].[customer_name] from [dbo].[customers] where [dbo].[customers].[customer_name] = @p1 order by [dbo].[customers].[customer_name] desc, [dbo].[customers].[customerid]");`
`61`	`61`	`Parameter(0).Is("Arthur");`
`62`	`62`	`}`
`63`	`63`