Initial SQL tests passing

ThatRendle · ThatRendle · commit 712aab42649d · 2012-01-26T12:43:29.000Z
diff --git a/Simple.Data.Ado/AdoAdapterQueryRunner.cs b/Simple.Data.Ado/AdoAdapterQueryRunner.cs
@@ -18,19 +18,31 @@ public IEnumerable<IDictionary<string, object>> RunQuery(SimpleQuery query,
                                                                  out IEnumerable<SimpleQueryClauseBase>
                                                                      unhandledClauses)
         {
+            IEnumerable<IDictionary<string, object>> result;
+
             if (query.Clauses.OfType<WithCountClause>().Any()) return RunQueryWithCount(query, out unhandledClauses);
 
             ICommandBuilder[] commandBuilders = GetQueryCommandBuilders(query, out unhandledClauses);
             IDbConnection connection = _adapter.CreateConnection();
             if (_adapter.ProviderSupportsCompoundStatements || commandBuilders.Length == 1)
             {
-                return
+                result =
                     CommandBuilder.CreateCommand(
                         _adapter.ProviderHelper.GetCustomProvider<IDbParameterFactory>(_adapter.SchemaProvider),
                         commandBuilders,
                         connection).ToEnumerable(_adapter.CreateConnection);
             }
-            return commandBuilders.SelectMany(cb => cb.GetCommand(connection).ToEnumerable(_adapter.CreateConnection));
+            else
+            {
+                result = commandBuilders.SelectMany(cb => cb.GetCommand(connection).ToEnumerable(_adapter.CreateConnection));
+            }
+
+            if (query.Clauses.OfType<WithClause>().Any())
+            {
+                result = new EagerLoadingEnumerable(result);
+            }
+
+            return result;
         }
 
         public IObservable<IDictionary<string, object>> RunQueryAsObservable(SimpleQuery query,
diff --git a/Simple.Data.Ado/EagerLoadingEnumerable.cs b/Simple.Data.Ado/EagerLoadingEnumerable.cs
@@ -64,8 +64,14 @@ private IEnumerable<IDictionary<string,object>> CreateObjectGraphs()
                 }
             }
 
+            IDictionary<string,int> index = null;
             foreach (var kvp in load)
             {
+                if (index == null)
+                {
+                    index = kvp.Key.Keys.Select((k, i) => new KeyValuePair<string, int>(k, i)).ToDictionary(HomogenizedEqualityComparer.DefaultInstance);
+                }
+                var row = new OptimizedDictionary<string, object>(index, kvp.Key.Values);
                 foreach (var sub in kvp.Value)
                 {
                     if (sub.Value.Count == 1)
diff --git a/Simple.Data.Ado/OptimizedDictionary2.cs b/Simple.Data.Ado/OptimizedDictionary2.cs
@@ -14,7 +14,7 @@ public class OptimizedDictionary<TKey,TValue> : IDictionary<TKey,TValue>, IClone
         public OptimizedDictionary(IDictionary<TKey, int> index, IEnumerable<TValue> values)
         {
             _index = index;
-            _values = values.ToList();
+            _values = new List<TValue>(values);
         }
 
         /// <summary>
@@ -66,6 +66,10 @@ private void AddKeyToIndex(TKey key)
                 if (!_index.ContainsKey(key))
                 {
                     _index.Add(key, _index.Count);
+                    while (_values.Count < _index.Count)
+                    {
+                        _values.Add(default(TValue));
+                    }
                 }
             }
         }
@@ -217,6 +221,10 @@ public TValue this[TKey key]
             }
             set
             {
+                if (!_index.ContainsKey(key))
+                {
+                    AddKeyToIndex(key);
+                }
                 try
                 {
                     _values[_index[key]] = value;
@@ -225,10 +233,6 @@ public TValue this[TKey key]
                 {
                     throw new ArgumentNullException("key");
                 }
-                catch (KeyNotFoundException)
-                {
-                    throw new KeyNotFoundException();
-                }
             }
         }
 
diff --git a/Simple.Data.SqlTest/QueryTest.cs b/Simple.Data.SqlTest/QueryTest.cs
@@ -6,6 +6,8 @@
 
 namespace Simple.Data.SqlTest
 {
+    using System.Collections;
+
     [TestFixture]
     public class QueryTest
     {
@@ -316,5 +318,14 @@ public void QueryWithSchemaQualifiedTableNameAndAliases()
             Assert.AreEqual(2, result.This);
             Assert.AreEqual("Pass", result.That);
         }
+
+        [Test]
+        public void WithClauseShouldPreselectSubTable()
+        {
+            var db = DatabaseHelper.Open();
+            var result = db.Customers.FindAllByCustomerId(1).WithOrders().FirstOrDefault() as IDictionary<string,object>;
+            Assert.IsNotNull(result);
+            Assert.Contains("Orders", (ICollection)result.Keys);
+        }
     }
 }
diff --git a/Simple.Data/Extensions/EnumerableExtensions.cs b/Simple.Data/Extensions/EnumerableExtensions.cs
@@ -13,6 +13,13 @@ public static IDictionary<TKey,TValue> ToDictionary<TKey,TValue>(this IEnumerabl
             return source.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
         }
 
