CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-30 21:08:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve operator precedence in JDOQL

Browse Source
This commit is contained in:
Timo Westkämper 2015-02-25 22:51:33 +02:00
parent 514782b9e6
commit b5bfaaee79
3 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
querydsl-core/src/main/java/com/querydsl/core/types/JavaTemplates.java
View File

@ -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()");

2
querydsl-jdo/src/main/java/com/querydsl/jdo/JDOQLTemplates.java
View File

@ -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);

71
querydsl-jdo/src/test/java/com/querydsl/jdo/JDOQLTemplatesTest.java Normal file
View File

@ -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);
}
}
}
}