From 885d2e9a57d8a120f43a6b93b35f278e1b5447ae Mon Sep 17 00:00:00 2001
From: Manthan Surkar <manthan.surkar@gmail.com>
Date: Thu, 25 Jun 2020 19:55:41 +0530
Subject: [PATCH] Fixes Invalid Regex in Exception Messege(SQL builder)

---
 .../fineract/infrastructure/security/utils/SQLBuilder.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
index bc4a1382b..ae5f1343a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
@@ -76,7 +76,8 @@ public class SQLBuilder {
         }
         String columnName = trimmedCriteria.substring(0, columnOperatorIndex).trim().toLowerCase(Locale.ROOT);
         if (!ATOZ.matcher(columnName).matches()) {
-            throw new IllegalArgumentException("criteria column name must match [a-z]: " + trimmedCriteria);
+            throw new IllegalArgumentException(
+                    "criteria column name must match [a-zA-Z_][a-zA-Z0-9_-]*\\.)?[a-zA-Z_-][a-zA-Z0-9_-]* : " + trimmedCriteria);
         }
         String operator = trimmedCriteria.substring(columnOperatorIndex).trim();
         if (operator.indexOf(' ') > -1) {