Correct regex to match only full words

tihomir-kit · Oct 2, 2017 · 0d12aba · 0d12aba
1 parent 24c7118
commit 0d12aba
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/InfluxData.Net.InfluxDb/Helpers/QueryHelpers.cs b/InfluxData.Net.InfluxDb/Helpers/QueryHelpers.cs
@@ -10,36 +10,36 @@ public static class QueryHelpers
     {
         public static string BuildParameterizedQuery(string query, object param)
         {
-            var paramRegex = "@([A-Za-z0-9åäöÅÄÖ'_-]+)";
-
-            var matches = Regex.Matches(query, paramRegex);
-
             Type t = param.GetType();
             PropertyInfo[] pi = t.GetProperties();
 
-            foreach(Match match in matches) 
-            {
-                if (!pi.Any(x => match.Groups[0].Value.Contains(x.Name)))
-                    throw new ArgumentException($"Missing parameter value for {match.Groups[0].Value}");
-            }
 
             foreach (var propertyInfo in pi)
             {
+                var regex = $@"@{propertyInfo.Name}(?!\w)";
+
+                if(!Regex.IsMatch(query, regex) && Nullable.GetUnderlyingType(propertyInfo.GetType()) != null)
+                    throw new ArgumentException($"Missing parameter identifier for @{propertyInfo.Name}");
+
                 var paramValue = propertyInfo.GetValue(param);
+                if (paramValue == null)
+                    continue;
+
                 var paramType = paramValue.GetType();
 
-                if(!paramType.IsPrimitive && paramType != typeof(String))
+                if (!paramType.IsPrimitive && paramType != typeof(String) && paramType != typeof(DateTime))
                     throw new NotSupportedException($"The type {paramType.Name} is not a supported query parameter type.");
 
                 var sanitizedParamValue = paramValue;
 
-                if(paramType == typeof(String)) {
+                if (paramType == typeof(String))
+                {
                     sanitizedParamValue = ((string)sanitizedParamValue).Sanitize();
                 }
 
-                while (Regex.IsMatch(query, $"@{propertyInfo.Name}"))
+                while (Regex.IsMatch(query, regex))
                 {
-                    var match = Regex.Match(query, $"@{propertyInfo.Name}");
+                    var match = Regex.Match(query, regex);
 
                     query = query.Remove(match.Index, match.Length);
                     query = query.Insert(match.Index, $"{sanitizedParamValue}");
@@ -49,4 +49,4 @@ public static string BuildParameterizedQuery(string query, object param)
             return query;
         }
     }
-}
+}