lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 10:24:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
sunkaixuan
2017-04-30 19:20:02 +08:00
parent 3a7309a854
commit ec65a93511
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OrmTest/UnitTest/RenameMapping/MapTable.cs
View File

@@ -12,10 +12,12 @@ namespace OrmTest.UnitTest
{ {
public void Init() public void Init()
{ {
using (var db = GetInstance()) var db = GetInstance();
for (int i = 0; i < 200; i++)
{ {
var x= db.Queryable<Student>().ToList(); var x = db.Queryable<Student>().ToList();
} }
} }
public SqlSugarClient GetInstance() public SqlSugarClient GetInstance()
{ {

5
SqlSugar/Abstract/DbProvider/DbProvider/DbProvider.cs
View File

@@ -173,6 +173,7 @@ namespace SqlSugar
{ {
this.Transaction.Commit(); this.Transaction.Commit();
this.Transaction = null; this.Transaction = null;
if (this.Context.CurrentConnectionConfig.IsAutoCloseConnection) this.Close();
} }
} }
public virtual void CommitTran() public virtual void CommitTran()
@@ -181,6 +182,7 @@ namespace SqlSugar
{ {
this.Transaction.Commit(); this.Transaction.Commit();
this.Transaction = null; this.Transaction = null;
if (this.Context.CurrentConnectionConfig.IsAutoCloseConnection) this.Close();
} }
} }
public abstract IDataParameter[] ToIDbDataParameter(params SugarParameter[] pars); public abstract IDataParameter[] ToIDbDataParameter(params SugarParameter[] pars);
@@ -201,6 +203,7 @@ namespace SqlSugar
if (this.IsClearParameters) if (this.IsClearParameters)
sqlCommand.Parameters.Clear(); sqlCommand.Parameters.Clear();
ExecLogEvent(sql, pars, false); ExecLogEvent(sql, pars, false);
if (this.Context.CurrentConnectionConfig.IsAutoCloseConnection&&this.Transaction==null) this.Close();
return count; return count;
} }
public virtual IDataReader GetDataReader(string sql, params SugarParameter[] pars) public virtual IDataReader GetDataReader(string sql, params SugarParameter[] pars)
@@ -226,6 +229,7 @@ namespace SqlSugar
if (this.IsClearParameters) if (this.IsClearParameters)
sqlCommand.Parameters.Clear(); sqlCommand.Parameters.Clear();
ExecLogEvent(sql, pars, false); ExecLogEvent(sql, pars, false);
if (this.Context.CurrentConnectionConfig.IsAutoCloseConnection && this.Transaction == null) this.Close();
return ds; return ds;
} }
public virtual object GetScalar(string sql, params SugarParameter[] pars) public virtual object GetScalar(string sql, params SugarParameter[] pars)
@@ -238,6 +242,7 @@ namespace SqlSugar
if (this.IsClearParameters) if (this.IsClearParameters)
sqlCommand.Parameters.Clear(); sqlCommand.Parameters.Clear();
ExecLogEvent(sql, pars, false); ExecLogEvent(sql, pars, false);
if (this.Context.CurrentConnectionConfig.IsAutoCloseConnection && this.Transaction == null) this.Close();
return scalar; return scalar;
} }
#endregion #endregion

6
SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@@ -587,6 +587,7 @@ namespace SqlSugar
} }
private List<TResult> _ToList<TResult>() private List<TResult> _ToList<TResult>()
{ {
List<TResult> result = null;
var sqlObj = this.ToSql(); var sqlObj = this.ToSql();
var isComplexModel = QueryBuilder.IsComplexModel(sqlObj.Key); var isComplexModel = QueryBuilder.IsComplexModel(sqlObj.Key);
using (var dataReader = this.Db.GetDataReader(sqlObj.Key, sqlObj.Value.ToArray())) using (var dataReader = this.Db.GetDataReader(sqlObj.Key, sqlObj.Value.ToArray()))
@@ -594,14 +595,15 @@ namespace SqlSugar
var tType = typeof(TResult); var tType = typeof(TResult);
if (tType.IsAnonymousType() || isComplexModel) if (tType.IsAnonymousType() || isComplexModel)
{ {
return this.Context.RewritableMethods.DataReaderToDynamicList<TResult>(dataReader); result= this.Context.RewritableMethods.DataReaderToDynamicList<TResult>(dataReader);
} }
else else
{ {
var reval = this.Bind.DataReaderToList<TResult>(tType, dataReader, QueryBuilder.SelectCacheKey); var reval = this.Bind.DataReaderToList<TResult>(tType, dataReader, QueryBuilder.SelectCacheKey);
return reval;
} }
if (this.Context.CurrentConnectionConfig.IsAutoCloseConnection) this.Context.Close();
} }
return result;
} }
#endregion #endregion
} }

1
SqlSugar/SqlSugarClient.cs
View File

@@ -230,6 +230,7 @@ namespace SqlSugar
using (var dataReader = this.Database.GetDataReader(sql, dbPars)) using (var dataReader = this.Database.GetDataReader(sql, dbPars))
{ {
var reval = this.Database.DbBind.DataReaderToList<T>(typeof(T), dataReader, builder.SqlQueryBuilder.Fields); var reval = this.Database.DbBind.DataReaderToList<T>(typeof(T), dataReader, builder.SqlQueryBuilder.Fields);
if (this.CurrentConnectionConfig.IsAutoCloseConnection) this.Close();
builder.SqlQueryBuilder.Clear(); builder.SqlQueryBuilder.Clear();
return reval; return reval;
} }