Skip to content

Commit

Permalink
- 优化 IAdo.Query 方法，当传入带主键特性的实体时，防止主键列为 null 时导致整行记录也为 null；
Browse files Browse the repository at this point in the history
  • Loading branch information
28810 authored and 28810 committed Mar 11, 2020
1 parent fff7925 commit e132133
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 65 deletions.
7 changes: 7 additions & 0 deletions FreeSql.DbContext/FreeSql.DbContext.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 46 additions & 34 deletions FreeSql/FreeSql.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public List<T> Query<T>(DbConnection connection, DbTransaction transaction, Comm
{
if (indexes == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand Down Expand Up @@ -148,7 +148,7 @@ public NaviteTuple<List<T1>, List<T2>> Query<T1, T2>(DbConnection connection, Db
case 0:
if (indexes1 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -165,7 +165,7 @@ public NaviteTuple<List<T1>, List<T2>> Query<T1, T2>(DbConnection connection, Db
case 1:
if (indexes2 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand Down Expand Up @@ -216,7 +216,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>> Query<T1, T2, T3>(DbConnection
case 0:
if (indexes1 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -233,7 +233,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>> Query<T1, T2, T3>(DbConnection
case 1:
if (indexes2 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -250,7 +250,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>> Query<T1, T2, T3>(DbConnection
case 2:
if (indexes3 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand Down Expand Up @@ -307,7 +307,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>> Query<T1, T2, T3, T4>
case 0:
if (indexes1 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -324,7 +324,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>> Query<T1, T2, T3, T4>
case 1:
if (indexes2 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -341,7 +341,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>> Query<T1, T2, T3, T4>
case 2:
if (indexes3 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -358,7 +358,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>> Query<T1, T2, T3, T4>
case 3:
if (indexes4 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand Down Expand Up @@ -421,7 +421,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>, List<T5>> Query<T1, T
case 0:
if (indexes1 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -438,7 +438,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>, List<T5>> Query<T1, T
case 1:
if (indexes2 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -455,7 +455,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>, List<T5>> Query<T1, T
case 2:
if (indexes3 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -472,7 +472,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>, List<T5>> Query<T1, T
case 3:
if (indexes4 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand All @@ -489,7 +489,7 @@ public NaviteTuple<List<T1>, List<T2>, List<T3>, List<T4>, List<T5>> Query<T1, T
case 4:
if (indexes5 == null)
{
var sbflag = new StringBuilder().Append("query");
var sbflag = new StringBuilder().Append("adoQuery");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
for (var a = 0; a < dr.FieldCount; a++)
{
Expand Down
Loading

0 comments on commit e132133

Please sign in to comment.