Skip to content

Commit e4081c8

Browse files
author
ksmithRenweb
authored
Merge pull request #3 from zzzprojects/master
catch up
2 parents e3c618f + 5fec5f4 commit e4081c8

File tree

41 files changed

+1145
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1145
-535
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Stay updated with latest changes
3434
- Query
3535
- [Query Cache](https://github.com/zzzprojects/EntityFramework-Plus/wiki/EF-Query-Cache-%7C-Entity-Framework-Second-Level-Caching)
3636
- [Query Deferred](https://github.com/zzzprojects/EntityFramework-Plus/wiki/EF-Query-Deferred-%7C-Entity-Framework-deferring-immediate-LINQ-query-execution)
37+
- [Query DbSetFilter](https://github.com/zzzprojects/EntityFramework-Plus/wiki/EF-Query-DbSetFilter)
3738
- [Query Filter](https://github.com/zzzprojects/EntityFramework-Plus/wiki/EF-Query-Filter-%7C-Entity-Framework-Dynamic-Instance-and-Global-Filters)
3839
- [Query Future](https://github.com/zzzprojects/EntityFramework-Plus/wiki/EF-Query-Future-%7C-Entity-Framework-Combine-and-Execute-Multiple-SQL-Command)
3940
- [Query IncludeFilter](https://github.com/zzzprojects/EntityFramework-Plus/wiki/EF-Query-IncludeFilter-%7C-Entity-Framework-Include-Related-Entities-using-Where-Filter)

‎src/.vs/Z.EntityFramework.Plus/v15/sqlite3/storage.ide‎

5.1 MB
Binary file not shown.

‎src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
[assembly: AssemblyCulture("")]
1919
[assembly: ComVisible(false)]
2020
[assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
21-
[assembly: AssemblyVersion("1.6.7")]
22-
[assembly: AssemblyFileVersion("1.6.7")]
21+
[assembly: AssemblyVersion("1.7.0")]
22+
[assembly: AssemblyFileVersion("1.7.0")]

‎src/Z.EntityFramework.Plus.EF6.NET40/Z.EntityFramework.Plus.EF6.NET40.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<Import Project="..\shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems" Label="Shared" />
6767
<Import Project="..\shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems" Label="Shared" />
6868
<Import Project="..\shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems" Label="Shared" />
69+
<Import Project="..\shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems" Label="Shared" />
6970
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7071
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7172
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
[assembly: AssemblyCulture("")]
1919
[assembly: ComVisible(false)]
2020
[assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
21-
[assembly: AssemblyVersion("1.6.7")]
22-
[assembly: AssemblyFileVersion("1.6.7")]
21+
[assembly: AssemblyVersion("1.7.0")]
22+
[assembly: AssemblyFileVersion("1.7.0")]

‎src/Z.EntityFramework.Plus.EF6/Z.EntityFramework.Plus.EF6.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<Import Project="..\shared\Z.EF.Plus.QueryIncludeOptimized.Shared\Z.EF.Plus.QueryIncludeOptimized.Shared.projitems" Label="Shared" />
7171
<Import Project="..\shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems" Label="Shared" />
7272
<Import Project="..\shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems" Label="Shared" />
73+
<Import Project="..\shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems" Label="Shared" />
7374
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7475
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7576
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Z.EntityFramework.Plus.sln‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.3
4+
VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{14D8985E-0AA8-444A-A32E-D766ABA114D6}"
77
EndProject
@@ -87,6 +87,7 @@ Global
8787
shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
8888
shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
8989
shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
90+
shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
9091
shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
9192
shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
9293
shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
@@ -101,6 +102,7 @@ Global
101102
shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
102103
shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
103104
shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
105+
shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
104106
shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
105107
shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
106108
shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4

‎src/shared/Z.EF.Plus.Audit.Shared/AuditEntryState.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public enum AuditEntryState
2929
RelationshipAdded,
3030

3131
/// <summary>An enum constant representing the relationship deleted option.</summary>
32-
RelationshipDeleted
32+
RelationshipDeleted,
33+
34+
/// <summary>An enum constant representing the entity current option.</summary>
35+
EntityCurrent
3336
}
3437
}

‎src/shared/Z.EF.Plus.Audit.Shared/Extensions/DbSet`AuditEntry/DbSet`AuditEntry.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, T entr
3939
var property = entry.GetType().GetProperty(keyName);
4040
var value = property.GetValue(entry, null).ToString();
4141

42-
query = query.Where(x => x.Properties.Any(y => y.PropertyName == property.Name && y.NewValueFormatted == value));
42+
query = query.Where(x => x.Properties.Any(y => y.PropertyName == property.Name && (y.NewValueFormatted == value
43+
|| (x.State == AuditEntryState.EntityDeleted && y.OldValueFormatted == value))));
4344
}
4445

4546
query = query.Include(x => x.Properties).OrderBy(x => x.CreatedDate);
@@ -68,7 +69,8 @@ public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, params
6869
var propertyName = keyNames[i];
6970
var value = keyValues[i] != null ? keyValues[i].ToString() : "";
7071

71-
query = query.Where(x => x.Properties.Any(y => y.PropertyName == propertyName && y.NewValueFormatted == value));
72+
query = query.Where(x => x.Properties.Any(y => y.PropertyName == propertyName && (y.NewValueFormatted == value
73+
|| (x.State == AuditEntryState.EntityDeleted && y.OldValueFormatted == value))));
7274
}
7375

7476
query = query.Include(x => x.Properties).OrderBy(x => x.CreatedDate);

0 commit comments

Comments
 (0)