Reverted API change

systay · Jan 18, 2012 · 09bd6f5 · 09bd6f5
1 parent cc596cc
commit 09bd6f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/cypher/src/main/java/org/neo4j/cypher/javacompat/ExecutionEngine.java b/cypher/src/main/java/org/neo4j/cypher/javacompat/ExecutionEngine.java
@@ -37,7 +37,7 @@ public class ExecutionEngine
      * Creates an execution engine around the give graph database
      * @param database The database to wrap
      */
-    public ExecutionEngine( AbstractGraphDatabase database )
+    public ExecutionEngine( GraphDatabaseService database )
     {
         inner = new org.neo4j.cypher.ExecutionEngine( database );
     }

diff --git a/cypher/src/main/scala/org/neo4j/cypher/ExecutionEngine.scala b/cypher/src/main/scala/org/neo4j/cypher/ExecutionEngine.scala
@@ -26,19 +26,27 @@ import java.lang.Error
 import java.util.{Map => JavaMap}
 import scala.deprecated
 import org.neo4j.kernel.AbstractGraphDatabase
+import org.neo4j.graphdb.GraphDatabaseService
 
-class ExecutionEngine(graph: AbstractGraphDatabase) {
+class ExecutionEngine(graph: GraphDatabaseService) {
   checkScalaVersion()
 
   require(graph != null, "Can't work with a null graph database")
 
   val parser = createCorrectParser()
 
-  def createCorrectParser() = graph.getConfig.getParams.asScala.get("cypher_parser_version") match {
-    case None => new CypherParser()
-    case Some(v) => new CypherParser(v.toString)
+  def createCorrectParser() = if (graph.isInstanceOf[AbstractGraphDatabase]) {
+    val database = graph.asInstanceOf[AbstractGraphDatabase]
+    database.getConfig.getParams.asScala.get("cypher_parser_version") match {
+      case None => new CypherParser()
+      case Some(v) => new CypherParser(v.toString)
+    }
+  }
+  else {
+    new CypherParser()
   }
 
+
   @throws(classOf[SyntaxException])
   def execute(query: String): ExecutionResult = execute(query, Map[String, Any]())