Fixed bug with DataStrategy not getting set in SimpleQuery

ThatRendle · ThatRendle · commit a2917723a017 · 2012-02-02T10:14:28.000Z
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -10,7 +10,7 @@
 
 [assembly: AssemblyCompany("Simple.Data")]
 [assembly: AssemblyProduct("Simple.Data")]
-[assembly: AssemblyCopyright("Copyright © Mark Rendle 2010-2011")]
+[assembly: AssemblyCopyright("Copyright © Mark Rendle 2010-2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -19,6 +19,6 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("0.14.0.2")]
-[assembly: AssemblyFileVersion("0.14.0.2")]
+[assembly: AssemblyVersion("0.14.0.3")]
+[assembly: AssemblyFileVersion("0.14.0.3")]
 
diff --git a/Simple.Data.Ado/AdoAdapterRelatedFinder.cs b/Simple.Data.Ado/AdoAdapterRelatedFinder.cs
@@ -73,7 +73,7 @@ private SimpleQuery GetDetail(IDictionary<string, object> row, TableJoin join)
             var criteria = ExpressionHelper.CriteriaDictionaryToExpression(join.Detail.ActualName,
                 new Dictionary<string, object>
                                {{join.DetailColumn.ActualName, row[join.MasterColumn.HomogenizedName]}});
-            return new SimpleQuery(_adapter, join.Detail.ActualName).Where(criteria);
+            return new SimpleQuery(_adapter, null, join.Detail.ActualName).Where(criteria);
         }
     }
 }
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.14.0.2</version>
+    <version>0.14.0.3</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.14.0.2" />
+      <dependency id="Simple.Data.Core" version="0.14.0.3" />
     </dependencies>
   </metadata>
 </package>
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.14.0.2</version>
+    <version>0.14.0.3</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.14.0.2" />
+      <dependency id="Simple.Data.Ado" version="0.14.0.3" />
     </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.14.0.2</version>
+    <version>0.14.0.3</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.14.0.2" />
+      <dependency id="Simple.Data.Ado" version="0.14.0.3" />
     </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.14.0.2</version>
+    <version>0.14.0.3</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.14.0.2" />
+      <dependency id="Simple.Data.Ado" version="0.14.0.3" />
     </dependencies>
   </metadata>
 </package>
diff --git a/Simple.Data.SqlTest/OrderDetailTests.cs b/Simple.Data.SqlTest/OrderDetailTests.cs
@@ -22,6 +22,22 @@ public void TestOrderDetail()
             Assert.IsNotNull(item);
             Assert.AreEqual("Widget", item.Name);
         }
+        
+        [Test]
+        public void TestOrderDetailFromList()
+        {
+            var db = DatabaseHelper.Open();
+            var orders = db.Orders.FindAllByOrderDate(new DateTime(2010,10,10));
+            Assert.IsNotNull(orders);
+
+            foreach (var order in orders)
+            {
+                var orderItem = order.OrderItems.FirstOrDefault();
+                var item = orderItem.Item;
+                Assert.IsNotNull(item);
+                Assert.AreEqual("Widget", item.Name);
+            }
+        }
 
         [Test]
         public void TestComplexObjectCreation()
diff --git a/Simple.Data/Commands/AllCommand.cs b/Simple.Data/Commands/AllCommand.cs
@@ -30,7 +30,7 @@ public bool IsCommandFor(string method)
         /// <returns></returns>
         public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
-            return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName());
+            return new SimpleQuery(dataStrategy, table.GetQualifiedName());
             //return new SimpleResultSet(dataStrategy.Find(table.GetQualifiedName(), null)
             //    .Select(dict => new SimpleRecord(dict, table.GetQualifiedName(), dataStrategy)));
         }
diff --git a/Simple.Data/Commands/ExistsByCommand.cs b/Simple.Data/Commands/ExistsByCommand.cs
@@ -31,7 +31,7 @@ public bool IsCommandFor(string method)
         public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
             var criteria = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(), MethodNameParser.ParseFromBinder(binder, args));
-            return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName()).Where(criteria).Exists();
+            return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where(criteria).Exists();
         }
 
         public Func<object[], object> CreateDelegate(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
diff --git a/Simple.Data/Commands/ExistsCommand.cs b/Simple.Data/Commands/ExistsCommand.cs
@@ -27,7 +27,7 @@ public bool IsCommandFor(string method)
         /// <returns></returns>
         public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
-            var query = new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName());
+            var query = new SimpleQuery(dataStrategy, table.GetQualifiedName());
 
             if (args.Length == 1 && args[0] is SimpleExpression)
             {
diff --git a/Simple.Data/Commands/FindAllByCommand.cs b/Simple.Data/Commands/FindAllByCommand.cs
@@ -23,7 +23,7 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe
             {
                 criteriaExpression = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(), MethodNameParser.ParseFromBinder(binder, args));
             }
-            return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName()).Where(criteriaExpression);
+            return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where(criteriaExpression);
         }
 
         public Func<object[], object> CreateDelegate(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
diff --git a/Simple.Data/Commands/FindAllCommand.cs b/Simple.Data/Commands/FindAllCommand.cs
@@ -32,7 +32,7 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe
         {
             if (args.Length == 1 && args[0] is SimpleExpression)
             {
-                return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName()).Where((SimpleExpression)args[0]);
+                return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where((SimpleExpression)args[0]);
             }
 
             return null;
diff --git a/Simple.Data/Commands/GetCountByCommand.cs b/Simple.Data/Commands/GetCountByCommand.cs
@@ -28,7 +28,7 @@ public bool IsCommandFor(string method)
         public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
             var criteria = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(), MethodNameParser.ParseFromBinder(binder, args));
