From fe4dea1e82cb1c291effdec482b20a41c764f52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Thu, 21 Apr 2016 21:08:50 +0300
Subject: [PATCH] Further improve normalization

---
 .../main/java/com/mysema/query/support/Normalization.java    | 2 +-
 .../java/com/mysema/query/support/NormalizationTest.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/querydsl-core/src/main/java/com/mysema/query/support/Normalization.java b/querydsl-core/src/main/java/com/mysema/query/support/Normalization.java
index 6f825ea47..94de7c80c 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/Normalization.java
+++ b/querydsl-core/src/main/java/com/mysema/query/support/Normalization.java
@@ -26,7 +26,7 @@ public final class Normalization {
 
     // TODO simplify
     private static final Pattern FULL_OPERATION = Pattern.compile(
-            "(?<![\\d*/\"?' ])" + "(\\b|\\(|\\s+)"  +
+            "(?<![\\d*/\"?'\\- ])" + "(\\b|\\(|\\s+)"  +
             "(" + NUMBER + WS + "[+\\-/*%]" + WS + ")+" + NUMBER + WS +
             "(?![\\d*/\"' ])");
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/NormalizationTest.java b/querydsl-core/src/test/java/com/mysema/query/support/NormalizationTest.java
index 43359140a..a67309ad4 100644
--- a/querydsl-core/src/test/java/com/mysema/query/support/NormalizationTest.java
+++ b/querydsl-core/src/test/java/com/mysema/query/support/NormalizationTest.java
@@ -83,6 +83,7 @@ public class NormalizationTest {
         assertEquals("2 + 3 * hours", Normalization.normalize("2 + 3 * hours"));
         assertEquals("2 + 3 * 0hours", Normalization.normalize("2 + 3 * 0hours"));
         assertEquals("a like '1 + 2 ' and b like '2 * 3'", Normalization.normalize("a like '1 + 2 ' and b like '2 * 3'"));
+        assertEquals("xxx in ('ABC123-4567-3214-EDBD982')", Normalization.normalize("xxx in ('ABC123-4567-3214-EDBD982')"));
     }
 
     @Test
@@ -108,8 +109,8 @@ public class NormalizationTest {
 
     @Test
     public void Substring() {
-        assertEquals("substring(cat.name,1,locate(?1,cat.name)-1)",
-                Normalization.normalize("substring(cat.name,0+1,locate(?1,cat.name)-1-0)"));
+        assertEquals("substring(cat.name,1,locate(?1,cat.name)-1-2)",
+                Normalization.normalize("substring(cat.name,0+1,locate(?1,cat.name)-1-2)"));
     }
 
     @Test