Change AutoQuery to use shared string.ChangeTo(Type) ext method

ServiceStack · May 23, 2016 · e6c454f · e6c454f
1 parent 19f3371
commit e6c454f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/lib/ServiceStack.Text.dll b/lib/ServiceStack.Text.dll
diff --git a/src/ServiceStack.Server/AutoQueryFeature.cs b/src/ServiceStack.Server/AutoQueryFeature.cs
@@ -846,9 +846,7 @@ private static void AppendUntypedQueries(SqlExpression<From> q, Dictionary<strin
                       TypeSerializer.DeserializeFromString(strValue, Array.CreateInstance(fieldType, 0).GetType())
                     : fieldType == typeof(string) ? 
                       strValue
-                    : fieldType.IsValueType && !fieldType.IsEnum ? 
-                      Convert.ChangeType(strValue, fieldType) :
-                      TypeSerializer.DeserializeFromString(strValue, fieldType);
+                    : strValue.ChangeTo(fieldType);
 
                 AddCondition(q, defaultTerm, quotedColumn, value, implicitQuery);
             }

diff --git a/src/ServiceStack/AutoQueryDataFeature.cs b/src/ServiceStack/AutoQueryDataFeature.cs
@@ -1241,9 +1241,7 @@ private static void AppendUntypedQueries(IDataQuery q, Dictionary<string, string
                       TypeSerializer.DeserializeFromString(strValue, Array.CreateInstance(fieldType, 0).GetType())
                     : fieldType == typeof(string) ? 
                       strValue
-                    : fieldType.IsValueType && !fieldType.IsEnum ? 
-                      Convert.ChangeType(strValue, fieldType) :
-                      TypeSerializer.DeserializeFromString(strValue, fieldType);
+                    : strValue.ChangeTo(fieldType);
 
                 AddCondition(q, defaultTerm, match.FieldDef, value, condition);
             }