From fc9b3283d9caf57087d34deb283e8f37a0fb84c1 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 8 Feb 2013 17:35:29 +0000
Subject: [PATCH] Fix regex validation of custom SQL query: make '' around
${params} optional and support providing type information to the magic ${key}
parameters.
SVN: 28320
---
.../client/web/client/application/module/SQLQueryField.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.java
index f0fb79c2896..231acf1ce46 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.java
@@ -39,9 +39,9 @@ public class SQLQueryField extends MultilineVarcharField
private final static String EMPTY_TEXT_WITH_KEY_AND_TYPE = EMPTY_TEXT_WITH_KEY
+ " ... '${type}'";
- private static final String TYPE_REGEX = "'\\$\\{type\\}'";
+ private static final String TYPE_REGEX = "\\$\\{type(::[^{}]+){0,1}\\}";
- private static final String KEY_REGEX = "'\\$\\{key\\}'";
+ private static final String KEY_REGEX = "\\$\\{key(::[^{}]+){0,1}\\}";
private static final String ANY_REGEX = "(.|[\\n\\r])*";
--
GitLab