minor adjustments

hopecee · Jan 13, 2018 · b9768d5 · b9768d5
1 parent 19b8904
commit b9768d5
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/main/java/org/datanucleus/store/neo4j/query/QueryToCypherMapper.java b/src/main/java/org/datanucleus/store/neo4j/query/QueryToCypherMapper.java
@@ -667,13 +667,13 @@ protected Object processPrimaryExpression(PrimaryExpression expr)
         Expression left = expr.getLeft();
         if (left == null)
         {
-            /*if (expr.getId().equals(compilation.getCandidateAlias()))
+            if (expr.getId().equals(compilation.getCandidateAlias()))
             {
                 // Special case of the candidate
-                Neo4jFieldExpression fieldExpr = new Neo4jFieldExpression(compilation.getCandidateAlias());
+                Neo4jFieldExpression fieldExpr = new Neo4jFieldExpression(compilation.getCandidateAlias(), null, null);
                 stack.push(fieldExpr);
                 return fieldExpr;
-            }*/
+            }
 
             Neo4jFieldExpression fieldExpr = getFieldNameForPrimary(expr);
             if (fieldExpr == null)
@@ -682,19 +682,25 @@ protected Object processPrimaryExpression(PrimaryExpression expr)
                 {
                     filterComplete = false;
                 }
-                NucleusLogger.QUERY.debug(">> Primary " + expr + " is not stored in this Neo4j type, so unexecutable in datastore");
+                else if (compileComponent == CompilationComponent.ORDERING)
+                {
+                    orderComplete = false;
+                }
+                else if (compileComponent == CompilationComponent.RESULT)
+                {
+                    resultComplete = false;
+                }
+                NucleusLogger.QUERY.warn(">> Primary " + expr + " is not stored in this Neo4j type, so unexecutable in datastore");
             }
             else
             {
-                // Assume all fields are prefixed by the candidate alias!
+                // Assume all fields are prefixed by the candidate alias! TODO When we support fields in related objects then remove this and put in the Neo4jFieldExpression creation
                 fieldExpr = new Neo4jFieldExpression(compilation.getCandidateAlias() + "." + fieldExpr.getFieldName(), fieldExpr.getMemberMetaData(), fieldExpr.getMemberColumnMapping());
-//                Neo4jFieldExpression fieldExpr = new Neo4jFieldExpression(compilation.getCandidateAlias() + "." + fieldName);
                 stack.push(fieldExpr);
                 return fieldExpr;
             }
         }
 
-        // TODO Auto-generated method stub
         return super.processPrimaryExpression(expr);
     }
 
@@ -812,8 +818,10 @@ else if (argExpr instanceof Literal)
             if (invokedNeo4jExpr instanceof Neo4jFieldExpression)
             {
                 Neo4jFieldExpression invokedFieldExpr = (Neo4jFieldExpression)invokedNeo4jExpr;
+
                 if (invokedFieldExpr.getMemberMetaData().getType() == String.class)
                 {
+                    // String methods
                     if ("toUpperCase".equals(operation))
                     {
                         Neo4jExpression neo4jExpr = new Neo4jStringExpression("toUpper(" + invokedFieldExpr.getCypherText() + ")");