Merge pull request #147 from KupVadim/master

Change OrderByDescending query generation
DotNet4Neo4j · Jan 20, 2016 · da70222 · da70222
2 parents fe019a0 + b2d210b
commit da70222
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Neo4jClient.Tests/Cypher/CypherFluentQueryTests.cs b/Neo4jClient.Tests/Cypher/CypherFluentQueryTests.cs
@@ -297,15 +297,15 @@ public void OrderNodesByMultiplePropertiesDescending()
             // http://docs.neo4j.org/chunked/stable/query-order.html#order-by-order-nodes-in-descending-order
             // START n=node(3,1,2)
             // RETURN n
-            // ORDER BY n.age, n.name DESC
+            // ORDER BY n.age DESC, n.name DESC
 
             var client = Substitute.For<IRawGraphClient>();
             var query = new CypherFluentQuery(client)
                 .Return<object>("n")
                 .OrderByDescending("n.age", "n.name")
                 .Query;
 
-            Assert.AreEqual("RETURN n\r\nORDER BY n.age, n.name DESC", query.QueryText);
+            Assert.AreEqual("RETURN n\r\nORDER BY n.age DESC, n.name DESC", query.QueryText);
             Assert.AreEqual(0, query.QueryParameters.Count);
         }
 

diff --git a/Neo4jClient/Cypher/CypherFluentQuery.cs b/Neo4jClient/Cypher/CypherFluentQuery.cs
@@ -348,7 +348,7 @@ public ICypherFluentQuery OrderBy(params string[] properties)
         public ICypherFluentQuery OrderByDescending(params string[] properties)
         {
             return Mutate(w =>
-                w.AppendClause(string.Format("ORDER BY {0} DESC", string.Join(", ", properties))));
+                w.AppendClause(string.Format("ORDER BY {0} DESC", string.Join(" DESC, ", properties))));
         }
 
         public CypherQuery Query

diff --git a/Neo4jClient/Cypher/CypherFluentQuery`TResult.cs b/Neo4jClient/Cypher/CypherFluentQuery`TResult.cs
@@ -41,7 +41,7 @@ public CypherFluentQuery(IGraphClient client, QueryWriter writer)
         public new ICypherFluentQuery<TResult> OrderByDescending(params string[] properties)
         {
             return Mutate<TResult>(w =>
-                w.AppendClause(string.Format("ORDER BY {0} DESC", string.Join(", ", properties))));
+                w.AppendClause(string.Format("ORDER BY {0} DESC", string.Join(" DESC, ", properties))));
         }
 
         public IEnumerable<TResult> Results