This commit is contained in:
sunkaixuan
2017-09-11 12:38:58 +08:00
parent fb1fa5d769
commit 013007f39b
5 changed files with 28 additions and 8 deletions

View File

@@ -282,6 +282,17 @@ namespace OrmTest.Demo
})
.Select((st, sc) => new { id=st.Id,school=sc }).ToList();
var list5 = db.Queryable<Student, School>((st, sc) => new object[] {
JoinType.Left,st.SchoolId==sc.Id
}).AS<Student>("STUDENT").AS<School>("SCHOOL")
.Select((st, sc) => new { id = st.Id, school = sc }).ToList();
var list6 = db.Queryable<Student, School>((st, sc) => new object[] {
JoinType.Left,st.SchoolId==sc.Id
}).With(SqlWith.NoLock).AS<Student>("STUDENT").AS<School>("SCHOOL")
.Select((st, sc) => new { id = st.Id, school = sc }).ToList();
}
public static void Join()
{

View File

@@ -108,7 +108,6 @@ namespace SqlSugar
});
return this;
}
public virtual ISugarQueryable<T> Where(Expression<Func<T, bool>> expression)
{
this._Where(expression);
@@ -1217,26 +1216,31 @@ namespace SqlSugar
_As(tableName, entityName);
return this;
}
public new ISugarQueryable<T, T2> Filter(string FilterName, bool isDisabledGobalFilter = false) {
public new ISugarQueryable<T, T2> Filter(string FilterName, bool isDisabledGobalFilter = false)
{
_Filter(FilterName, isDisabledGobalFilter);
return this;
}
public new ISugarQueryable<T, T2> AddParameters(object parameters) {
public new ISugarQueryable<T, T2> AddParameters(object parameters)
{
if (parameters != null)
QueryBuilder.Parameters.AddRange(Context.Ado.GetParameters(parameters));
return this;
}
public new ISugarQueryable<T, T2> AddParameters(SugarParameter[] parameters) {
public new ISugarQueryable<T, T2> AddParameters(SugarParameter[] parameters)
{
if (parameters != null)
QueryBuilder.Parameters.AddRange(parameters);
return this;
}
public new ISugarQueryable<T, T2> AddParameters(List<SugarParameter> parameters) {
public new ISugarQueryable<T, T2> AddParameters(List<SugarParameter> parameters)
{
if (parameters != null)
QueryBuilder.Parameters.AddRange(parameters);
return this;
}
public new ISugarQueryable<T, T2> AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left) {
public new ISugarQueryable<T, T2> AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left)
{
QueryBuilder.JoinIndex = +1;
QueryBuilder.JoinQueryInfos
.Add(new JoinQueryInfo()
@@ -1249,6 +1253,11 @@ namespace SqlSugar
});
return this;
}
public new ISugarQueryable<T,T2> With(string withString)
{
base.With(withString);
return this;
}
#endregion
}
#endregion

View File

@@ -316,7 +316,7 @@ namespace SqlSugar
this.JoinTemplate,
joinInfo.JoinType.ToString() + UtilConstants.Space,
Builder.GetTranslationTableName(joinInfo.TableName) + UtilConstants.Space,
joinInfo.ShortName + UtilConstants.Space + joinInfo.TableWithString,
joinInfo.ShortName + UtilConstants.Space + TableWithString,
joinInfo.JoinWhere);
}
public virtual void Clear()

View File

@@ -12,6 +12,5 @@ namespace SqlSugar
public string ShortName { get; set; }
public int JoinIndex { get; set; }
public string JoinWhere { get; set; }
public string TableWithString { get; set; }
}
}

View File

@@ -168,6 +168,7 @@ namespace SqlSugar
new ISugarQueryable<T,T2> AddParameters(SugarParameter[] parameters);
new ISugarQueryable<T, T2> AddParameters(List<SugarParameter> parameters);
new ISugarQueryable<T,T2> AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left);
new ISugarQueryable<T,T2> With(string withString);
#endregion
}
public partial interface ISugarQueryable<T, T2, T3> : ISugarQueryable<T>