Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/EntityFramework.DynamicFilters.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2005
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework.DynamicFilters", "EntityFramework.DynamicFilters\EntityFramework.DynamicFilters.csproj", "{56E36AD1-E675-42F0-96CB-7F475E05E491}"
EndProject
Expand Down
17 changes: 13 additions & 4 deletions src/EntityFramework.DynamicFilters/DynamicFilterDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

namespace EntityFramework.DynamicFilters
{
internal class DynamicFilterDefinition
[Serializable]
public class DynamicFilterDefinition
{
/// <summary>
/// Unique ID assigned to each distinct filter. Used to find unique filters on an entity
Expand All @@ -22,16 +23,24 @@ internal class DynamicFilterDefinition
/// </summary>
public string ColumnName { get; private set; }



[NonSerialized]
private LambdaExpression _predicate;


/// <summary>
/// Set if the filter is a LambdaExpression. Null if filter is a single column equality filter.
/// </summary>
public LambdaExpression Predicate { get; private set; }
/// </summary>

public LambdaExpression Predicate { get { return _predicate; } private set { _predicate = value; } }

public Type CLRType { get; private set; }

public DynamicFilterOptions Options { get; private set; }

public string AttributeName { get { return string.Concat(DynamicFilterConstants.ATTRIBUTE_NAME_PREFIX, DynamicFilterConstants.DELIMETER, CLRType.Name, DynamicFilterConstants.DELIMETER, FilterName); } }
public string AttributeName { get { return DynamicFilterConstants.ATTRIBUTE_NAME_PREFIX; } }


internal DynamicFilterDefinition(Guid id, string filterName, LambdaExpression predicate, string columnName, Type clrType, DynamicFilterOptions options)
{
Expand Down
31 changes: 31 additions & 0 deletions src/EntityFramework.DynamicFilters/DynamicFilterSerializer.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System;
using System.Data.Entity.Infrastructure;
using System.IO;
using System.Runtime.Serialization.Formatters.Binary;

namespace EntityFramework.DynamicFilters
{
internal class DynamicFilterSerializer : IMetadataAnnotationSerializer
{
public object Deserialize(string name, string value)
{
using (MemoryStream ms = new MemoryStream(Convert.FromBase64String(value)))
{
var bf = new BinaryFormatter();

return (DynamicFilterDefinition)bf.Deserialize(ms);
}
}

public string Serialize(string name, object value)
{
using (MemoryStream ms = new MemoryStream())
{
var bf = new BinaryFormatter();
bf.Serialize(ms, value);

return Convert.ToBase64String(ms.ToArray());
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll</HintPath>
<HintPath>..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll</HintPath>
<HintPath>..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.SqlServer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand All @@ -66,7 +68,9 @@
<Compile Include="DynamicFilterQueryVisitorOld.cs" />
<Compile Include="DynamicFilterQueryVisitorSSpace.cs" />
<Compile Include="DynamicFilterQueryVisitorCSpace.cs" />
<Compile Include="DynamicFilterSerializer.cs" />
<Compile Include="LambdaToDbExpressionVisitor.cs" />
<Compile Include="MyDbConfiguration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
Expand Down
19 changes: 19 additions & 0 deletions src/EntityFramework.DynamicFilters/MyDbConfiguration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Data.Entity.Infrastructure;
using System.IO;
using System.Linq;
using System.Text;

namespace EntityFramework.DynamicFilters
{
public class MyDbConfiguration : DbConfiguration
{
public MyDbConfiguration() : base()
{
this.SetMetadataAnnotationSerializer("DynamicFilter", () => new DynamicFilterSerializer());
this.SetModelStore(new DefaultDbModelStore(Directory.GetCurrentDirectory()));
}
}
}
2 changes: 1 addition & 1 deletion src/EntityFramework.DynamicFilters/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.1" targetFramework="net40" />
<package id="EntityFramework" version="6.2.0" targetFramework="net40" />
</packages>