Improved AsOData() to allow null values

InABox.Core/Client/Client.cs

@@ -360,16 +360,6 @@ namespace InABox.Clients
                 throw new NotSupportedException(string.Format("{0} is not supported in this context", typeof(TEntity).EntityName()));
         }
 
-        private string FilterToString(Filter<TEntity> filter)
-        {
-            return filter != null ? filter.AsOData() : "";
-        }
-
-        private string OrderToString(SortOrder<TEntity> order)
-        {
-            return order != null ? order.AsOData() : "";
-        }
-
         public CoreTable Query(Filter<TEntity>? filter = null, Columns<TEntity>? columns = null, SortOrder<TEntity>? orderby = null)
         {
             try

InABox.Core/Filter.cs

@@ -46,7 +46,7 @@ namespace InABox.Core
 
         public override string ToString()
         {
-            return $"{typeof(T).Name}.{Column} WHERE {Filter?.AsOData()}";
+            return $"{typeof(T).Name}.{Column} WHERE {Filter?.ToString()}";
         }
     }
 
@@ -1674,7 +1674,7 @@ namespace InABox.Core
             }
             else if (Expression != null)
             {
-                var value = "''";
+                var value = "null";
                 if (Value != null)
                 {
                     value = ValueToString(Value);

InABox.Server/RestService.cs

@@ -233,7 +233,7 @@ namespace InABox.API
 
             Logger.Send(LogType.Information, userid,
                 string.Format("[{0} {1}] Query{2}: Filter=[{3}] Sort=[{4}]", request.Credentials.Platform, request.Credentials.Version,
-                    SimpleName(typeof(TEntity)), request.Filter != null ? request.Filter.AsOData() : "",
+                    SimpleName(typeof(TEntity)), request.Filter != null ? request.Filter.ToString() : "",
                     request.Sort != null ? request.Sort.AsOData() : ""));
 
             try

inabox.wpf/DynamicGrid/Editors/FilterEditor/FilterEditorControl.cs

@@ -131,7 +131,7 @@ namespace InABox.DynamicGrid
             if(window.ShowDialog() == true)
             {
                 Filter = getMethod.Invoke(window, Array.Empty<object>()) as IFilter;
-                TextBox.Text = Filter?.AsOData();
+                TextBox.Text = Filter?.ToString();
                 CheckChanged();
             }
         }
@@ -147,7 +147,7 @@ namespace InABox.DynamicGrid
                 Filter = Serialization.Deserialize(typeof(Filter<>).MakeGenericType(FilterType), value) as IFilter;
             else
                 Filter = null;
-            TextBox.Text = Filter?.AsOData();
+            TextBox.Text = Filter?.ToString();
         }
     }
 }