+        public static IDictionary<TKey,TValue> ToDictionary<TKey,TValue>(this IEnumerable<KeyValuePair<TKey,TValue>> source, IEqualityComparer<TKey> equalityComparer)
+        {
+            var dict = source as IDictionary<TKey, TValue>;
+            if (dict != null) return new Dictionary<TKey, TValue>(dict);
+            return source.ToDictionary(kvp => kvp.Key, kvp => kvp.Value, equalityComparer);
+        }
+
         public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source)
         {
             var buffer = default(T);

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,14 @@ private IEnumerable<IDictionary<string,object>> CreateObjectGraphs()`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ IDictionary<string,int> index = null;`
`67`	`68`	`foreach (var kvp in load)`
`68`	`69`	`{`
	`70`	`+ if (index == null)`
	`71`	`+ {`
	`72`	`+ index = kvp.Key.Keys.Select((k, i) => new KeyValuePair<string, int>(k, i)).ToDictionary(HomogenizedEqualityComparer.DefaultInstance);`
	`73`	`+ }`
	`74`	`+ var row = new OptimizedDictionary<string, object>(index, kvp.Key.Values);`
`69`	`75`	`foreach (var sub in kvp.Value)`
`70`	`76`	`{`
`71`	`77`	`if (sub.Value.Count == 1)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class OptimizedDictionary<TKey,TValue> : IDictionary<TKey,TValue>, IClone`
`14`	`14`	`public OptimizedDictionary(IDictionary<TKey, int> index, IEnumerable<TValue> values)`
`15`	`15`	`{`
`16`	`16`	`_index = index;`
`17`		`- _values = values.ToList();`
	`17`	`+ _values = new List<TValue>(values);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/// <summary>`
`@@ -66,6 +66,10 @@ private void AddKeyToIndex(TKey key)`
`66`	`66`	`if (!_index.ContainsKey(key))`
`67`	`67`	`{`
`68`	`68`	`_index.Add(key, _index.Count);`
	`69`	`+ while (_values.Count < _index.Count)`
	`70`	`+ {`
	`71`	`+ _values.Add(default(TValue));`
	`72`	`+ }`
`69`	`73`	`}`
`70`	`74`	`}`
`71`	`75`	`}`
`@@ -217,6 +221,10 @@ public TValue this[TKey key]`
`217`	`221`	`}`
`218`	`222`	`set`
`219`	`223`	`{`
	`224`	`+ if (!_index.ContainsKey(key))`
	`225`	`+ {`
	`226`	`+ AddKeyToIndex(key);`
	`227`	`+ }`
`220`	`228`	`try`
`221`	`229`	`{`
`222`	`230`	`_values[_index[key]] = value;`
`@@ -225,10 +233,6 @@ public TValue this[TKey key]`
`225`	`233`	`{`
`226`	`234`	`throw new ArgumentNullException("key");`
`227`	`235`	`}`
`228`		`- catch (KeyNotFoundException)`
`229`		`- {`
`230`		`- throw new KeyNotFoundException();`
`231`		`- }`
`232`	`236`	`}`
`233`	`237`	`}`
`234`	`238`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace Simple.Data.SqlTest`
`8`	`8`	`{`
	`9`	`+ using System.Collections;`
	`10`	`+`
`9`	`11`	`[TestFixture]`
`10`	`12`	`public class QueryTest`
`11`	`13`	`{`
`@@ -316,5 +318,14 @@ public void QueryWithSchemaQualifiedTableNameAndAliases()`
`316`	`318`	`Assert.AreEqual(2, result.This);`
`317`	`319`	`Assert.AreEqual("Pass", result.That);`
`318`	`320`	`}`
	`321`	`+`
	`322`	`+ [Test]`
	`323`	`+ public void WithClauseShouldPreselectSubTable()`
	`324`	`+ {`
	`325`	`+ var db = DatabaseHelper.Open();`
	`326`	`+ var result = db.Customers.FindAllByCustomerId(1).WithOrders().FirstOrDefault() as IDictionary<string,object>;`
	`327`	`+ Assert.IsNotNull(result);`
	`328`	`+ Assert.Contains("Orders", (ICollection)result.Keys);`
	`329`	`+ }`
`319`	`330`	`}`
`320`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,13 @@ public static IDictionary<TKey,TValue> ToDictionary<TKey,TValue>(this IEnumerabl`
`13`	`13`	`return source.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ public static IDictionary<TKey,TValue> ToDictionary<TKey,TValue>(this IEnumerable<KeyValuePair<TKey,TValue>> source, IEqualityComparer<TKey> equalityComparer)`
	`17`	`+ {`
	`18`	`+ var dict = source as IDictionary<TKey, TValue>;`
	`19`	`+ if (dict != null) return new Dictionary<TKey, TValue>(dict);`
	`20`	`+ return source.ToDictionary(kvp => kvp.Key, kvp => kvp.Value, equalityComparer);`
	`21`	`+ }`
	`22`	`+`
`16`	`23`	`public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source)`
`17`	`24`	`{`
`18`	`25`	`var buffer = default(T);`