From b5bfaaee791d8e7fbd51079f2c6eb7aa609149bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Wed, 25 Feb 2015 22:51:33 +0200
Subject: [PATCH] Improve operator precedence in JDOQL

---
 .../querydsl/core/types/JavaTemplates.java    |  2 +-
 .../java/com/querydsl/jdo/JDOQLTemplates.java |  2 +
 .../com/querydsl/jdo/JDOQLTemplatesTest.java  | 71 +++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java

diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java b/querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java
index ecfd05683..e6c84334e 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java
@@ -42,7 +42,7 @@ public class JavaTemplates extends Templates {
         add(Ops.COL_SIZE, "{0}.size()");
 
         // array
-        add(Ops.ARRAY_SIZE, "{0}.length");
+        add(Ops.ARRAY_SIZE, "{0}.length", 0);
 
         // map
         add(Ops.MAP_IS_EMPTY, "{0}.isEmpty()");
diff --git a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java
index 0e90338da..fcfae304e 100644
--- a/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java
+++ b/querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java
@@ -28,6 +28,8 @@ public final class JDOQLTemplates extends JavaTemplates {
     public static final JDOQLTemplates DEFAULT = new JDOQLTemplates();
 
     protected JDOQLTemplates() {
+        setPrecedence(17, Ops.GOE, Ops.GT, Ops.LOE, Ops.LT, Ops.INSTANCE_OF);
+
         // String
         add(Ops.STRING_CONTAINS, "{0}.indexOf({1}) > -1", 25);
         add(Ops.STRING_CONTAINS_IC, "{0l}.indexOf({1l}) > -1", 25);
diff --git a/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java
new file mode 100644
index 000000000..f6eafb5a7
--- /dev/null
+++ b/querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java
@@ -0,0 +1,71 @@
+package com.querydsl.jdo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.querydsl.core.types.Operator;
+import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Template;
+
+import junit.framework.Assert;
+
+public class JDOQLTemplatesTest {
+
+    @Test
+    public void Precedence() {
+//        Cast
+//        Unary ("~") ("!")
+        int p1 =  getPrecedence(Ops.NOT);
+//        Unary ("+") ("-")
+        int p2 = getPrecedence(Ops.NEGATE);
+//        Multiplicative ("*") ("/") ("%")
+        int p3 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD);
+//        Additive ("+") ("-")
+        int p4 = getPrecedence(Ops.ADD, Ops.SUB);
+//        Relational (">=") (">") ("<=") ("<") ("instanceof")
+        int p5 = getPrecedence(Ops.GOE, Ops.GT, Ops.LOE, Ops.LT, Ops.INSTANCE_OF);
+//        Equality ("==") ("!=")
+        int p6 = getPrecedence(Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE);
+//        Boolean logical AND ("&")
+//        Boolean logical OR ("|")
+//        Conditional AND ("&&")
+        int p7 = getPrecedence(Ops.AND);
+//        Conditional OR ("||")
+        int p8 = getPrecedence(Ops.OR);
+
+        assertTrue(p1 < p2);
+        assertTrue(p2 < p3);
+        assertTrue(p3 < p4);
+        assertTrue(p4 < p5);
+        assertTrue(p5 < p6);
+        assertTrue(p6 < p7);
+        assertTrue(p7 < p8);
+    }
+
+    protected int getPrecedence(Operator... ops) {
+        int precedence = JDOQLTemplates.DEFAULT.getPrecedence(ops[0]);
+        for (int i = 1; i < ops.length; i++) {
+            assertEquals(ops[i].name(), precedence, JDOQLTemplates.DEFAULT.getPrecedence(ops[i]));
+        }
+        return precedence;
+    }
+
+    @Test
+    public void Generic_Precedence() {
+        JDOQLTemplates templates = JDOQLTemplates.DEFAULT;
+        int likePrecedence = templates.getPrecedence(Ops.LIKE);
+        for (Operator op : Ops.values()) {
+            Template template = templates.getTemplate(op);
+            int precedence = templates.getPrecedence(op);
+            if (template.toString().contains(" like ") && precedence != likePrecedence) {
+                Assert.fail("Unexpected precedence for " + op + " with template " + template);
+            } else if (!template.toString().contains("(") && precedence < 0) {
+                Assert.fail("Unexpected precedence for " + op + " with template " + template);
+            }
+
+        }
+    }
+
+}