Skip to content

Commit 8d37347

Browse files
Merge pull request #430 from stgelaisalex/master
Added a white bullet point
2 parents cfc71a0 + 4f381cd commit 8d37347

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

docs2/pages/documentations/query-db-set-filter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
The **Query DbSetFilter** is the old filter API for Entity Framework 6 (EF6) before the code switched to use Interceptor instead.
66

7-
The feature revamp was done in 2016 to support include and LazyLoading but have also some limitation such as performance and instance filter that the old code didn't have.
7+
The feature revamp was done in 2016 to support include and LazyLoading but, also have some limitation such as performance and instance filter that the old code didn't have.
88

99
## Limitations
1010

docs2/pages/documentations/query-filter.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var list = ctx.Posts.Filter(MyEnum.EnumValue).ToList();
5656

5757
Global filter can be used by any context.
5858

59-
Global filter is normally preferred in most scenario over instance filter since the filter code is centralized in one method over being spread in multiple methods.
59+
Global filter is normally preferred in most scenarios over instance filter since the filter code is centralized in one method over being spread in multiple methods.
6060

6161
{% include template-example.html %}
6262
```csharp
@@ -252,7 +252,7 @@ var list = ctx.Invoices.Where(q => q.Where(x => x.CustomerID = myCustomerID)).To
252252

253253
### Object State
254254

255-
Removing inactive or soft deleted records is probably the most common scenario. A soft delete is often useful when related data cannot be deleted. By example, the customer cannot be deleted because related orders cannot be deleted instead, he becomes inactive.
255+
Removing inactive or soft deleted records is probably the most common scenario. A soft delete is often useful when related data cannot be deleted. For example, the customer cannot be deleted because related orders cannot be deleted instead, he becomes inactive.
256256

257257
*In this example, we display only active category.*
258258

@@ -361,7 +361,7 @@ using (var ctx = new EntityContext())
361361

362362
#### Context Filter
363363

364-
Since the QueryCacheManager is global, our library have some limitations with Filter by context (Global Filter doesn't have this issue since it apply the same logic to all query.)
364+
Since the QueryCacheManager is global, our library have some limitations with Filter by context (Global Filter doesn't have this issue since it applies the same logic to all query.)
365365

366366
- LazyLoading only work with GlobalFilter
367367
- context.Set only work with GlobalFilter (You can use the method SetFiltered instead)

docs2/pages/documentations/query-include-filter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ var list = q1.Select(x => new { x, p1 }).ToList().Select(x => x.X);
138138

139139
```
140140

141-
Entity Framework does already all the job to link related entities to the parent. No future logic is required.
141+
Entity Framework already does all the job by linking related entities to the parent. No future logic is required.
142142

143143
## Limitations
144144

145145
- **DO NOT** work with **AsNoTracking**
146146
- Entity Framework Core:
147147
- Not supported yet.
148148
- Entity Framework 5:
149-
- Will never be supported. Use IncludeOptimized instead to filter collections
149+
- Will never be supported. Use IncludeOptimized instead to filter collections
150150
- Cannot be mixed with projection
151151
- Cannot be mixed with Include (Include doesn't support projection)
152152
- Cannot be mixed with IncludeOptimized

docs2/pages/getting-started/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ All future queries are stored in a pending list. When the first future query req
8181

8282
### Query IncludeFilter
8383

84-
Entity Framework already support eager loading however the major drawback is you cannot control what will be included. There is no way to load only active item or load only the first 10 comments.
84+
Entity Framework already support eager loading. However, the major drawback is you cannot control what will be included. There is no way to load only active items or load only the first 10 comments.
8585

8686
### Query IncludeOptimized
8787

docs2/pages/getting-started/tutorial-query.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ var customer = ctx.Customers.Filter(CustomEnum.EnumValue).ToList();
121121

122122
## Query Future
123123

124-
Query Future allow to reduce database roundtrip by batching multiple queries in the same sql command.
124+
Query Future allow to reduce database roundtrips by batching multiple queries in the same sql command.
125125

126-
All future query are stored in a pending list. When the first future query require a database roundtrip, all query are resolved in the same sql command instead of making a database roundtrip for every sql command.
126+
All future queries are stored in a pending list. When the first future query require a database roundtrip, all queries are resolved in the same sql command instead of making a database roundtrip for every sql command.
127127

128128
### Support:
129129

@@ -144,7 +144,7 @@ var countries = futureCountries.ToList();
144144

145145
{% include template-example.html %}
146146
```csharp
147-
// GET the first active customer and the number of avtive customers
147+
// GET the first active customer and the number of active customers
148148
var futureFirstCustomer = db.Customers.Where(x => x.IsActive).DeferredFirstOrDefault().FutureValue();
149149
var futureCustomerCount = db.Customers.Where(x => x.IsActive).DeferredCount().FutureValue();
150150

@@ -178,7 +178,7 @@ var posts = ctx.Post.IncludeFilter(x => x.Comments.Where(x => x.IsActive));
178178

179179
## Query IncludeOptimized
180180

181-
Improve SQL generate by Include and filter child collections at the same times!
181+
Improve SQL generate by Include and filter child collections at the same time!
182182

183183
{% include template-example.html %}
184184
```csharp
@@ -191,4 +191,4 @@ var posts = ctx.Post.IncludeOptimized(x => x.Comments.Where(x => x.IsActive));
191191

192192
***Support:** EF5, EF6*
193193

194-
[Learn more](/query-include-optimized)
194+
[Learn more](/query-include-optimized)

0 commit comments

Comments
 (0)