From 2a1c37906f20fcd1e777e28528915b726fd5bfe7 Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 31 Jan 2017 08:13:38 -0500 Subject: [PATCH] Allow definition of numeric default values by string --- src/main/java/com/iciql/ModelUtils.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iciql/ModelUtils.java b/src/main/java/com/iciql/ModelUtils.java index 14dc615..eb48faf 100644 --- a/src/main/java/com/iciql/ModelUtils.java +++ b/src/main/java/com/iciql/ModelUtils.java @@ -407,9 +407,11 @@ class ModelUtils { if (isNullOrEmpty(defaultValue)) { return true; } + Pattern numericDefault = Pattern.compile("\\d+"); Pattern literalDefault = Pattern.compile("'.*'"); Pattern functionDefault = Pattern.compile("[^'].*[^']"); - return literalDefault.matcher(defaultValue).matches() + return numericDefault.matcher(defaultValue).matches() + || literalDefault.matcher(defaultValue).matches() || functionDefault.matcher(defaultValue).matches(); } @@ -431,6 +433,14 @@ class ModelUtils { return true; } + // numeric value + Pattern numericDefault = Pattern.compile("\\d+"); + if (numericDefault.matcher(defaultValue).matches()) { + // assume numeric values are legal + return true; + } + + // function / variable Pattern functionDefault = Pattern.compile("[^'].*[^']"); if (functionDefault.matcher(defaultValue).matches()) { -- 2.39.5