Skip to content

Commit f573cbf

Browse files
28810992881099
committed
Merge branch 'master' of https://github.com/2881099/FreeSql 
2 parents 6c39a30 + 6e5e74b commit f573cbf

File tree

6 files changed

+23
-48
lines changed

6 files changed

+23
-48
lines changed

‎Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,9 @@ void LocalMapEntityValue(Type entityType, object entityFrom, object entityTo, bo
376376

377377
foreach (var prop in table.Properties.Values)
378378
{
379-
if (table.ColumnsByCsIgnore.ContainsKey(prop.Name)) continue;
380-
if (table.ColumnsByCs.ContainsKey(prop.Name))
379+
if (table.ColumnsByCs.ContainsKey(prop.Name) || table.ColumnsByCsIgnore.ContainsKey(prop.Name))
381380
{
381+
//与 EntityUtilExtensions.MapEntityValue 同步修改规则，Ignore 也需要 Map
382382
if (isDict) (entityTo as Dictionary<string, object>)[prop.Name] = table.GetPropertyValue(entityFrom, prop.Name);
383383
else table.SetPropertyValue(entityTo, prop.Name, table.GetPropertyValue(entityFrom, prop.Name));
384384
continue;

‎Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public SchemaValidationResult ValidateSchema(IEnumerable<TableDescriptor> schema
116116
return SchemaValidationResult.SuccessedResult;
117117
}
118118

119-
public TableInfo GetTableInfo(string name) => _tables.Where(a => a.CsName == name).FirstOrDefault();
119+
public TableInfo GetTableInfo(string name) => _tables.Where(a => string.Compare(a.CsName, name, true) == 0).FirstOrDefault();
120120

121121
public void SyncStructure()
122122
{

‎FreeSql/Extensions/EntityUtilExtensions.cs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -330,25 +330,16 @@ public static void MapEntityValue(this IFreeSql orm, Type entityType, object ent
330330
});
331331
foreach (var prop in _table.Properties.Values)
332332
{
333-
if (_table.ColumnsByCsIgnore.ContainsKey(prop.Name)) continue;
334-
if (_table.ColumnsByCs.ContainsKey(prop.Name))
333+
if (_table.ColumnsByCs.ContainsKey(prop.Name) || _table.ColumnsByCsIgnore.ContainsKey(prop.Name))
335334
{
335+
//Ignore 也需要 Map https://github.com/luoyunchong/FreeKit/blob/main/src/IGeekFan.FreeKit.Extras/FreeSql/UnitOfWorkAsyncInterceptor.cs
336336
exps.Add(
337337
Expression.Assign(
338338
Expression.MakeMemberAccess(var2Parm, prop),
339339
Expression.MakeMemberAccess(var1Parm, prop)
340340
)
341341
);
342342
}
343-
344-
//else if (prop.GetSetMethod() != null) {
345-
// exps.Add(
346-
// Expression.Assign(
347-
// Expression.MakeMemberAccess(var2Parm, prop),
348-
// Expression.Default(prop.PropertyType)
349-
// )
350-
// );
351-
//}
352343
}
353344
return Expression.Lambda<Action<object, object>>(Expression.Block(new[] { var1Parm, var2Parm }, exps), new[] { parm1, parm2 }).Compile();
354345
});

‎FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,17 +1390,13 @@ public TSelect Count(out long count)
13901390
public List<T1> ToList() => ToList(false);
13911391
public virtual List<T1> ToList(bool includeNestedMembers)
13921392
{
1393-
if (_diymemexpWithTempQuery != null && _diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser)
1393+
if (_diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser && withTempQueryParser != null)
13941394
{
13951395
if (withTempQueryParser._outsideTable[0] != _tables[0])
13961396
{
1397-
var tps = _tables.Select(a =>
1398-
{
1399-
var tp = Expression.Parameter(a.Table.Type, a.Alias);
1400-
a.Parameter = tp;
1401-
return tp;
1402-
}).ToArray();
1403-
return this.InternalToList<T1>(tps[0]);
1397+
var tp = Expression.Parameter(_tables[0].Table.Type, _tables[0].Alias);
1398+
_tables[0].Parameter = tp;
1399+
return this.InternalToList<T1>(tp);
14041400
}
14051401
return this.ToListMapReaderPrivate<T1>(withTempQueryParser._insideSelectList[0].InsideAf, null);
14061402
}
@@ -1448,19 +1444,15 @@ async public Task<long> CountAsync(CancellationToken cancellationToken = default
14481444
public Task<List<T1>> ToListAsync(CancellationToken cancellationToken = default) => ToListAsync(false, cancellationToken);
14491445
public virtual Task<List<T1>> ToListAsync(bool includeNestedMembers = false, CancellationToken cancellationToken = default)
14501446
{
1451-
if (_diymemexpWithTempQuery != null && _diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser)
1447+
if (_diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser && withTempQueryParser != null)
14521448
{
14531449
if (withTempQueryParser._outsideTable[0] != _tables[0])
14541450
{
1455-
var tps = _tables.Select(a =>
1456-
{
1457-
var tp = Expression.Parameter(a.Table.Type, a.Alias);
1458-
a.Parameter = tp;
1459-
return tp;
1460-
}).ToArray();
1461-
return this.InternalToListAsync<T1>(tps[0], cancellationToken);
1451+
var tp = Expression.Parameter(_tables[0].Table.Type, _tables[0].Alias);
1452+
_tables[0].Parameter = tp;
1453+
return this.InternalToListAsync<T1>(tp, cancellationToken);
14621454
}
1463-
return this.ToListMapReaderPrivateAsync<T1>((_diymemexpWithTempQuery as WithTempQueryParser)._insideSelectList[0].InsideAf, null, cancellationToken);
1455+
return this.ToListMapReaderPrivateAsync<T1>(withTempQueryParser._insideSelectList[0].InsideAf, null, cancellationToken);
14641456
}
14651457
if (_selectExpression != null) return this.InternalToListAsync<T1>(_selectExpression, cancellationToken);
14661458
return this.ToListPrivateAsync(includeNestedMembers == false ? this.GetAllFieldExpressionTreeLevel2() : this.GetAllFieldExpressionTreeLevelAll(), null, cancellationToken);

‎FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -234,17 +234,13 @@ internal void ToListChunkPrivate(int chunkSize, Action<FetchCallbackArgs<List<T1
234234
}
235235
public void ToChunk(int size, Action<FetchCallbackArgs<List<T1>>> done)
236236
{
237-
if (_diymemexpWithTempQuery != null && _diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser)
237+
if (_diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser && withTempQueryParser != null)
238238
{
239239
if (withTempQueryParser._outsideTable[0] != _tables[0])
240240
{
241-
var tps = _tables.Select(a =>
242-
{
243-
var tp = Expression.Parameter(a.Table.Type, a.Alias);
244-
a.Parameter = tp;
245-
return tp;
246-
}).ToArray();
247-
this.InternalToChunk<T1>(tps[0], size, done);
241+
var tp = Expression.Parameter(_tables[0].Table.Type, _tables[0].Alias);
242+
_tables[0].Parameter = tp;
243+
this.InternalToChunk<T1>(tp, size, done);
248244
return;
249245
}
250246
var af = withTempQueryParser._insideSelectList[0].InsideAf;
@@ -1786,17 +1782,13 @@ internal IAsyncEnumerable<List<T1>> ToListChunkPrivateAsyncEnumerable(int chunkS
17861782
}
17871783
public IAsyncEnumerable<List<T1>> ToChunkAsyncEnumerable(int size)
17881784
{
1789-
if (_diymemexpWithTempQuery != null && _diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser)
1785+
if (_diymemexpWithTempQuery is WithTempQueryParser withTempQueryParser && withTempQueryParser != null)
17901786
{
17911787
if (withTempQueryParser._outsideTable[0] != _tables[0])
17921788
{
1793-
var tps = _tables.Select(a =>
1794-
{
1795-
var tp = Expression.Parameter(a.Table.Type, a.Alias);
1796-
a.Parameter = tp;
1797-
return tp;
1798-
}).ToArray();
1799-
return this.InternalToChunkAsyncEnumerable<T1>(tps[0], size);
1789+
var tp = Expression.Parameter(_tables[0].Table.Type, _tables[0].Alias);
1790+
_tables[0].Parameter = tp;
1791+
return this.InternalToChunkAsyncEnumerable<T1>(tp, size);
18001792
}
18011793
var af = withTempQueryParser._insideSelectList[0].InsideAf;
18021794
return new LocalAsyncEnumerable<T1>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h1 align="center"> 🦄 FreeSql, The first AOT ORM!</h1><div align="center">
1+
<h1 align="center"> 🦄 FreeSql, The First AOT ORM!</h1><div align="center">
22

33
FreeSql is a powerful O/RM component, supports .NET Core 2.1+, .NET Framework 4.0+, Xamarin, And AOT.
44

0 commit comments

Comments
 (0)