Added support for "as", "coalesce"

systay · Dec 1, 2011 · 1b02ca6 · 1b02ca6
1 parent 6ac1d86
commit 1b02ca6
Show file tree

Hide file tree

Showing 7 changed files with 268 additions and 116 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,6 +14,7 @@
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>
 
   <properties>
+    <neo4j.version>1.6-SNAPSHOT</neo4j.version>
     <bundle.namespace>org.neo4j.cypherdsl</bundle.namespace>
     <short-name>cypher-dsl</short-name>
     <license-text.header>GPL-3-header.txt</license-text.header>
@@ -76,21 +77,21 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-kernel</artifactId>
-      <version>1.5</version>
+      <version>${neo4j.version}</version>
       <type>jar</type>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-lucene-index</artifactId>
-      <version>1.5</version>
+      <version>${neo4j.version}</version>
       <type>jar</type>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher</artifactId>
-      <version>1.5</version>
+      <version>${neo4j.version}</version>
       <optional>true</optional>
     </dependency>
 
@@ -111,7 +112,7 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-kernel</artifactId>
-      <version>1.5</version>
+      <version>${neo4j.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

diff --git a/src/main/java/org/neo4j/cypherdsl/CypherQuery.java b/src/main/java/org/neo4j/cypherdsl/CypherQuery.java
@@ -167,22 +167,22 @@ protected WhereExpression.Not not(WhereExpression.PredicateExpression expr)
     }
 
     // Return -------------------------------------------------------
-    protected ReturnExpression.ReturnNode nodes( String... names )
+    protected ReturnExpression.ReturnNodes nodes( String... names )
     {
         return ReturnExpression.nodes( names );
     }
 
-    protected ReturnExpression.ReturnRelationship relationships( String... names )
+    protected ReturnExpression.ReturnRelationships relationships( String... names )
     {
         return ReturnExpression.relationships( names );
     }
 
-    protected ReturnExpression.ReturnProperty properties( String... names )
+    protected ReturnExpression.ReturnProperties properties( String... names )
     {
         return ReturnExpression.properties( names );
     }
 
-    protected ReturnExpression.ReturnPath paths( String... names )
+    protected ReturnExpression.ReturnPaths paths( String... names )
     {
         return ReturnExpression.paths( names );
     }
@@ -222,27 +222,32 @@ protected ReturnExpression.ReturnAggregate collect(String name)
         return ReturnExpression.collect( name );
     }
 
-    protected ReturnExpression length( String name )
+    protected ReturnExpression.ReturnNameFunction length( String name )
     {
         return ReturnExpression.length( name );
     }
 
-    protected ReturnExpression.ReturnFunction type(String name)
+    protected ReturnExpression.ReturnNameFunction type(String name)
     {
         return ReturnExpression.type( name );
     }
 
-    protected ReturnExpression.ReturnFunction id(String name)
+    protected ReturnExpression.ReturnNameFunction id(String name)
     {
         return ReturnExpression.id( name );
     }
 
-    protected ReturnExpression.ReturnFunction nodesOf(String name)
+    protected ReturnExpression.ReturnExpressionsFunction coalesce(ReturnExpression... expressions)
+    {
+        return ReturnExpression.coalesce( expressions );
+    }
+
+    protected ReturnExpression.ReturnNameFunction nodesOf(String name)
     {
         return ReturnExpression.nodesOf( name );
     }
 
-    protected ReturnExpression.ReturnFunction relationshipsOf(String name)
+    protected ReturnExpression.ReturnNameFunction relationshipsOf(String name)
     {
         return ReturnExpression.relationshipsOf( name );
     }