-            return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName()).Where(criteria).Count();
+            return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where(criteria).Count();
         }
 
         public Func<object[], object> CreateDelegate(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
diff --git a/Simple.Data/Commands/GetCountCommand.cs b/Simple.Data/Commands/GetCountCommand.cs
@@ -30,7 +30,7 @@ public bool IsCommandFor(string method)
         /// <returns></returns>
         public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
-            var query = new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName());
+            var query = new SimpleQuery(dataStrategy, table.GetQualifiedName());
 
             if (args.Length == 1 && args[0] is SimpleExpression)
             {
diff --git a/Simple.Data/Commands/QueryByCommand.cs b/Simple.Data/Commands/QueryByCommand.cs
@@ -23,7 +23,7 @@ public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMembe
         private static object CreateSimpleQuery(DynamicTable table, InvokeMemberBinder binder, object[] args, DataStrategy dataStrategy)
         {
             var criteriaExpression = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(), MethodNameParser.ParseFromBinder(binder, args));
-            return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName()).Where(criteriaExpression);
+            return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where(criteriaExpression);
         }
     }
 
@@ -36,12 +36,12 @@ public bool IsCommandFor(string method)
 
         public Func<object[], object> CreateDelegate(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
-            return a => new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName());
+            return a => new SimpleQuery(dataStrategy, table.GetQualifiedName());
         }
 
         public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)
         {
-            return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName());
+            return new SimpleQuery(dataStrategy, table.GetQualifiedName());
         }
     }
 }
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.14.0.2</version>
+    <version>0.14.0.3</version>
     <authors>Mark Rendle</authors>
     <owners>Mark Rendle</owners>
     <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
diff --git a/Simple.Data/SimpleQuery.cs b/Simple.Data/SimpleQuery.cs
@@ -21,9 +21,19 @@ public class SimpleQuery : DynamicObject, IEnumerable
         private DataStrategy _dataStrategy;
         private JoinClause _tempJoinWaitingForOn;
 
-        public SimpleQuery(Adapter adapter, string tableName)
+        public SimpleQuery(DataStrategy dataStrategy, string tableName)
+        {
+            _dataStrategy = dataStrategy;
+            if (_dataStrategy != null)
+                _adapter = _dataStrategy.GetAdapter();
+            _tableName = tableName;
+            _clauses = new SimpleQueryClauseBase[0];
+        }
+
+        public SimpleQuery(Adapter adapter, DataStrategy dataStrategy, string tableName)
         {
             _adapter = adapter;
+            _dataStrategy = dataStrategy;
             _tableName = tableName;
             _clauses = new SimpleQueryClauseBase[0];
         }
@@ -32,6 +42,7 @@ private SimpleQuery(SimpleQuery source,
                             SimpleQueryClauseBase[] clauses)
         {
             _adapter = source._adapter;
+            _dataStrategy = source._dataStrategy;
             _tableName = source.TableName;
             _clauses = clauses;
         }
@@ -41,6 +52,7 @@ private SimpleQuery(SimpleQuery source,
                             SimpleQueryClauseBase[] clauses)
         {
             _adapter = source._adapter;
+            _dataStrategy = source._dataStrategy;
             _tableName = tableName;
             _clauses = clauses;
         }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private SimpleQuery GetDetail(IDictionary<string, object> row, TableJoin join)`
`73`	`73`	`var criteria = ExpressionHelper.CriteriaDictionaryToExpression(join.Detail.ActualName,`
`74`	`74`	`new Dictionary<string, object>`
`75`	`75`	`{{join.DetailColumn.ActualName, row[join.MasterColumn.HomogenizedName]}});`
`76`		`- return new SimpleQuery(_adapter, join.Detail.ActualName).Where(criteria);`
	`76`	`+ return new SimpleQuery(_adapter, null, join.Detail.ActualName).Where(criteria);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public bool IsCommandFor(string method)`
`30`	`30`	`/// <returns></returns>`
`31`	`31`	`public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)`
`32`	`32`	`{`
`33`		`- return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName());`
	`33`	`+ return new SimpleQuery(dataStrategy, table.GetQualifiedName());`
`34`	`34`	`//return new SimpleResultSet(dataStrategy.Find(table.GetQualifiedName(), null)`
`35`	`35`	`// .Select(dict => new SimpleRecord(dict, table.GetQualifiedName(), dataStrategy)));`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public bool IsCommandFor(string method)`
`31`	`31`	`public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)`
`32`	`32`	`{`
`33`	`33`	`var criteria = ExpressionHelper.CriteriaDictionaryToExpression(table.GetQualifiedName(), MethodNameParser.ParseFromBinder(binder, args));`
`34`		`- return new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName()).Where(criteria).Exists();`
	`34`	`+ return new SimpleQuery(dataStrategy, table.GetQualifiedName()).Where(criteria).Exists();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public Func<object[], object> CreateDelegate(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public bool IsCommandFor(string method)`
`27`	`27`	`/// <returns></returns>`
`28`	`28`	`public object Execute(DataStrategy dataStrategy, DynamicTable table, InvokeMemberBinder binder, object[] args)`
`29`	`29`	`{`
`30`		`- var query = new SimpleQuery(dataStrategy.GetAdapter(), table.GetQualifiedName());`
	`30`	`+ var query = new SimpleQuery(dataStrategy, table.GetQualifiedName());`
`31`	`31`
`32`	`32`	`if (args.Length == 1 && args[0] is SimpleExpression)`
`33`	`33`	`{`