Prepare for Cursor<T> implementing #4 dynamic run.

bchavez · Oct 22, 2015 · b2514dc · b2514dc
1 parent 9c102dd
commit b2514dc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/Source/RethinkDb.Driver.Tests/ConnectionTest.cs b/Source/RethinkDb.Driver.Tests/ConnectionTest.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using FluentAssertions;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
@@ -158,17 +159,26 @@ public void insert_an_array_of_pocos()
             var result = r.db(DbName).table(TableName).insert(arr).run(conn);
             result.Dump();
         }
-
+
         [Test]
         public void get_test()
         {
             var foo = r.db(DbName).table(TableName).get("a").run<Foo>(conn);
             foo.Dump();
         }
 
+        [Test]
+        public void getall_test()
+        {
+            var all = r.db(DbName).table(TableName).getAll("a", "b", "c").run(conn) as Cursor<object>;
+
+            all.BufferedItems.Dump();
+            //all.GetType().Dump();
+        }
+
         [Test]
         public void Test()
-        {
+        {
 
             Poco.Converter = o =>
                 {
@@ -179,11 +189,11 @@ public void Test()
     }
 
     public class Foo
-    {
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+    {
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public string id { get; set; }
-        public int Bar { get; set; }
+        public int Bar { get; set; }
         public int Baz { get; set; }
     }
 
-}
+}
diff --git a/Source/RethinkDb.Driver/Ast/ReqlAst.cs b/Source/RethinkDb.Driver/Ast/ReqlAst.cs
@@ -94,4 +94,4 @@ public void runNoReply(Connection conn, OptArgs globalOpts)
         }
 
     }
-}
+}
diff --git a/Source/RethinkDb.Driver/Net/Connection.cs b/Source/RethinkDb.Driver/Net/Connection.cs
@@ -178,8 +178,7 @@ internal virtual T RunQuery<T>(Query query)
             else if( res.IsPartial || res.IsSequence )
             {
                 ICursor cursor = Cursor<T>.create(this, query, res);
-                cursor.Extend(res);
-                return (T) cursor;
+                return (T)cursor;
             }
             else if( res.IsWaitComplete )
             {
@@ -294,4 +293,4 @@ public virtual Connection connect()
     }
 
 
-}
+}
diff --git a/Source/RethinkDb.Driver/Net/Cursor.cs b/Source/RethinkDb.Driver/Net/Cursor.cs
@@ -17,7 +17,7 @@ internal interface ICursor : IEnumerable
         long Token { get; }
     }
 
-    internal abstract class Cursor<T> : IEnumerable<T>, IEnumerator<T>, ICursor
+    public abstract class Cursor<T> : IEnumerable<T>, IEnumerator<T>, ICursor
     {
         // public immutable members
         public long Token { get; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,4 +94,4 @@ public void runNoReply(Connection conn, OptArgs globalOpts) @@
             }
         }
-    }
+    }